From 3e5ee789acecd01c092d9c834530f3ee2bf382c8 Mon Sep 17 00:00:00 2001
From: Alon Zakai <alonzakai@gmail.com>
Date: Sun, 6 Dec 2015 14:17:10 -0800
Subject: handle nested blocks with returns in wasm2asm

---
 src/wasm2asm.h | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/wasm2asm.h b/src/wasm2asm.h
index c2e1141d1..89f33381a 100644
--- a/src/wasm2asm.h
+++ b/src/wasm2asm.h
@@ -481,12 +481,7 @@ Ref Wasm2AsmBuilder::processFunctionBody(Expression* curr, IString result) {
         flattenAppend(ret, ValueBuilder::makeStatement(visit(curr->list[i], NO_RESULT)));
       }
       if (result != NO_RESULT) {
-        ret[1]->push_back(ValueBuilder::makeStatement(
-          ValueBuilder::makeAssign(
-            result,
-            visit(curr->list[size-1], result)
-          )
-        ));
+        flattenAppend(ret, visitAndAssign(curr->list[size-1], result));
       }
       if (curr->name.is()) {
         ret = ValueBuilder::makeLabel(fromName(curr->name), ret);
-- 
cgit v1.2.3