[interpreter] Fix crashes on try_table with parameters (#321)

The test case was ported from toywasm.
WebAssembly · Jul 4, 2024 · 5837755 · 5837755
1 parent cfb909d
commit 5837755
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/interpreter/exec/eval.ml b/interpreter/exec/eval.ml
@@ -244,7 +244,7 @@ let rec step (c : config) : config =
         let n1 = Lib.List32.length ts1 in
         let n2 = Lib.List32.length ts2 in
         let args, vs' = take n1 vs e.at, drop n1 vs e.at in
-        vs', [Handler (n2, cs, (args, [Label (n2, [], ([], List.map plain es')) @@ e.at])) @@ e.at]
+        vs', [Handler (n2, cs, ([], [Label (n2, [], (args, List.map plain es')) @@ e.at])) @@ e.at]
 
       | Drop, v :: vs' ->
         vs', []

diff --git a/test/core/try_table.wast b/test/core/try_table.wast
@@ -238,6 +238,10 @@
       )
     )
   )
+
+  (func (export "try-with-param")
+    (i32.const 0) (try_table (param i32) (drop))
+  )
 )
 
 (assert_return (invoke "simple-throw-catch" (i32.const 0)) (i32.const 23))
@@ -294,6 +298,8 @@
 (assert_exception (invoke "return-call-in-try-catch"))
 (assert_exception (invoke "return-call-indirect-in-try-catch"))
 
+(assert_return (invoke "try-with-param"))
+
 (module
   (func $imported-throw (import "test" "throw"))
   (tag $e0)