From 7459e5af01fbe3a8e75e73783794b4cdffda34e9 Mon Sep 17 00:00:00 2001
From: JF Bastien <jfb@chromium.org>
Date: Fri, 5 Feb 2016 05:11:50 -0800
Subject: 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.
---
 src/s2wasm.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/s2wasm.h')

diff --git a/src/s2wasm.h b/src/s2wasm.h
index 275cf6a9c..f800e193b 100644
--- a/src/s2wasm.h
+++ b/src/s2wasm.h
@@ -688,9 +688,10 @@ class S2WasmBuilder {
       skipComma();
       auto curr = allocator.alloc<Select>();
       auto inputs = getInputs(3);
-      curr->condition = inputs[0];
       curr->ifTrue = inputs[1];
       curr->ifFalse = inputs[2];
+      curr->condition = inputs[0];
+      assert(curr->condition->type == i32);
       curr->type = type;
       setOutput(curr, assign);
     };
-- 
cgit v1.2.3