19 files changed, 499 insertions, 414 deletions
diff --git a/test/example/c-api-unused-mem.txt b/test/example/c-api-unused-mem.txt
index c6ac48235..60bdbe51d 100644
--- a/test/example/c-api-unused-mem.txt
+++ b/test/example/c-api-unused-mem.txt
@@ -67,9 +67,7 @@
     )
     (block $label$2
      (br $label$1)
-     (unreachable)
     )
-    (unreachable)
    )
    (block $label$3
     (block $label$4
@@ -77,9 +75,7 @@
      )
      (block $label$6
       (br $label$4)
-      (unreachable)
      )
-     (unreachable)
     )
     (block $label$7
      (block $label$8
@@ -88,18 +84,11 @@
        (get_local $var$0)
       )
       (return)
-      (unreachable)
      )
      (unreachable)
-     (unreachable)
     )
-    (unreachable)
-    (unreachable)
    )
-   (unreachable)
-   (unreachable)
   )
-  (unreachable)
  )
  (func $__wasm_start (type $1)
   (block $label$0
diff --git a/test/fib-dbg.wasm.fromBinary b/test/fib-dbg.wasm.fromBinary
index 3f940fa8a..8f7193f8a 100644
--- a/test/fib-dbg.wasm.fromBinary
+++ b/test/fib-dbg.wasm.fromBinary
@@ -72,9 +72,7 @@
    (return
     (get_local $var$1)
    )
-   (unreachable)
   )
-  (unreachable)
  )
  (func $stackSave (type $2) (result i32)
   (return
@@ -214,10 +212,7 @@
    (return
     (get_local $var$4)
    )
-   (unreachable)
-   (unreachable)
   )
-  (unreachable)
  )
  (func $runPostSets (type $4)
   (local $var$0 i32)
diff --git a/test/min.wast.fromBinary b/test/min.wast.fromBinary
index b39388c46..f25c51044 100644
--- a/test/min.wast.fromBinary
+++ b/test/min.wast.fromBinary
@@ -46,7 +46,6 @@
    (br $label$0
     (i32.const 2)
    )
-   (i32.const 0)
   )
  )
  (func $f1 (type $3) (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (result i32)
diff --git a/test/min.wast.fromBinary.noDebugInfo b/test/min.wast.fromBinary.noDebugInfo
index d6ad4be85..b7407584e 100644
--- a/test/min.wast.fromBinary.noDebugInfo
+++ b/test/min.wast.fromBinary.noDebugInfo
@@ -46,7 +46,6 @@
    (br $label$0
     (i32.const 2)
    )
-   (i32.const 0)
   )
  )
  (func $3 (type $3) (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (result i32)
diff --git a/test/passes/flatten-control-flow.bin.txt b/test/passes/flatten-control-flow.bin.txt
index 9b33f976e..5de52bb3c 100644
--- a/test/passes/flatten-control-flow.bin.txt
+++ b/test/passes/flatten-control-flow.bin.txt
@@ -119,51 +119,7 @@
   (local $var$8 f64)
   (block $label$0
    (nop)
-   (block
-    (block
-     (unreachable)
-    )
-   )
-   (drop
-    (f32.neg
-     (get_local $var$1)
-    )
-   )
-   (drop
-    (f64.neg
-     (get_local $var$2)
-    )
-   )
-   (drop
-    (i32.eqz
-     (get_local $var$3)
-    )
-   )
-   (drop
-    (i32.eqz
-     (get_local $var$4)
-    )
-   )
-   (drop
-    (f32.neg
-     (get_local $var$7)
-    )
-   )
-   (drop
-    (i64.eqz
-     (get_local $var$5)
-    )
-   )
-   (drop
-    (i64.eqz
-     (get_local $var$6)
-    )
-   )
-   (drop
-    (f64.neg
-     (get_local $var$8)
-    )
-   )
+   (unreachable)
   )
  )
  (func $9 (type $9) (param $var$0 i64) (param $var$1 f32) (param $var$2 f64) (param $var$3 i32) (param $var$4 i32) (result f64)
diff --git a/test/polymorphic_stack.wast b/test/polymorphic_stack.wast
index b618fbb6c..1b2459148 100644
--- a/test/polymorphic_stack.wast
+++ b/test/polymorphic_stack.wast
@@ -86,6 +86,21 @@
       )
     )
   )
