feat: Remove legacy instructions

Author: spotandjake

src/expression.c

@@ -1946,15 +1946,6 @@ caml_binaryen_throw(value _module, value _tag, value _operands) {
   CAMLreturn(alloc_BinaryenExpressionRef(exp));
 }
 
-CAMLprim value
-caml_binaryen_rethrow(value _module, value _target) {
-  CAMLparam2(_module, _target);
-  BinaryenModuleRef module = BinaryenModuleRef_val(_module);
-  char *target = Safe_String_val(_target);
-  BinaryenExpressionRef exp = BinaryenRethrow(module, target);
-  CAMLreturn(alloc_BinaryenExpressionRef(exp));
-}
-
 CAMLprim value
 caml_binaryen_try_get_name(value _expr) {
   CAMLparam1(_expr);
@@ -2111,35 +2102,6 @@ caml_binaryen_try_has_catch_all(value _expr) {
   CAMLreturn(Val_bool(binaryenRetVal));
 }
 
-CAMLprim value
-caml_binaryen_try_get_delegate_target(value _expr) {
-  CAMLparam1(_expr);
-  BinaryenExpressionRef expr = BinaryenExpressionRef_val(_expr);
-  const char* binaryenRetVal = BinaryenTryGetDelegateTarget(expr);
-  if (binaryenRetVal == NULL) {
-    CAMLreturn(Val_none);
-  } else {
-    CAMLreturn(caml_alloc_some(caml_copy_string(binaryenRetVal)));
-  }
-}
-
-CAMLprim value
-caml_binaryen_try_set_delegate_target(value _expr, value _delegateTarget) {
-  CAMLparam2(_expr, _delegateTarget);
-  BinaryenExpressionRef expr = BinaryenExpressionRef_val(_expr);
-  const char* delegateTarget = Safe_String_val(_delegateTarget);
-  BinaryenTrySetDelegateTarget(expr, delegateTarget);
-  CAMLreturn(Val_unit);
-}
-
-CAMLprim value
-caml_binaryen_try_is_delegate(value _expr) {
-  CAMLparam1(_expr);
-  BinaryenExpressionRef expr = BinaryenExpressionRef_val(_expr);
-  bool binaryenRetVal = BinaryenTryIsDelegate(expr);
-  CAMLreturn(Val_bool(binaryenRetVal));
-}
-
 CAMLprim value
 caml_binaryen_throw_get_tag(value _expr) {
   CAMLparam1(_expr);
@@ -2212,27 +2174,6 @@ caml_binaryen_throw_remove_operand_at(value _expr, value _index) {
   CAMLreturn(alloc_BinaryenExpressionRef(binaryenRetVal));
 }
 
-CAMLprim value
-caml_binaryen_rethrow_get_target(value _expr) {
-  CAMLparam1(_expr);
-  BinaryenExpressionRef expr = BinaryenExpressionRef_val(_expr);
-  const char* binaryenRetVal = BinaryenRethrowGetTarget(expr);
-  if (binaryenRetVal == NULL) {
-    CAMLreturn(Val_none);
-  } else {
-    CAMLreturn(caml_alloc_some(caml_copy_string(binaryenRetVal)));
-  }
-}
-
-CAMLprim value
-caml_binaryen_rethrow_set_target(value _expr, value _target) {
-  CAMLparam2(_expr, _target);
-  BinaryenExpressionRef expr = BinaryenExpressionRef_val(_expr);
-  const char* target = Safe_String_val(_target);
-  BinaryenRethrowSetTarget(expr, target);
-  CAMLreturn(Val_unit);
-}
-
 // Table operations
 CAMLprim value
 caml_binaryen_table_get(value _module, value _name, value _index, value _ty) {

src/expression.js

@@ -1736,14 +1736,6 @@ function caml_binaryen_throw(wasm_mod, tag, operands) {
   );
 }
 
-//Provides: caml_binaryen_rethrow
-//Requires: caml_jsstring_of_string
-function caml_binaryen_rethrow(wasm_mod, target) {
-  return wasm_mod.rethrow(
-    caml_jsstring_of_string(target),
-  )
-}
-
 //Provides: caml_binaryen_try_get_name
 //Requires: Binaryen, caml_string_of_jsstring, to_option
 function caml_binaryen_try_get_name(expr) {
@@ -1849,29 +1841,6 @@ function caml_binaryen_try_has_catch_all(expr) {
   return caml_js_to_bool(Binaryen.Try.hasCatchAll(expr));
 }
 
-//Provides: caml_binaryen_try_get_delegate_target
-//Requires: Binaryen
-//Requires: caml_string_of_jsstring
-//Requires: to_option
-function caml_binaryen_try_get_delegate_target(expr) {
-  const name = Binaryen.Try.getDelegateTarget(expr);
-  const str = name ? caml_string_of_jsstring(name) : null;
-  return to_option(str);
-}
-
-//Provides: caml_binaryen_try_set_delegate_target
-//Requires: Binaryen, caml_jsstring_of_string
-function caml_binaryen_try_set_delegate_target(expr, delegateTarget) {
-  Binaryen.Try.setDelegateTarget(expr, caml_jsstring_of_string(delegateTarget));
-}
-
-//Provides: caml_binaryen_try_is_delegate
-//Requires: Binaryen
-//Requires: caml_js_to_bool
-function caml_binaryen_try_is_delegate(expr) {
-  return caml_js_to_bool(Binaryen.Try.isDelegate(expr));
-}
-
 //Provides: caml_binaryen_throw_get_tag
 //Requires: Binaryen, caml_string_of_jsstring
 function caml_binaryen_throw_get_tag(expr) {
@@ -1920,21 +1889,6 @@ function caml_binaryen_throw_remove_operand_at(expr, index) {
   return Binaryen.Throw.removeOperandAt(expr, index);
 }
 
-//Provides: caml_binaryen_rethrow_get_target
-//Requires: Binaryen, caml_string_of_jsstring
-//Requires: to_option
-function caml_binaryen_rethrow_get_target(expr) {
-  const name = Binaryen.Rethrow.getTarget(expr);
-  const str = name ? caml_string_of_jsstring(name) : null;
-  return to_option(str);
-}
-
-//Provides: caml_binaryen_rethrow_set_target
-//Requires: Binaryen, caml_jsstring_of_string
-function caml_binaryen_rethrow_set_target(expr, target) {
-  Binaryen.Rethrow.setTarget(expr, caml_jsstring_of_string(target));
-}
-
 // Table operations
 
 //Provides: caml_binaryen_table_get

src/expression.ml

@@ -845,6 +845,16 @@ module Try = struct
     t = "caml_binaryen_try__bytecode" "caml_binaryen_try"
   (** Module, name, body, catch tags, catch bodies, delegate target *)
 
+  (** Module, name, body, catch clauses, catch all *)
+  let make wasm_mod name body catch_clauses catch_all =
+    let catch_tags, catch_bodies = List.split catch_clauses in
+    let catch_bodies =
+      match catch_all with
+      | Some target -> List.append catch_bodies [ target ]
+      | None -> catch_bodies
+    in
+    make wasm_mod name body catch_tags catch_bodies None
+
   external get_name : t -> string option = "caml_binaryen_try_get_name"
   (** expr *)
 
@@ -907,69 +917,6 @@ module Try = struct
 
   external has_catch_all : t -> bool = "caml_binaryen_try_has_catch_all"
   (** expr *)
-
-  external get_delegate_target : t -> string option
-    = "caml_binaryen_try_get_delegate_target"
-  (** expr *)
-
-  external set_delegate_target : t -> string -> unit
-    = "caml_binaryen_try_set_delegate_target"
-  (** expr, delegateTarget *)
-
-  external is_delegate : t -> bool = "caml_binaryen_try_is_delegate"
-  (** expr *)
-end
-
-module Try_Catch = struct
-  let make module_ name body catch_tags catch_bodies =
-    Try.make module_ name body catch_tags catch_bodies None
-
-  let get_name = Try.get_name
-  let set_name = Try.set_name
-  let get_body = Try.get_body
-  let set_body = Try.set_body
-  let get_num_catch_tags = Try.get_num_catch_tags
-  let get_num_catch_bodies = Try.get_num_catch_bodies
-  let get_catch_tag_at = Try.get_catch_tag_at
-  let set_catch_tag_at = Try.set_catch_tag_at
-  let append_catch_tag = Try.append_catch_tag
-  let insert_catch_tag_at = Try.insert_catch_tag_at
-  let remove_catch_tag_at = Try.remove_catch_tag_at
-  let get_catch_body_at = Try.get_catch_body_at
-  let set_catch_body_at = Try.set_catch_body_at
-  let append_catch_body = Try.append_catch_body
-  let insert_catch_body_at = Try.insert_catch_body_at
-  let remove_catch_body_at = Try.remove_catch_body_at
-  let has_catch_all = Try.has_catch_all
-  let get_delegate_target = Try.get_delegate_target
-  let set_delegate_target = Try.set_delegate_target
-  let is_delegate = Try.is_delegate
-end
-
-module Try_Delegate = struct
-  let make module_ name body delegate =
-    Try.make module_ name body [] [] (Some delegate)
-
-  let get_name = Try.get_name
-  let set_name = Try.set_name
-  let get_body = Try.get_body
-  let set_body = Try.set_body
-  let get_num_catch_tags = Try.get_num_catch_tags
-  let get_num_catch_bodies = Try.get_num_catch_bodies
-  let get_catch_tag_at = Try.get_catch_tag_at
-  let set_catch_tag_at = Try.set_catch_tag_at
-  let append_catch_tag = Try.append_catch_tag
-  let insert_catch_tag_at = Try.insert_catch_tag_at
-  let remove_catch_tag_at = Try.remove_catch_tag_at
-  let get_catch_body_at = Try.get_catch_body_at
-  let set_catch_body_at = Try.set_catch_body_at
-  let append_catch_body = Try.append_catch_body
-  let insert_catch_body_at = Try.insert_catch_body_at
-  let remove_catch_body_at = Try.remove_catch_body_at
-  let has_catch_all = Try.has_catch_all
-  let get_delegate_target = Try.get_delegate_target
-  let set_delegate_target = Try.set_delegate_target
-  let is_delegate = Try.is_delegate
 end
 
 module Throw = struct
@@ -1004,17 +951,6 @@ module Throw = struct
   (** expr, index *)
 end
 
-module Rethrow = struct
-  external make : Module.t -> string -> t = "caml_binaryen_rethrow"
-  (** Module, target *)
-
-  external get_target : t -> string option = "caml_binaryen_rethrow_get_target"
-  (** expr *)
-
-  external set_target : t -> string -> unit = "caml_binaryen_rethrow_set_target"
-  (** expr, target *)
-end
-
 module Table = struct
   external get : Module.t -> string -> t -> Type.t -> t
     = "caml_binaryen_table_get"