feat!: Upgrade to Binaryen v121

Author: ospencer

binaryen.opam

@@ -16,6 +16,6 @@ depends: [
   "dune" {>= "3.0.0"}
   "dune-configurator" {>= "3.0.0"}
   "js_of_ocaml-compiler" {>= "6.0.0" < "7.0.0"}
-  "libbinaryen" {> "120.0.0" < "121.0.0"}
+  "libbinaryen" {> "121.0.0" < "122.0.0"}
 ]
 x-maintenance-intent: ["0.(latest)"]

esy.lock/index.json

@@ -6,7 +6,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "ocaml": ">= 4.13.0 < 5.4.0",
-    "@grain/libbinaryen": "120.0.0-b",
+    "@grain/libbinaryen": "121.0.0-b",
     "@opam/dune": ">= 3.0.0",
     "@opam/dune-configurator": ">= 3.0.0"
   },

package.json

@@ -285,14 +285,13 @@ caml_binaryen_binary(value _module, value _op, value _p1, value _p2) {
 }
 
 CAMLprim value
-caml_binaryen_select(value _module, value _cond, value _tru, value _fals, value _ty) {
-  CAMLparam5(_module, _cond, _tru, _fals, _ty);
+caml_binaryen_select(value _module, value _cond, value _tru, value _fals) {
+  CAMLparam4(_module, _cond, _tru, _fals);
   BinaryenModuleRef module = BinaryenModuleRef_val(_module);
   BinaryenExpressionRef cond = BinaryenExpressionRef_val(_cond);
   BinaryenExpressionRef tru = BinaryenExpressionRef_val(_tru);
   BinaryenExpressionRef fals = BinaryenExpressionRef_val(_fals);
-  BinaryenType ty = BinaryenType_val(_ty);
-  BinaryenExpressionRef exp = BinaryenSelect(module, cond, tru, fals, ty);
+  BinaryenExpressionRef exp = BinaryenSelect(module, cond, tru, fals);
   CAMLreturn(alloc_BinaryenExpressionRef(exp));
 }
 

src/expression.c

@@ -403,8 +403,8 @@ function caml_binaryen_binary(wasm_mod, op, p1, p2) {
 }
 
 //Provides: caml_binaryen_select
-function caml_binaryen_select(wasm_mod, cond, if_true, if_false, typ) {
-  return wasm_mod.select(cond, if_true, if_false, typ);
+function caml_binaryen_select(wasm_mod, cond, if_true, if_false) {
+  return wasm_mod.select(cond, if_true, if_false);
 }
 
 //Provides: caml_binaryen_drop

src/expression.js

@@ -662,11 +662,11 @@ module Binary = struct
 end
 
 module Select = struct
-  external make : Module.t -> t -> t -> t -> Type.t -> t
+  external make : Module.t -> t -> t -> t -> t
     = "caml_binaryen_select"
 
   (** Module, condition, true branch, false branch. *)
-  let make wasm_mod cond tru fals = make wasm_mod cond tru fals Type.auto
+  let make wasm_mod cond tru fals = make wasm_mod cond tru fals
 
   external get_if_true : t -> t = "caml_binaryen_select_get_if_true"
   external set_if_true : t -> t -> unit = "caml_binaryen_select_set_if_true"

src/expression.ml

@@ -78,14 +78,6 @@ caml_binaryen_module_run_passes(value _module, value _passes) {
   CAMLreturn(Val_unit);
 }
 
-CAMLprim value
-caml_binaryen_module_auto_drop(value _module) {
-  CAMLparam1(_module);
-  BinaryenModuleRef module = BinaryenModuleRef_val(_module);
-  BinaryenModuleAutoDrop(module);
-  CAMLreturn(Val_unit);
-}
-
 CAMLprim value
 caml_binaryen_module_write(value _module, value _sourceMapUrl) {
   CAMLparam2(_module, _sourceMapUrl);

src/module.c

@@ -67,11 +67,6 @@ function caml_binaryen_module_run_passes(wasm_mod, passes) {
   );
 }
 
-//Provides: caml_binaryen_module_auto_drop
-function caml_binaryen_module_auto_drop(wasm_mod) {
-  return wasm_mod.autoDrop();
-}
-
 //Provides: caml_binaryen_module_write
 //Requires: to_option
 //Requires: caml_jsstring_of_string, caml_string_of_jsstring, caml_bytes_of_array

src/module.js

@@ -115,8 +115,6 @@ let set_features wasm_mod features =
 external run_passes : t -> Passes.t list -> unit
   = "caml_binaryen_module_run_passes"
 
-external auto_drop : t -> unit = "caml_binaryen_module_auto_drop"
-
 external write : t -> string option -> bytes * string option
   = "caml_binaryen_module_write"
 

src/module.ml

@@ -35,7 +35,6 @@ val optimize : t -> unit
 val get_features : t -> Feature.t list
 val set_features : t -> Feature.t list -> unit
 val run_passes : t -> Passes.t list -> unit
-val auto_drop : t -> unit
 val write : t -> string option -> bytes * string option
 val write_text : t -> string
 val write_stack_ir : t -> string