+  (func $unreachable-in-block-but-code-before (param $0 i32) (result i32)
+   (if
+    (get_local $0)
+    (return
+     (i32.const 127)
+    )
+   )
+   (block $label$0 (result i32)
+    (br_if $label$0
+     (return
+      (i32.const -32)
+     )
+    )
+   )
+  )
   (func $br_table_unreachable_to_also_unreachable (result i32)
     (block $a (result i32)
       (block $b
diff --git a/test/polymorphic_stack.wast.from-wast b/test/polymorphic_stack.wast.from-wast
index c20f9218d..82f88f4af 100644
--- a/test/polymorphic_stack.wast.from-wast
+++ b/test/polymorphic_stack.wast.from-wast
@@ -90,6 +90,21 @@
    )
   )
  )
+ (func $unreachable-in-block-but-code-before (type $FUNCSIG$ii) (param $0 i32) (result i32)
+  (if
+   (get_local $0)
+   (return
+    (i32.const 127)
+   )
+  )
+  (block $label$0 (result i32)
+   (br_if $label$0
+    (return
+     (i32.const -32)
+    )
+   )
+  )
+ )
  (func $br_table_unreachable_to_also_unreachable (type $1) (result i32)
   (block $a (result i32)
    (block $b
diff --git a/test/polymorphic_stack.wast.fromBinary b/test/polymorphic_stack.wast.fromBinary
index b139c9c06..68bb7ecf7 100644
--- a/test/polymorphic_stack.wast.fromBinary
+++ b/test/polymorphic_stack.wast.fromBinary
@@ -8,81 +8,18 @@
  (func $break-and-binary (type $1) (result i32)
   (block $label$0 (result i32)
    (unreachable)
-   (i32.trunc_u/f64
-    (unreachable)
-   )
-   (unreachable)
-   (br_if $label$0
-    (i32.trunc_u/f64
-     (unreachable)
-    )
-    (unreachable)
-   )
-   (f32.add
-    (unreachable)
-    (f32.const 1)
-   )
-   (unreachable)
   )
  )
  (func $call-and-unary (type $0) (param $var$0 i32) (result i32)
   (block $label$0 (result i32)
    (unreachable)
-   (call $call-and-unary
-    (unreachable)
-   )
-   (i64.eqz
-    (unreachable)
-   )
-   (drop
-    (unreachable)
-   )
-   (i32.eqz
-    (unreachable)
-   )
-   (i64.eqz
-    (unreachable)
-   )
-   (drop
-    (unreachable)
-   )
-   (call_indirect $0
-    (unreachable)
-    (unreachable)
-   )
-   (i64.eqz
-    (unreachable)
-   )
-   (drop
-    (unreachable)
-   )
   )
  )
  (func $tee (type $2) (param $var$0 i32)
   (local $var$1 f32)
   (block $label$0
    (unreachable)
-   (tee_local $var$0
-    (unreachable)
-   )
-   (i64.eqz
-    (unreachable)
-   )
-   (drop
-    (unreachable)
-   )
-   (i64.eqz
-    (unreachable)
-   )
-   (tee_local $var$1
-    (unreachable)
-   )
-   (drop
-    (unreachable)
-   )
-   (unreachable)
   )
-  (unreachable)
  )
  (func $tee2 (type $3)
   (local $var$0 f32)
@@ -90,48 +27,41 @@
    (i32.const 259)
    (block $label$0
     (unreachable)
-    (tee_local $var$0
-     (unreachable)
-    )
-    (unreachable)
    )
   )
  )
  (func $select (type $3)
   (unreachable)
-  (select
-   (unreachable)
-   (i32.const 1)
-   (i32.const 2)
-  )
-  (i64.eqz
-   (unreachable)
-  )
-  (drop
-   (unreachable)
-  )
  )
  (func $untaken-break-should-have-value (type $1) (result i32)
   (block $label$0 (result i32)
    (block $label$1
     (unreachable)
-    (br_if $label$0
-     (unreachable)
-     (unreachable)
-    )
-    (unreachable)
-    (unreachable)
    )
    (unreachable)
   )
  )
+ (func $unreachable-in-block-but-code-before (type $0) (param $var$0 i32) (result i32)
+  (block $label$0 (result i32)
+   (if
+    (get_local $var$0)
+    (block $label$1
+     (return
+      (i32.const 127)
+     )
+    )
+   )
+   (block $label$2 (result i32)
+    (return
+     (i32.const -32)
+    )
+   )
+  )
+ )
  (func $br_table_unreachable_to_also_unreachable (type $1) (result i32)
   (block $label$0 (result i32)
    (block $label$1
     (unreachable)
-    (unreachable)
-    (unreachable)
-    (unreachable)
    )
    (unreachable)
   )
diff --git a/test/polymorphic_stack.wast.fromBinary.noDebugInfo b/test/polymorphic_stack.wast.fromBinary.noDebugInfo
index e707d5046..69292952e 100644
--- a/test/polymorphic_stack.wast.fromBinary.noDebugInfo
+++ b/test/polymorphic_stack.wast.fromBinary.noDebugInfo
@@ -8,81 +8,18 @@
  (func $0 (type $1) (result i32)
   (block $label$0 (result i32)
    (unreachable)
-   (i32.trunc_u/f64
-    (unreachable)
-   )
-   (unreachable)
-   (br_if $label$0
-    (i32.trunc_u/f64
-     (unreachable)
-    )
-    (unreachable)
-   )
-   (f32.add
-    (unreachable)
-    (f32.const 1)
-   )
-   (unreachable)
   )
  )
  (func $1 (type $0) (param $var$0 i32) (result i32)
   (block $label$0 (result i32)
    (unreachable)
-   (call $1
-    (unreachable)
-   )
-   (i64.eqz
-    (unreachable)
-   )
-   (drop
-    (unreachable)
-   )
-   (i32.eqz
-    (unreachable)
-   )
-   (i64.eqz
-    (unreachable)
-   )
-   (drop
-    (unreachable)
-   )
-   (call_indirect $0
-    (unreachable)
-    (unreachable)
-   )
-   (i64.eqz
-    (unreachable)
-   )
-   (drop
-    (unreachable)
-   )
   )
  )
  (func $2 (type $2) (param $var$0 i32)
   (local $var$1 f32)
   (block $label$0
    (unreachable)
-   (tee_local $var$0
-    (unreachable)
-   )
-   (i64.eqz
-    (unreachable)
-   )
-   (drop
-    (unreachable)
-   )
-   (i64.eqz
-    (unreachable)
-   )
-   (tee_local $var$1
-    (unreachable)
-   )
-   (drop
-    (unreachable)
-   )
-   (unreachable)
   )
-  (unreachable)
  )
  (func $3 (type $3)
   (local $var$0 f32)
@@ -90,48 +27,41 @@
    (i32.const 259)
    (block $label$0
     (unreachable)
-    (tee_local $var$0
-     (unreachable)
-    )
-    (unreachable)
    )
   )
  )
  (func $4 (type $3)
   (unreachable)
-  (select
-   (unreachable)
-   (i32.const 1)
-   (i32.const 2)
-  )
-  (i64.eqz
-   (unreachable)
-  )
-  (drop
-   (unreachable)
-  )
  )
  (func $5 (type $1) (result i32)
   (block $label$0 (result i32)
    (block $label$1
     (unreachable)
-    (br_if $label$0
-     (unreachable)
-     (unreachable)
-    )
-    (unreachable)
-    (unreachable)
    )
    (unreachable)
   )
  )
- (func $6 (type $1) (result i32)
+ (func $6 (type $0) (param $var$0 i32) (result i32)
+  (block $label$0 (result i32)
+   (if
+    (get_local $var$0)
+    (block $label$1
+     (return
+      (i32.const 127)
+     )
+    )
+   )
+   (block $label$2 (result i32)
+    (return
+     (i32.const -32)
+    )
+   )
+  )
+ )
+ (func $7 (type $1) (result i32)
   (block $label$0 (result i32)
    (block $label$1
     (unreachable)
-    (unreachable)
-    (unreachable)
-    (unreachable)
    )
    (unreachable)
   )
diff --git a/test/unit.wast.fromBinary b/test/unit.wast.fromBinary
index 8bb80bcca..817cc3c7a 100644
--- a/test/unit.wast.fromBinary
+++ b/test/unit.wast.fromBinary
@@ -270,22 +270,14 @@
       (block $label$15
        (loop $label$16
         (br $label$15)
-        (br $label$16)
        )
-       (unreachable)
-       (br $label$9)
       )
      )
      (block $label$17
       (loop $label$18
        (br $label$9)
-       (br $label$18)
       )
-      (unreachable)
-      (br $label$9)
-      (unreachable)
      )
-     (unreachable)
     )
     (nop)
    )
@@ -474,12 +466,7 @@
    (return
     (i32.const 2)
    )
-   (unreachable)
-  )
-  (f64.abs
-   (unreachable)
   )
