summaryrefslogtreecommitdiff
path: root/src/wasm-interpreter.h
diff options
context:
space:
mode:
authorJF Bastien <github@jfbastien.com>2016-02-05 14:14:10 +0100
committerJF Bastien <github@jfbastien.com>2016-02-05 14:14:10 +0100
commit9cfdb12d4976e4a9fbf6d902065904ffa48bdbec (patch)
treeaae2c28eb1cc465a4582208d6c713584a51a1bcf /src/wasm-interpreter.h
parent8f67b6e27a38c93fbca7f3c44a88889b3896952f (diff)
parent7459e5af01fbe3a8e75e73783794b4cdffda34e9 (diff)
downloadbinaryen-9cfdb12d4976e4a9fbf6d902065904ffa48bdbec.tar.gz
binaryen-9cfdb12d4976e4a9fbf6d902065904ffa48bdbec.tar.bz2
binaryen-9cfdb12d4976e4a9fbf6d902065904ffa48bdbec.zip
Merge pull request #187 from WebAssembly/select
Fix select
Diffstat (limited to 'src/wasm-interpreter.h')
-rw-r--r--src/wasm-interpreter.h6
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) {