4 files changed, 69 insertions, 8 deletions
diff --git a/test/exception-handling.wast b/test/exception-handling.wast
index cd436296b..1db356684 100644
--- a/test/exception-handling.wast
+++ b/test/exception-handling.wast
@@ -8,7 +8,7 @@
   (func $foo)
   (func $bar)
 
-  (func $eh_test (local $x (i32 i64))
+  (func $eh-test (local $x (i32 i64))
     ;; Simple try-catch
     (try
       (do
@@ -313,7 +313,7 @@
     )
   )
 
-  (func $pop_test
+  (func $pop-test
     (try
       (do)
       (catch $e-i32
@@ -337,4 +337,19 @@
       )
     )
   )
+
+  (func $catchless-try-with-inner-delegate
+    (try $label$0
+      (do
+        (try
+          (do
+            (throw $e-i32
+              (i32.const 0)
+            )
+          )
+          (delegate $label$0)
+        )
+      )
+    )
+  )
 )
diff --git a/test/exception-handling.wast.from-wast b/test/exception-handling.wast.from-wast
index ee409652b..c53f602d9 100644
--- a/test/exception-handling.wast.from-wast
+++ b/test/exception-handling.wast.from-wast
@@ -15,7 +15,7 @@
  (func $bar
   (nop)
  )
- (func $eh_test
+ (func $eh-test
   (local $x (i32 i64))
   (try $try
    (do
@@ -353,7 +353,7 @@
    )
   )
  )
- (func $pop_test
+ (func $pop-test
   (try $try
    (do
     (nop)
@@ -379,4 +379,18 @@
    )
   )
  )
+ (func $catchless-try-with-inner-delegate
+  (try $label$0
+   (do
+    (try $try
+     (do
+      (throw $e-i32
+       (i32.const 0)
+      )
+     )
+     (delegate $label$0)
+    )
+   )
+  )
+ )
 )
diff --git a/test/exception-handling.wast.fromBinary b/test/exception-handling.wast.fromBinary
index 9a89a0beb..29231a943 100644
--- a/test/exception-handling.wast.fromBinary
+++ b/test/exception-handling.wast.fromBinary
@@ -15,7 +15,7 @@
  (func $bar
   (nop)
  )
- (func $eh_test
+ (func $eh-test
   (local $x i32)
   (local $1 i64)
   (local $2 (i32 i64))
@@ -197,7 +197,7 @@
     )
    )
   )
-  (try
+  (try $label$37
    (do
     (throw $tag$0
      (i32.const 0)
@@ -382,7 +382,7 @@
    )
   )
  )
- (func $pop_test
+ (func $pop-test
   (try $label$5
    (do
     (nop)
@@ -408,5 +408,21 @@
    )
   )
  )
+ (func $catchless-try-with-inner-delegate
+  (try $label$6
+   (do
+    (block $label$1
+     (try $label$4
+      (do
+       (throw $tag$0
+        (i32.const 0)
+       )
+      )
+      (delegate $label$6)
+     )
+    )
+   )
+  )
+ )
 )
 
diff --git a/test/exception-handling.wast.fromBinary.noDebugInfo b/test/exception-handling.wast.fromBinary.noDebugInfo
index eb6b98bd8..16ab587b2 100644
--- a/test/exception-handling.wast.fromBinary.noDebugInfo
+++ b/test/exception-handling.wast.fromBinary.noDebugInfo
@@ -197,7 +197,7 @@
     )
    )
   )
-  (try
+  (try $label$37
    (do
     (throw $tag$0
      (i32.const 0)
@@ -408,5 +408,21 @@
    )
   )
  )
+ (func $6
+  (try $label$6
+   (do
+    (block $label$1
+     (try $label$4
+      (do
+       (throw $tag$0
+        (i32.const 0)
+       )
+      )
+      (delegate $label$6)
+     )
+    )
+   )
+  )
+ )
 )