-  (unreachable)
  )
  (func $unreachable-block-toplevel (type $5) (result i32)
   (block $label$0
@@ -489,30 +476,21 @@
    (return
     (i32.const 2)
    )
-   (unreachable)
   )
-  (unreachable)
  )
  (func $unreachable-block0 (type $5) (result i32)
   (block $label$0
    (return
     (i32.const 2)
    )
-   (unreachable)
   )
-  (f64.abs
-   (unreachable)
-  )
-  (unreachable)
  )
  (func $unreachable-block0-toplevel (type $5) (result i32)
   (block $label$0
    (return
     (i32.const 2)
    )
-   (unreachable)
   )
-  (unreachable)
  )
  (func $unreachable-block-with-br (type $5) (result i32)
   (block $label$0 (result i32)
@@ -539,10 +517,6 @@
     )
    )
   )
-  (f64.abs
-   (unreachable)
-  )
-  (unreachable)
  )
  (func $unreachable-if-toplevel (type $5) (result i32)
   (if
@@ -558,7 +532,6 @@
     )
    )
   )
-  (unreachable)
  )
  (func $unreachable-loop (type $5) (result i32)
   (loop $label$0
@@ -567,10 +540,6 @@
     (i32.const 1)
    )
   )
-  (f64.abs
-   (unreachable)
-  )
-  (unreachable)
  )
  (func $unreachable-loop0 (type $5) (result i32)
   (loop $label$0
@@ -578,10 +547,6 @@
     (i32.const 1)
    )
   )
