From 093894012d86673fd6bca304da08ccfba88deb44 Mon Sep 17 00:00:00 2001
From: Derek Schuff <dschuff@chromium.org>
Date: Wed, 28 Sep 2016 15:59:26 -0700
Subject: s2wasm: Do not add drops for void values (#718)

Fixes #708
---
 src/s2wasm.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/s2wasm.h b/src/s2wasm.h
index 5b7cd1fa4..383ff1e36 100644
--- a/src/s2wasm.h
+++ b/src/s2wasm.h
@@ -745,7 +745,11 @@ class S2WasmBuilder {
     };
     auto setOutput = [&](Expression* curr, Name assign) {
       if (assign.isNull() || assign.str[0] == 'd') { // drop
-        addToBlock(builder.makeDrop(curr));
+        auto* add = curr;
+        if (isConcreteWasmType(curr->type)) {
+          add = builder.makeDrop(curr);
+        }
+        addToBlock(add);
       } else if (assign.str[0] == 'p') { // push
         push(curr);
       } else { // set to a local
-- 
cgit v1.2.3