summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2016-04-21 16:32:47 -0700
committerAlon Zakai <alonzakai@gmail.com>2016-04-21 16:32:47 -0700
commita7ddd9614b4a7b567258eb018d5e7827d3f48cba (patch)
treedcdeb98de196026974457511c1e23a8ddee1854f /src
parent29b750807ec1f017a6b0d5c581608b06e4152ea1 (diff)
downloadbinaryen-a7ddd9614b4a7b567258eb018d5e7827d3f48cba.tar.gz
binaryen-a7ddd9614b4a7b567258eb018d5e7827d3f48cba.tar.bz2
binaryen-a7ddd9614b4a7b567258eb018d5e7827d3f48cba.zip
if condition is popped from before, not pre-order inline
Diffstat (limited to 'src')
-rw-r--r--src/wasm-binary.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/wasm-binary.h b/src/wasm-binary.h
index fad98386d..12ea039ac 100644
--- a/src/wasm-binary.h
+++ b/src/wasm-binary.h
@@ -803,8 +803,8 @@ public:
}
void visitIf(If *curr) {
if (debug) std::cerr << "zz node: If" << std::endl;
- o << int8_t(BinaryConsts::If);
recurse(curr->condition);
+ o << int8_t(BinaryConsts::If);
recurse(curr->ifTrue); // TODO: emit block contents directly, if block with no name
if (curr->ifFalse) {
o << int8_t(BinaryConsts::Else);
@@ -1670,12 +1670,12 @@ public:
}
void visitIf(If *curr) {
if (debug) std::cerr << "zz node: If" << std::endl;
+ curr->condition = popExpression();
size_t start = expressionStack.size();
auto next = processExpressions();
size_t end = expressionStack.size();
- assert(end - start == 2);
+ assert(end - start == 1);
curr->ifTrue = popExpression();
- curr->condition = popExpression();
if (next == BinaryConsts::Else) {
size_t start = expressionStack.size();
processExpressions();