-  (f64.abs
-   (unreachable)
-  )
-  (unreachable)
  )
  (func $unreachable-loop-toplevel (type $5) (result i32)
   (loop $label$0
@@ -590,7 +555,6 @@
     (i32.const 1)
    )
   )
-  (unreachable)
  )
  (func $unreachable-loop0-toplevel (type $5) (result i32)
   (loop $label$0
@@ -598,53 +562,11 @@
     (i32.const 1)
    )
   )
-  (unreachable)
  )
  (func $unreachable-ifs (type $1)
   (block $label$0
    (unreachable)
-   (unreachable)
-   (unreachable)
-   (unreachable)
-   (unreachable)
-   (unreachable)
-   (unreachable)
-   (unreachable)
-   (unreachable)
-   (unreachable)
-   (unreachable)
-   (unreachable)
-   (if
-    (i32.const 1)
-    (block $label$1
-     (unreachable)
-    )
-    (block $label$2
-     (nop)
-    )
-   )
-   (if
-    (i32.const 1)
-    (block $label$3
-     (nop)
-    )
-    (block $label$4
-     (unreachable)
-    )
-   )
-   (if
-    (i32.const 1)
-    (block $label$5
-     (unreachable)
-    )
-    (block $label$6
-     (unreachable)
-    )
-   )
-   (unreachable)
-   (unreachable)
   )
-  (unreachable)
  )
  (func $unreachable-if-arm (type $1)
   (if
@@ -654,10 +576,6 @@
    )
    (block $label$1
     (unreachable)
-    (drop
-     (i32.const 1)
-    )
-    (unreachable)
    )
   )
  )
