wasm2asm progress

2 files changed, 44 insertions, 2 deletions

diff --git a/src/emscripten-optimizer/simple_ast.h b/src/emscripten-optimizer/simple_ast.h
index 396f225d7..2f585dfce 100644
--- a/src/emscripten-optimizer/simple_ast.h
+++ b/src/emscripten-optimizer/simple_ast.h
@@ -1447,6 +1447,12 @@ public:
                             .push_back(ifFalse);
   }
 
+  static Ref makeSeq(Ref left, Ref right) {
+    return &makeRawArray(3)->push_back(makeRawString(SEQ))
+                            .push_back(left)
+                            .push_back(right);
+  }
+
   static Ref makeDo(Ref body, Ref condition) {
     return &makeRawArray(3)->push_back(makeRawString(DO))
                             .push_back(condition)
diff --git a/src/wasm2asm.h b/src/wasm2asm.h
index b10c16de9..86c1f465c 100644
--- a/src/wasm2asm.h
+++ b/src/wasm2asm.h
@@ -625,10 +625,10 @@ Ref Wasm2AsmBuilder::processFunctionBody(Expression* curr, IString result) {
       if (isStatement(curr)) {
         ScopedTemp tempLeft(curr->left->type, parent);
         GetLocal fakeLocalLeft;
-        fakeLocalLeft.name = temp.getName();
+        fakeLocalLeft.name = fakeLocalLeft.getName();
         ScopedTemp tempRight(curr->right->type, parent);
         GetLocal fakeLocalRight;
-        fakeLocalRight.name = temp.getName();
+        fakeLocalRight.name = fakeLocalRight.getName();
         Binary fakeBinary = *curr;
         fakeBinary.value = &fakeLocal;
         Ref ret = blockify(visitAndAssign(curr->left, tempLeft));
@@ -674,6 +674,42 @@ Ref Wasm2AsmBuilder::processFunctionBody(Expression* curr, IString result) {
       }
     }
     void visitSelect(Select *curr) override {
+      if (isStatement(curr)) {
+        ScopedTemp tempCondition(i32, parent);
+        GetLocal fakeCondition;
+        fakeCondition.name = tempCondition.getName();
+        ScopedTemp tempLeft(curr->left->type, parent);
+        GetLocal fakeLocalLeft;
+        fakeLocalLeft.name = fakeLocalLeft.getName();
+        ScopedTemp tempRight(curr->right->type, parent);
+        GetLocal fakeLocalRight;
+        fakeLocalRight.name = fakeLocalRight.getName();
+        Select fakeSelect = *curr;
+        fakeSelect.value = &fakeLocal;
+        Ref ret = blockify(visitAndAssign(curr->condition, condition));
+        ret[1]->push_back(visitAndAssign(curr->left, tempLeft));
+        ret[1]->push_back(visitAndAssign(curr->right, tempRight));
+        ret[1]->push_back(visit(&fakeSelect, result));
+        return ret;
+      }
+      // normal select
+      Ref condition = visit(curr->condition, EXPRESSION_RESULT);
+      Ref left = visit(curr->left, EXPRESSION_RESULT);
+      Ref right = visit(curr->right, EXPRESSION_RESULT);
+      ScopedTemp tempCondition(i32, parent),
+                 tempLeft(curr->type, parent),
+                 tempRight(curr->type, parent);
+      return
+        ValueBuilder::makeSeq(
+          ValueBuilder::makeAssign(tempCondition.getAstName(), condition),
+          ValueBuilder::makeSeq(
+            ValueBuilder::makeAssign(tempLeft.getAstName(), left),
+            ValueBuilder::makeSeq(
+              ValueBuilder::makeAssign(tempRight.getAstName(), right),
+              ValueBuilder::makeConditional(tempCondition.getAstName(), tempLeft.getAstName(), tempRight.getAstName())
+            )
+          )
+        );
     }
     void visitHost(Host *curr) override {
     }