From 15c400329191072a59db433056fbdfcc12b67257 Mon Sep 17 00:00:00 2001
From: Alon Zakai <alonzakai@gmail.com>
Date: Mon, 25 Apr 2016 14:03:21 -0700
Subject: use arities on returns

---
 src/wasm-binary.h | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/wasm-binary.h')

diff --git a/src/wasm-binary.h b/src/wasm-binary.h
index decac5564..3fc1b3f01 100644
--- a/src/wasm-binary.h
+++ b/src/wasm-binary.h
@@ -1095,10 +1095,8 @@ public:
     if (debug) std::cerr << "zz node: Return" << std::endl;
     if (curr->value) {
       recurse(curr->value);
-    } else {
-      visitNop(nullptr);
     }
-    o << int8_t(BinaryConsts::Return);
+    o << int8_t(BinaryConsts::Return) << U32LEB(curr->value ? 1 : 0);
   }
   void visitHost(Host *curr) {
     if (debug) std::cerr << "zz node: Host" << std::endl;
@@ -1982,7 +1980,11 @@ public:
   }
   void visitReturn(Return *curr) {
     if (debug) std::cerr << "zz node: Return" << std::endl;
-    curr->value = popExpression();
+    auto arity = getU32LEB();
+    assert(arity == 0 || arity == 1);
+    if (arity == 1) {
+      curr->value = popExpression();
+    }
   }
   bool maybeVisitImpl(Host *curr, uint8_t code) {
     switch (code) {
-- 
cgit v1.2.3