6 files changed, 14 insertions, 1 deletions
diff --git a/test/exception-handling.wast b/test/exception-handling.wast
index 9681e234a..57766c2d3 100644
--- a/test/exception-handling.wast
+++ b/test/exception-handling.wast
@@ -40,6 +40,7 @@
 
     ;; Empty try body
     (try
+      (do)
       (catch
         (drop (exnref.pop))
       )
@@ -62,6 +63,7 @@
   ;; Test subtype relationship
   (func $subtype_test
     (try
+      (do)
       (catch
         (drop (exnref.pop))
         (drop
diff --git a/test/passes/dce_all-features.txt b/test/passes/dce_all-features.txt
index be8f34c43..d1d116046 100644
--- a/test/passes/dce_all-features.txt
+++ b/test/passes/dce_all-features.txt
@@ -513,6 +513,9 @@
     (unreachable)
    )
    (catch
+    (drop
+     (exnref.pop)
+    )
    )
   )
   (call $foo)
diff --git a/test/passes/dce_all-features.wast b/test/passes/dce_all-features.wast
index 42d23829a..641211eab 100644
--- a/test/passes/dce_all-features.wast
+++ b/test/passes/dce_all-features.wast
@@ -746,13 +746,18 @@
       (do
         (unreachable)
       )
-      (catch)
+      (catch
+        (drop
+          (exnref.pop)
+        )
+      )
     )
     (call $foo) ;; shouldn't be dce'd
   )
 
   (func $catch_unreachable
     (try
+      (do)
       (catch
         (unreachable)
       )
diff --git a/test/passes/remove-unused-names_code-folding_all-features.wast b/test/passes/remove-unused-names_code-folding_all-features.wast
index f62714810..bbe05648b 100644
--- a/test/passes/remove-unused-names_code-folding_all-features.wast
+++ b/test/passes/remove-unused-names_code-folding_all-features.wast
@@ -1196,6 +1196,7 @@
     (try
       (do
         (try
+          (do)
           (catch
             ;; Expressions containing exnref.pop should NOT be taken out and
             ;; folded.
diff --git a/test/passes/remove-unused-names_optimize-instructions_all-features.wast b/test/passes/remove-unused-names_optimize-instructions_all-features.wast
index 1c39a9d84..119667f42 100644
--- a/test/passes/remove-unused-names_optimize-instructions_all-features.wast
+++ b/test/passes/remove-unused-names_optimize-instructions_all-features.wast
@@ -64,6 +64,7 @@
       (try (result i32)
         (do
           (try
+            (do)
             (catch
               (drop (exnref.pop))
               (throw $e (i32.const 0))
diff --git a/test/passes/rse_all-features.wast b/test/passes/rse_all-features.wast
index 307b614e0..0f5f72c17 100644
--- a/test/passes/rse_all-features.wast
+++ b/test/passes/rse_all-features.wast
@@ -291,6 +291,7 @@
   (func $try1
     (local $x i32)
     (try
+      (do)
       (catch
         (drop (exnref.pop))
         (local.set $x (i32.const 1))