2 files changed, 104 insertions, 22 deletions
diff --git a/test/passes/remove-unused-names_merge-blocks.txt b/test/passes/remove-unused-names_merge-blocks.txt
index 53424063d..7769b1ac8 100644
--- a/test/passes/remove-unused-names_merge-blocks.txt
+++ b/test/passes/remove-unused-names_merge-blocks.txt
@@ -166,11 +166,13 @@
     (i32.const 20)
    )
   )
-  (drop
-   (i32.const 10)
-  )
   (return
-   (unreachable)
+   (block
+    (drop
+     (i32.const 10)
+    )
+    (unreachable)
+   )
   )
  )
  (func $binary (type $3)
@@ -297,14 +299,16 @@
     )
    )
   )
-  (unreachable)
-  (drop
-   (i32.const 20)
-  )
   (drop
-   (i32.add
-    (i32.const 10)
-    (i32.const 30)
+   (block (result i32)
+    (unreachable)
+    (drop
+     (i32.const 20)
+    )
+    (i32.add
+     (i32.const 10)
+     (i32.const 30)
+    )
    )
   )
  )
@@ -460,7 +464,7 @@
   (drop
    (select
     (i32.const 20)
-    (block
+    (block (result i32)
      (unreachable)
      (i32.const 40)
     )
@@ -478,7 +482,7 @@
   (drop
    (select
     (i32.const 20)
-    (block
+    (block (result i32)
      (drop
       (i32.const 30)
      )
@@ -502,7 +506,7 @@
    (select
     (i32.const 20)
     (i32.const 40)
-    (block
+    (block (result i32)
      (unreachable)
      (i32.const 60)
     )
@@ -518,7 +522,7 @@
    (select
     (i32.const 20)
     (i32.const 40)
-    (block
+    (block (result i32)
      (drop
       (i32.const 50)
      )
@@ -639,7 +643,7 @@
   )
   (call $call-ii
    (i32.const 20)
-   (block
+   (block (result i32)
     (unreachable)
     (i32.const 30)
    )
@@ -649,7 +653,7 @@
   )
   (call $call-ii
    (i32.const 20)
-   (block
+   (block (result i32)
     (drop
      (i32.const 30)
     )
@@ -826,12 +830,14 @@
  )
  (func $return-different-type (type $4) (result i32)
   (drop
-   (i32.const 2)
-  )
-  (drop
    (f64.abs
-    (return
-     (i32.const 1)
+    (block
+     (drop
+      (i32.const 2)
+     )
+     (return
+      (i32.const 1)
+     )
     )
    )
   )
@@ -850,4 +856,40 @@
   (unreachable)
   (f64.const -1)
  )
+ (func $dont-move-unreachable (type $3)
+  (loop $label$0
+   (drop
+    (block (result i32)
+     (br $label$0)
+     (i32.const 1)
+    )
+   )
+  )
+ )
+ (func $dont-move-unreachable-last (type $3)
+  (loop $label$0
+   (drop
+    (block (result i32)
+     (call $dont-move-unreachable-last)
+     (br $label$0)
+    )
+   )
+  )
+ )
+ (func $move-around-unreachable-in-middle (type $3)
+  (loop $label$0
+   (nop)
+   (drop
+    (block $label$3 (result i32)
+     (drop
+      (br_if $label$3
+       (br $label$0)
+       (i32.const 0)
+      )
+     )
+     (i32.const 1)
+    )
+   )
+  )
+ )
 )
diff --git a/test/passes/remove-unused-names_merge-blocks.wast b/test/passes/remove-unused-names_merge-blocks.wast
index c249a34dd..1233ef538 100644
--- a/test/passes/remove-unused-names_merge-blocks.wast
+++ b/test/passes/remove-unused-names_merge-blocks.wast
@@ -1014,4 +1014,44 @@
    (f64.const -1)
   )
  )
+ (func $dont-move-unreachable
+  (loop $label$0
+   (drop
+    (block $label$3 (result i32)
+     (br $label$0)
+     (i32.const 1)
+    )
+   )
+  )
+ )
+ (func $dont-move-unreachable-last
+  (loop $label$0
+   (drop
+    (block $label$3 (result i32)
+     (call $dont-move-unreachable-last)
+     (br $label$0)
+    )
+   )
+  )
+ )
+ (func $move-around-unreachable-in-middle
+  (loop $label$0
+   (drop
+    (block $label$2 (result i32)
+     (block $block2
+      (nop)
+     )
+     (block $label$3 (result i32)
+      (drop
+       (br_if $label$3
+        (br $label$0)
+        (i32.const 0)
+       )
+      )
+      (i32.const 1)
+     )
+    )
+   )
+  )
+ )
 )