summaryrefslogtreecommitdiff
path: root/src/s2wasm.h
diff options
context:
space:
mode:
authorDerek Schuff <dschuff@chromium.org>2016-02-05 16:43:17 -0800
committerDerek Schuff <dschuff@chromium.org>2016-02-05 17:08:02 -0800
commit31c0fb8bdf84a21d7c71953bec9107f504662f56 (patch)
treec276d94f6f93d288c2c485e87f610edf944c9bfd /src/s2wasm.h
parent66719ac9e42d5fc85e3defaa52ab25c0ca547a23 (diff)
downloadbinaryen-31c0fb8bdf84a21d7c71953bec9107f504662f56.tar.gz
binaryen-31c0fb8bdf84a21d7c71953bec9107f504662f56.tar.bz2
binaryen-31c0fb8bdf84a21d7c71953bec9107f504662f56.zip
Fix .s parser to accept new order of select operands
Also update waterfall revision and LLVM-generated tests.
Diffstat (limited to 'src/s2wasm.h')
-rw-r--r--src/s2wasm.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/s2wasm.h b/src/s2wasm.h
index f800e193b..31b28f1e2 100644
--- a/src/s2wasm.h
+++ b/src/s2wasm.h
@@ -688,9 +688,9 @@ class S2WasmBuilder {
skipComma();
auto curr = allocator.alloc<Select>();
auto inputs = getInputs(3);
- curr->ifTrue = inputs[1];
- curr->ifFalse = inputs[2];
- curr->condition = inputs[0];
+ curr->ifTrue = inputs[0];
+ curr->ifFalse = inputs[1];
+ curr->condition = inputs[2];
assert(curr->condition->type == i32);
curr->type = type;
setOutput(curr, assign);