From 8b77837812708b1ca87b8b38ab1a6a3d243dd0aa Mon Sep 17 00:00:00 2001
From: Alon Zakai <alonzakai@gmail.com>
Date: Sat, 21 Nov 2015 10:03:28 -0800
Subject: if_else returns a value, but if does not

---
 src/wasm-interpreter.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/wasm-interpreter.h b/src/wasm-interpreter.h
index 3b645595e..336ef1b3b 100644
--- a/src/wasm-interpreter.h
+++ b/src/wasm-interpreter.h
@@ -188,7 +188,11 @@ private:
         Flow flow = visit(curr->condition);
         if (flow.breaking()) return flow;
         NOTE_EVAL1(flow.value);
-        if (flow.value.geti32()) return visit(curr->ifTrue);
+        if (flow.value.geti32()) {
+          Flow flow = visit(curr->ifTrue);
+          if (!flow.breaking() && !curr->ifFalse) flow.value = Literal(); // if_else returns a value, but if does not
+          return flow;
+        }
         if (curr->ifFalse) return visit(curr->ifFalse);
         return Flow();
       }
-- 
cgit v1.2.3