Emit try_table instruction

ocaml-wasm · Aug 20, 2024 · 6d2cafb · 6d2cafb
1 parent dbda159
commit 6d2cafb
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/compiler/lib/wasm/wa_wat_output.ml b/compiler/lib/wasm/wa_wat_output.ml
@@ -480,16 +480,13 @@ let expression_or_instructions ctx st in_function =
         ]
     | Try (ty, body, catches) ->
         [ List
-            (Atom "try"
+            (Atom "try_table"
             :: (block_type st ty
-               @ List (Atom "do" :: instructions body)
-                 :: List.map
-                      ~f:(fun (tag, i, ty) ->
-                        List
-                          (Atom "catch"
-                          :: index st.tag_names tag
-                          :: instruction (Wa_ast.Br (i + 1, Some (Pop ty)))))
-                      catches))
+               @ List.map
+                   ~f:(fun (tag, i, _ty) ->
+                     List [ Atom "catch"; index st.tag_names tag; Atom (string_of_int i) ])
+                   catches
+               @ instructions body))
         ]
   and instruction i =
     match i with