diff --git a/test/unit.wast.fromBinary.noDebugInfo b/test/unit.wast.fromBinary.noDebugInfo
index 09da9a15b..46b86e86b 100644
--- a/test/unit.wast.fromBinary.noDebugInfo
+++ b/test/unit.wast.fromBinary.noDebugInfo
@@ -270,22 +270,14 @@
       (block $label$15
        (loop $label$16
         (br $label$15)
-        (br $label$16)
        )
-       (unreachable)
-       (br $label$9)
       )
      )
      (block $label$17
       (loop $label$18
        (br $label$9)
-       (br $label$18)
       )
-      (unreachable)
-      (br $label$9)
-      (unreachable)
      )
-     (unreachable)
     )
     (nop)
    )
@@ -474,12 +466,7 @@
    (return
     (i32.const 2)
    )
-   (unreachable)
-  )
-  (f64.abs
-   (unreachable)
   )
-  (unreachable)
  )
  (func $25 (type $5) (result i32)
   (block $label$0
@@ -489,30 +476,21 @@
    (return
     (i32.const 2)
    )
-   (unreachable)
   )
-  (unreachable)
  )
  (func $26 (type $5) (result i32)
   (block $label$0
    (return
     (i32.const 2)
    )
-   (unreachable)
   )
-  (f64.abs
-   (unreachable)
-  )
-  (unreachable)
  )
  (func $27 (type $5) (result i32)
   (block $label$0
    (return
     (i32.const 2)
    )
-   (unreachable)
   )
-  (unreachable)
  )
  (func $28 (type $5) (result i32)
   (block $label$0 (result i32)
@@ -539,10 +517,6 @@
     )
    )
   )
-  (f64.abs
-   (unreachable)
-  )
-  (unreachable)
  )
  (func $30 (type $5) (result i32)
   (if
@@ -558,7 +532,6 @@
     )
    )
   )
-  (unreachable)
  )
  (func $31 (type $5) (result i32)
   (loop $label$0
@@ -567,10 +540,6 @@
     (i32.const 1)
    )
   )
-  (f64.abs
-   (unreachable)
-  )
-  (unreachable)
  )
  (func $32 (type $5) (result i32)
   (loop $label$0
@@ -578,10 +547,6 @@
     (i32.const 1)
    )
   )
-  (f64.abs
-   (unreachable)
-  )
-  (unreachable)
  )
  (func $33 (type $5) (result i32)
   (loop $label$0
@@ -590,7 +555,6 @@
     (i32.const 1)
    )
   )
-  (unreachable)
  )
  (func $34 (type $5) (result i32)
   (loop $label$0
@@ -598,53 +562,11 @@
     (i32.const 1)
    )
   )
