Fix select

The ordering changed in: https://github.com/WebAssembly/spec/pull/221
Which changed the spec tests, breaking sexpr-wasm because it pulls in the spec tests. This was then fixed:
https://github.com/WebAssembly/sexpr-wasm-prototype/commit/23dc368148fc7827a603e3853f5a40287eb9effe
Which in turn breaks when binaryen feeds sexpr-wasm .wast files with the old select operand ordering.

Note that this PR has new failures when running the torture tests in binaryen-shell: the order of evaluation is correct in binaryen-shell but isn't emitted properly by LLVM in the .s files. This will require another patch to fix LLVM.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/wasm-interpreter.h b/src/wasm-interpreter.h
index 022dd04bc..3f9427ed7 100644
--- a/src/wasm-interpreter.h
+++ b/src/wasm-interpreter.h
@@ -620,13 +620,13 @@ private:
       }
       Flow visitSelect(Select *curr) {
         NOTE_ENTER("Select");
-        Flow condition = visit(curr->condition);
-        if (condition.breaking()) return condition;
-        NOTE_EVAL1(condition.value);
         Flow ifTrue = visit(curr->ifTrue);
         if (ifTrue.breaking()) return ifTrue;
         Flow ifFalse = visit(curr->ifFalse);
         if (ifFalse.breaking()) return ifFalse;
+        Flow condition = visit(curr->condition);
+        if (condition.breaking()) return condition;
+        NOTE_EVAL1(condition.value);
         return condition.value.geti32() ? ifTrue : ifFalse; // ;-)
       }
       Flow visitReturn(Return *curr) {