From a7ddd9614b4a7b567258eb018d5e7827d3f48cba Mon Sep 17 00:00:00 2001 From: Alon Zakai Date: Thu, 21 Apr 2016 16:32:47 -0700 Subject: if condition is popped from before, not pre-order inline --- src/wasm-binary.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/wasm-binary.h') 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(); -- cgit v1.2.3