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/wasm-s-parser.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/wasm-s-parser.h')

diff --git a/src/wasm-s-parser.h b/src/wasm-s-parser.h
index e2a880e51..64dc6a454 100644
--- a/src/wasm-s-parser.h
+++ b/src/wasm-s-parser.h
@@ -633,9 +633,9 @@ private:
 
   Expression* makeSelect(Element& s, WasmType type) {
     auto ret = allocator.alloc<Select>();
-    ret->condition = parseExpression(s[1]);
-    ret->ifTrue = parseExpression(s[2]);
-    ret->ifFalse = parseExpression(s[3]);
+    ret->ifTrue = parseExpression(s[1]);
+    ret->ifFalse = parseExpression(s[2]);
+    ret->condition = parseExpression(s[3]);
     ret->type = type;
     return ret;
   }
-- 
cgit v1.2.3