-  (unreachable)
  )
  (func $35 (type $1)
   (block $label$0
    (unreachable)
-   (unreachable)
-   (unreachable)
-   (unreachable)
-   (unreachable)
-   (unreachable)
-   (unreachable)
-   (unreachable)
-   (unreachable)
-   (unreachable)
-   (unreachable)
-   (unreachable)
-   (if
-    (i32.const 1)
-    (block $label$1
-     (unreachable)
-    )
-    (block $label$2
-     (nop)
-    )
-   )
-   (if
-    (i32.const 1)
-    (block $label$3
-     (nop)
-    )
-    (block $label$4
-     (unreachable)
-    )
-   )
-   (if
-    (i32.const 1)
-    (block $label$5
-     (unreachable)
-    )
-    (block $label$6
-     (unreachable)
-    )
-   )
-   (unreachable)
-   (unreachable)
   )
-  (unreachable)
  )
  (func $36 (type $1)
   (if
@@ -654,10 +576,6 @@
    )
    (block $label$1
     (unreachable)
-    (drop
-     (i32.const 1)
-    )
-    (unreachable)
    )
   )
  )
diff --git a/test/unreachable-code.wast b/test/unreachable-code.wast
new file mode 100644
index 000000000..f67d10e52
--- /dev/null
+++ b/test/unreachable-code.wast
@@ -0,0 +1,85 @@
+(module
+  (func $a
+    (if (i32.const 1)
+      (unreachable)
+    )
+  )
+  (func $b
+    (if (i32.const 1)
+      (unreachable)
+      (unreachable)
+    )
+  )
+  (func $a-block
+    (block
+      (if (i32.const 1)
+        (unreachable)
+      )
+    )
+  )
+  (func $b-block
+    (block
+      (if (i32.const 1)
+        (unreachable)
+        (unreachable)
+      )
+    )
+  )
+  (func $a-prepost
+    (nop)
+    (if (i32.const 1)
+      (unreachable)
+    )
+    (nop)
+  )
+  (func $b-prepost
+    (nop)
+    (if (i32.const 1)
+      (unreachable)
+      (unreachable)
+    )
+    (nop)
+  )
+  (func $a-block-prepost
+    (nop)
+    (block
+      (if (i32.const 1)
+        (unreachable)
+      )
+    )
+    (nop)
+  )
+  (func $b-block-prepost
+    (nop)
+    (block
+      (if (i32.const 1)
+        (unreachable)
+        (unreachable)
+      )
+    )
+    (nop)
+  )
+  (func $recurse
+    (block $a
+      (nop)
+      (block $b
+        (nop)
+        (br $b)
+        (nop)
+      )
+      (nop)
+    )
+  )
+  (func $recurse-b
+    (block $a
+      (nop)
+      (block $b
+        (nop)
+        (br $a)
+        (nop)
+      )
+      (nop)
+    )
+  )
+)
+
diff --git a/test/unreachable-code.wast.from-wast b/test/unreachable-code.wast.from-wast
new file mode 100644
index 000000000..2196056b3
--- /dev/null
+++ b/test/unreachable-code.wast.from-wast
@@ -0,0 +1,94 @@
+(module
+ (type $0 (func))
+ (memory $0 0)
+ (func $a (type $0)
+  (if
+   (i32.const 1)
+   (unreachable)
+  )
+ )
+ (func $b (type $0)
+  (if
+   (i32.const 1)
+   (unreachable)
+   (unreachable)
+  )
+ )
+ (func $a-block (type $0)
+  (block $block
+   (if
+    (i32.const 1)
+    (unreachable)
+   )
+  )
+ )
+ (func $b-block (type $0)
+  (block $block
+   (if
+    (i32.const 1)
+    (unreachable)
+    (unreachable)
+   )
+  )
+ )
+ (func $a-prepost (type $0)
+  (nop)
+  (if
+   (i32.const 1)
+   (unreachable)
+  )
+  (nop)
+ )
+ (func $b-prepost (type $0)
+  (nop)
+  (if
+   (i32.const 1)
+   (unreachable)
+   (unreachable)
+  )
+  (nop)
+ )
+ (func $a-block-prepost (type $0)
+  (nop)
+  (block $block
+   (if
+    (i32.const 1)
+    (unreachable)
+   )
+  )
+  (nop)
+ )
+ (func $b-block-prepost (type $0)
+  (nop)
+  (block $block
+   (if
+    (i32.const 1)
+    (unreachable)
+    (unreachable)
+   )
+  )
+  (nop)
+ )
+ (func $recurse (type $0)
+  (block $a
+   (nop)
+   (block $b
+    (nop)
+    (br $b)
+    (nop)
+   )
+   (nop)
+  )
+ )
+ (func $recurse-b (type $0)
+  (block $a
+   (nop)
+   (block $b
+    (nop)
+    (br $a)
+    (nop)
+   )
+   (nop)
+  )
+ )
+)
diff --git a/test/unreachable-code.wast.fromBinary b/test/unreachable-code.wast.fromBinary
new file mode 100644
index 000000000..d27da2201
--- /dev/null
+++ b/test/unreachable-code.wast.fromBinary
@@ -0,0 +1,122 @@
+(module
+ (type $0 (func))
+ (memory $0 0)
+ (func $a (type $0)
+  (if
+   (i32.const 1)
+   (block $label$0
+    (unreachable)
+   )
+  )
+ )
+ (func $b (type $0)
+  (if
+   (i32.const 1)
+   (block $label$0
+    (unreachable)
+   )
+   (block $label$1
+    (unreachable)
+   )
+  )
+ )
+ (func $a-block (type $0)
+  (block $label$0
+   (if
+    (i32.const 1)
+    (block $label$1
+     (unreachable)
+    )
+   )
+  )
+ )
+ (func $b-block (type $0)
+  (block $label$0
+   (if
+    (i32.const 1)
+    (block $label$1
+     (unreachable)
+    )
+    (block $label$2
+     (unreachable)
+    )
+   )
+  )
+ )
+ (func $a-prepost (type $0)
+  (block $label$0
+   (nop)
+   (if
+    (i32.const 1)
+    (block $label$1
+     (unreachable)
+    )
+   )
+   (nop)
+  )
+ )
+ (func $b-prepost (type $0)
+  (block $label$0
+   (nop)
+   (if
+    (i32.const 1)
+    (block $label$1
+     (unreachable)
+    )
+    (block $label$2
+     (unreachable)
+    )
+   )
+  )
+ )
+ (func $a-block-prepost (type $0)
+  (block $label$0
+   (nop)
+   (block $label$1
+    (if
+     (i32.const 1)
+     (block $label$2
+      (unreachable)
+     )
+    )
+   )
+   (nop)
+  )
+ )
+ (func $b-block-prepost (type $0)
+  (block $label$0
+   (nop)
+   (block $label$1
+    (if
+     (i32.const 1)
+     (block $label$2
+      (unreachable)
+     )
+     (block $label$3
+      (unreachable)
+     )
+    )
+   )
+  )
+ )
+ (func $recurse (type $0)
+  (block $label$0
+   (nop)
+   (block $label$1
+    (nop)
+    (br $label$1)
+   )
+   (nop)
+  )
+ )
+ (func $recurse-b (type $0)
+  (block $label$0
+   (nop)
+   (block $label$1
+    (nop)
+    (br $label$0)
+   )
+  )
+ )
+)
+
diff --git a/test/unreachable-code.wast.fromBinary.noDebugInfo b/test/unreachable-code.wast.fromBinary.noDebugInfo
new file mode 100644
index 000000000..288a24f4a
--- /dev/null
+++ b/test/unreachable-code.wast.fromBinary.noDebugInfo
@@ -0,0 +1,122 @@
+(module
+ (type $0 (func))
+ (memory $0 0)
+ (func $0 (type $0)
+  (if
+   (i32.const 1)
+   (block $label$0
+    (unreachable)
+   )
+  )
+ )
+ (func $1 (type $0)
+  (if
+   (i32.const 1)
+   (block $label$0
+    (unreachable)
+   )
+   (block $label$1
+    (unreachable)
+   )
+  )
+ )
+ (func $2 (type $0)
+  (block $label$0
+   (if
+    (i32.const 1)
+    (block $label$1
+     (unreachable)
+    )
+   )
+  )
+ )
+ (func $3 (type $0)
+  (block $label$0
+   (if
+    (i32.const 1)
+    (block $label$1
+     (unreachable)
+    )
+    (block $label$2
+     (unreachable)
+    )
+   )
+  )
+ )
+ (func $4 (type $0)
+  (block $label$0
+   (nop)
+   (if
+    (i32.const 1)
+    (block $label$1
+     (unreachable)
+    )
+   )
+   (nop)
+  )
+ )
+ (func $5 (type $0)
+  (block $label$0
+   (nop)
+   (if
+    (i32.const 1)
+    (block $label$1
+     (unreachable)
+    )
+    (block $label$2
+     (unreachable)
+    )
+   )
+  )
+ )
+ (func $6 (type $0)
+  (block $label$0
+   (nop)
+   (block $label$1
+    (if
+     (i32.const 1)
+     (block $label$2
+      (unreachable)
+     )
+    )
+   )
+   (nop)
+  )
+ )
+ (func $7 (type $0)
+  (block $label$0
+   (nop)
+   (block $label$1
+    (if
+     (i32.const 1)
+     (block $label$2
+      (unreachable)
+     )
+     (block $label$3
+      (unreachable)
+     )
+    )
+   )
+  )
+ )
+ (func $8 (type $0)
+  (block $label$0
+   (nop)
+   (block $label$1
+    (nop)
+    (br $label$1)
+   )
+   (nop)
+  )
+ )
+ (func $9 (type $0)
+  (block $label$0
+   (nop)
+   (block $label$1
+    (nop)
+    (br $label$0)
+   )
+  )
+ )
+)
+
diff --git a/test/unreachable-pops.wasm b/test/unreachable-pops.wasm
new file mode 100644
index 000000000..f3e0ae11c
--- /dev/null
+++ b/test/unreachable-pops.wasm
diff --git a/test/unreachable-pops.wasm.fromBinary b/test/unreachable-pops.wasm.fromBinary
new file mode 100644
index 000000000..4e14995cf
--- /dev/null
+++ b/test/unreachable-pops.wasm.fromBinary
@@ -0,0 +1,10 @@
+(module
+ (type $0 (func (result i32)))
+ (memory $0 0)
+ (func $0 (type $0) (result i32)
+  (block $label$0 (result i32)
+   (unreachable)
+  )
+ )
+)
+
diff --git a/test/untaken-br_if.wast.fromBinary b/test/untaken-br_if.wast.fromBinary
index 87dd9c757..815789c35 100644
--- a/test/untaken-br_if.wast.fromBinary
+++ b/test/untaken-br_if.wast.fromBinary
@@ -12,16 +12,10 @@
      (drop
       (i32.const 1)
      )
-     (br_if $label$2
-      (unreachable)
-     )
-     (unreachable)
      (unreachable)
     )
-    (unreachable)
    )
   )
-  (unreachable)
  )
 )
 
diff --git a/test/untaken-br_if.wast.fromBinary.noDebugInfo b/test/untaken-br_if.wast.fromBinary.noDebugInfo
index ad71cd874..9b31417eb 100644
--- a/test/untaken-br_if.wast.fromBinary.noDebugInfo
+++ b/test/untaken-br_if.wast.fromBinary.noDebugInfo
@@ -12,16 +12,10 @@
      (drop
       (i32.const 1)
      )
-     (br_if $label$2
-      (unreachable)
-     )
-     (unreachable)
      (unreachable)
     )
-    (unreachable)
    )
   )
-  (unreachable)
  )
 )