5 files changed, 92 insertions, 3 deletions
diff --git a/src/wasm/wasm-binary.cpp b/src/wasm/wasm-binary.cpp
index 2df7f2e26..ac8df5711 100644
--- a/src/wasm/wasm-binary.cpp
+++ b/src/wasm/wasm-binary.cpp
@@ -545,7 +545,7 @@ void WasmBinaryWriter::recurse(Expression*& curr) {
 }
 
 static bool brokenTo(Block* block) {
-  return block->name.is() && BranchUtils::BranchSeeker::has(block, block->name);
+  return block->name.is() && BranchUtils::BranchSeeker::hasNamed(block, block->name);
 }
 
 void WasmBinaryWriter::visitBlock(Block *curr) {
@@ -636,7 +636,7 @@ int32_t WasmBinaryWriter::getBreakIndex(Name name) { // -1 if not found
       return breakStack.size() - 1 - i;
     }
   }
-  std::cerr << "bad break: " << name << std::endl;
+  std::cerr << "bad break: " << name << " in " << currFunction->name << std::endl;
   abort();
 }
 
@@ -2070,7 +2070,14 @@ void WasmBinaryBuilder::visitBlock(Block *curr) {
     }
     for (size_t i = start; i < end; i++) {
       if (debug) std::cerr << "  " << size_t(expressionStack[i]) << "\n zz Block element " << curr->list.size() << std::endl;
-      curr->list.push_back(expressionStack[i]);
+      auto* item = expressionStack[i];
+      curr->list.push_back(item);
+      if (i < end - 1) {
+        // stacky&unreachable code may introduce elements that need to be dropped in non-final positoins
+        if (isConcreteWasmType(item->type)) {
+          curr->list.back() = Builder(wasm).makeDrop(curr->list.back());
+        }
+      }
     }
     expressionStack.resize(start);
     curr->finalize(curr->type);
diff --git a/test/untaken-br_if.wast b/test/untaken-br_if.wast
new file mode 100644
index 000000000..a165cf67f
--- /dev/null
+++ b/test/untaken-br_if.wast
@@ -0,0 +1,14 @@
+(module
+ (func $binaryify-untaken-br_if (result f32)
+  (if
+   (i32.const 1)
+   (unreachable)
+   (block $label$1
+    (br_if $label$1
+     (i32.const 1)
+     (unreachable)
+    )
+   )
+  )
+ )
+)
diff --git a/test/untaken-br_if.wast.from-wast b/test/untaken-br_if.wast.from-wast
new file mode 100644
index 000000000..2d6d9dd2d
--- /dev/null
+++ b/test/untaken-br_if.wast.from-wast
@@ -0,0 +1,16 @@
+(module
+ (type $0 (func (result f32)))
+ (memory $0 0)
+ (func $binaryify-untaken-br_if (type $0) (result f32)
+  (if
+   (i32.const 1)
+   (unreachable)
+   (block $label$1
+    (br_if $label$1
+     (i32.const 1)
+     (unreachable)
+    )
+   )
+  )
+ )
+)
diff --git a/test/untaken-br_if.wast.fromBinary b/test/untaken-br_if.wast.fromBinary
new file mode 100644
index 000000000..14abdb5fb
--- /dev/null
+++ b/test/untaken-br_if.wast.fromBinary
@@ -0,0 +1,26 @@
+(module
+ (type $0 (func (result f32)))
+ (memory $0 0)
+ (func $binaryify-untaken-br_if (type $0) (result f32)
+  (if
+   (i32.const 1)
+   (block $label$0
+    (unreachable)
+   )
+   (block $label$1
+    (block $label$2
+     (drop
+      (i32.const 1)
+     )
+     (br_if $label$2
+      (unreachable)
+     )
+     (unreachable)
+    )
+    (unreachable)
+   )
+  )
+  (unreachable)
+ )
+)
+
diff --git a/test/untaken-br_if.wast.fromBinary.noDebugInfo b/test/untaken-br_if.wast.fromBinary.noDebugInfo
new file mode 100644
index 000000000..17f736ac3
--- /dev/null
+++ b/test/untaken-br_if.wast.fromBinary.noDebugInfo
@@ -0,0 +1,26 @@
+(module
+ (type $0 (func (result f32)))
+ (memory $0 0)
+ (func $0 (type $0) (result f32)
+  (if
+   (i32.const 1)
+   (block $label$0
+    (unreachable)
+   )
+   (block $label$1
+    (block $label$2
+     (drop
+      (i32.const 1)
+     )
+     (br_if $label$2
+      (unreachable)
+     )
+     (unreachable)
+    )
+    (unreachable)
+   )
+  )
+  (unreachable)
+ )
+)
+