@grain/binaryen.ml 0.30.0 → 0.31.0

binaryen-archive/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## [0.31.0](https://github.com/grain-lang/binaryen.ml/compare/v0.30.0...v0.31.0) (2025-11-02)
+
+
+### ⚠ BREAKING CHANGES
+
+* Upgrade to Binaryen v121 ([#207](https://github.com/grain-lang/binaryen.ml/issues/207))
+
+### Features
+
+* Upgrade to Binaryen v121 ([#207](https://github.com/grain-lang/binaryen.ml/issues/207)) ([7e51d5d](https://github.com/grain-lang/binaryen.ml/commit/7e51d5da5bd2336dd0122468bcc1e3030e13f86c))
+
 ## [0.30.0](https://github.com/grain-lang/binaryen.ml/compare/v0.29.0...v0.30.0) (2025-11-02)
 
 

binaryen-archive/binaryen.opam

@@ -1,5 +1,5 @@
 opam-version: "2.0"
-version: "0.30.0"
+version: "0.31.0"
 synopsis: "OCaml bindings for Binaryen"
 maintainer: "oscar@grain-lang.org"
 author: "Oscar Spencer"
@@ -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)"]

binaryen-archive/dune

@@ -1,3 +1,3 @@
 (dirs :standard)
 
-(data_only_dirs node_modules)
+(data_only_dirs node_modules)

binaryen-archive/esy.lock/index.json

@@ -1,5 +1,5 @@
 {
-  "checksum": "740e62f86d7dd58c1696929d6cf7fbfc",
+  "checksum": "3a14718f627039c7bf5ab17940a38d14",
   "root": "@grain/binaryen.ml@link-dev:./package.json",
   "node": {
     "ocaml@5.3.0@d41d8cd9": {
@@ -1960,14 +1960,14 @@
         [ "windows", "x86_64" ]
       ]
     },
-    "@grain/libbinaryen@120.0.0-b@d41d8cd9": {
-      "id": "@grain/libbinaryen@120.0.0-b@d41d8cd9",
+    "@grain/libbinaryen@121.0.0-b@d41d8cd9": {
+      "id": "@grain/libbinaryen@121.0.0-b@d41d8cd9",
       "name": "@grain/libbinaryen",
-      "version": "120.0.0-b",
+      "version": "121.0.0-b",
       "source": {
         "type": "install",
         "source": [
-          "archive:https://registry.npmjs.org/@grain/libbinaryen/-/libbinaryen-120.0.0-b.tgz#sha1:53d6f8db886cb01bdf7080afdc59a7e135bd54be"
+          "archive:https://registry.npmjs.org/@grain/libbinaryen/-/libbinaryen-121.0.0-b.tgz#sha1:0d6f99e9c9f9ed4dd07b3a012ba9c042c13e0783"
         ]
       },
       "overrides": [],
@@ -2000,7 +2000,7 @@
         "ocaml@5.3.0@d41d8cd9",
         "@opam/dune-configurator@opam:3.20.2@7eb6ff01",
         "@opam/dune@opam:3.20.2@8daef28d",
-        "@grain/libbinaryen@120.0.0-b@d41d8cd9"
+        "@grain/libbinaryen@121.0.0-b@d41d8cd9"
       ],
       "devDependencies": [
         "@opam/ocamlformat@opam:0.27.0@c40d4612",

binaryen-archive/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@grain/binaryen.ml",
-  "version": "0.30.0",
+  "version": "0.31.0",
   "description": "OCaml bindings for Binaryen.",
   "author": "Oscar Spencer <oscar@grain-lang.org>",
   "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"
   },

binaryen-archive/src/expression.c

@@ -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));
 }
 

binaryen-archive/src/expression.js

@@ -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

binaryen-archive/src/expression.ml

@@ -480,7 +480,8 @@ end
 module Switch = struct
   external make : Module.t -> string list -> string -> t -> t -> t
     = "caml_binaryen_switch"
-  (** Module, branch names, default branch name, condition, value. Value may be null. *)
+  (** Module, branch names, default branch name, condition, value. Value may be
+      null. *)
 
   external get_num_names : t -> int = "caml_binaryen_switch_get_num_names"
   external get_name_at : t -> int -> string = "caml_binaryen_switch_get_name_at"
@@ -544,7 +545,8 @@ module Call_indirect = struct
 
   external make_return :
     Module.t -> string -> t -> t list -> Type.t -> Type.t -> t
-    = "caml_binaryen_return_call_indirect__bytecode" "caml_binaryen_return_call_indirect"
+    = "caml_binaryen_return_call_indirect__bytecode"
+      "caml_binaryen_return_call_indirect"
   (** Module, table, function value, params, params type, return type. *)
 
   external get_target : t -> t = "caml_binaryen_call_indirect_get_target"
@@ -662,11 +664,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"
@@ -705,10 +707,13 @@ end
 module Memory_init = struct
   external make : Module.t -> string -> t -> t -> t -> string -> t
     = "caml_binaryen_memory_init__bytecode" "caml_binaryen_memory_init"
-  (** Module, segment, destination, offset, size, memory_name *)
+
   external get_segment : t -> string = "caml_binaryen_memory_init_get_segment"
+  (** Module, segment, destination, offset, size, memory_name *)
+
   external set_segment : t -> string -> unit
     = "caml_binaryen_memory_init_set_segment"
+
   external get_dest : t -> t = "caml_binaryen_memory_init_get_dest"
   external set_dest : t -> t -> unit = "caml_binaryen_memory_init_set_dest"
   external get_offset : t -> t = "caml_binaryen_memory_init_get_offset"
@@ -719,8 +724,10 @@ end
 
 module Data_drop = struct
   external make : Module.t -> string -> t = "caml_binaryen_data_drop"
-  (** Module, segment. *)
+
   external get_segment : t -> string = "caml_binaryen_data_drop_get_segment"
+  (** Module, segment. *)
+
   external set_segment : t -> string -> unit
     = "caml_binaryen_data_drop_set_segment"
 end

binaryen-archive/src/import.ml

@@ -1,7 +1,9 @@
 external add_function_import :
   Module.t -> string -> string -> string -> Type.t -> Type.t -> unit
-  = "caml_binaryen_add_function_import__bytecode" "caml_binaryen_add_function_import"
-(** Module, internal name, external module name, external base name, params type, results type. *)
+  = "caml_binaryen_add_function_import__bytecode"
+    "caml_binaryen_add_function_import"
+(** Module, internal name, external module name, external base name, params
+    type, results type. *)
 
 external add_table_import : Module.t -> string -> string -> string -> unit
   = "caml_binaryen_add_table_import"
@@ -14,8 +16,10 @@ external add_memory_import :
 
 external add_global_import :
   Module.t -> string -> string -> string -> Type.t -> bool -> unit
-  = "caml_binaryen_add_global_import__bytecode" "caml_binaryen_add_global_import"
-(** Module, internal name, external module name, external base name, type, mutable. *)
+  = "caml_binaryen_add_global_import__bytecode"
+    "caml_binaryen_add_global_import"
+(** Module, internal name, external module name, external base name, type,
+    mutable. *)
 
 external function_import_get_module : Function.t -> string
   = "caml_binaryen_function_import_get_module"

binaryen-archive/src/memory.ml

@@ -16,7 +16,8 @@ external set_memory :
 type segment = { name : string; data : bytes; kind : segment_kind; size : int }
 and segment_kind = Passive | Active of { offset : Expression.t }
 
-(** Module, initial size, maximum size, export name, segments, shared, memory64, moduleName . *)
+(** Module, initial size, maximum size, export name, segments, shared, memory64,
+    moduleName . *)
 let set_memory wasm_mod initial maximum export_name (segments : segment list)
     shared memory64 moduleName =
   let split_segments segments =

binaryen-archive/src/module.c

@@ -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);

binaryen-archive/src/module.js

@@ -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

binaryen-archive/src/module.ml

@@ -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"
 

binaryen-archive/src/module.mli

@@ -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

binaryen-archive/src/passes.ml

@@ -12,7 +12,8 @@ let avoid_reinterprets = "avoid-reinterprets"
 (** removes arguments to calls in an lto-like manner *)
 let dae = "dae"
 
-(** removes arguments to calls in an lto-like manner, and optimizes where we removed *)
+(** removes arguments to calls in an lto-like manner, and optimizes where we
+    removed *)
 let dae_optimizing = "dae-optimizing"
 
 (** refine and merge abstract (never-created) types *)
@@ -75,7 +76,8 @@ let extract_function_index = "extract-function-index"
 (** flattens out code, removing nesting *)
 let flatten = "flatten"
 
-(** emulates function pointer casts, allowing incorrect indirect calls to (sometimes) work *)
+(** emulates function pointer casts, allowing incorrect indirect calls to
+    (sometimes) work *)
 let fpcast_emu = "fpcast-emu"
 
 (** reports function metrics *)
@@ -84,7 +86,9 @@ let func_metrics = "func-metrics"
 (** generate dynCall fuctions used by emscripten ABI *)
 let generate_dyncalls = "generate-dyncalls"
 
-(** generate dynCall functions used by emscripten ABI, but only for functions with i64 in their signature (which cannot be invoked via the wasm table without JavaScript BigInt support). *)
+(** generate dynCall functions used by emscripten ABI, but only for functions
+    with i64 in their signature (which cannot be invoked via the wasm table
+    without JavaScript BigInt support). *)
 let generate_i64_dyncalls = "generate-i64-dyncalls"
 
 (** generate global effect info (helps later passes) *)
@@ -102,7 +106,8 @@ let gsi = "gsi"
 (** globally optimize GC types *)
 let gto = "gto"
 
-(** Grand Unified Flow Analysis: optimize the entire program using information about what content can actually appear in each location *)
+(** Grand Unified Flow Analysis: optimize the entire program using information
+    about what content can actually appear in each location *)
 let gufa = "gufa"
 
 (** GUFA plus local optimizations in functions we modified *)
@@ -132,7 +137,8 @@ let jspi = "jspi"
 (** legalizes i64 types on the import/export boundary *)
 let legalize_js_interface = "legalize-js-interface"
 
-(** legalizes i64 types on the import/export boundary in a minimal manner, only on things only JS will call *)
+(** legalizes i64 types on the import/export boundary in a minimal manner, only
+    on things only JS will call *)
 let legalize_js_interface_minimally = "legalize-js-interface-minimally"
 
 (** common subexpression elimination inside basic blocks *)
@@ -177,17 +183,21 @@ let merge_locals = "merge-locals"
 (** reports metrics *)
 let metrics = "metrics"
 
-(** minifies import names (only those, and not export names), and emits a mapping to the minified ones *)
+(** minifies import names (only those, and not export names), and emits a
+    mapping to the minified ones *)
 let minify_imports = "minify-imports"
 
-(** minifies both import and export names, and emits a mapping to the minified ones *)
+(** minifies both import and export names, and emits a mapping to the minified
+    ones *)
 let minify_imports_and_exports = "minify-imports-and-exports"
 
-(** minifies both import and export names, and emits a mapping to the minified ones, and minifies the modules as well *)
+(** minifies both import and export names, and emits a mapping to the minified
+    ones, and minifies the modules as well *)
 let minify_imports_and_exports_and_modules =
   "minify-imports-and-exports-and-modules"
 
-(** apply the assumption that asyncify imports always unwind, and we never rewind *)
+(** apply the assumption that asyncify imports always unwind, and we never
+    rewind *)
 let mod_asyncify_always_and_only_unwind = "mod-asyncify-always-and-only-unwind"
 
 (** apply the assumption that asyncify never unwinds *)
@@ -202,7 +212,8 @@ let monomorphize_always = "monomorphize-always"
 (** combines multiple memories into a single memory *)
 let multi_memory_lowering = "multi-memory-lowering"
 
-(** combines multiple memories into a single memory, trapping if the read or write is larger than the length of the memory's data *)
+(** combines multiple memories into a single memory, trapping if the read or
+    write is larger than the length of the memory's data *)
 let multi_memory_lowering_with_bounds_checks =
   "multi-memory-lowering-with-bounds-checks"
 
@@ -218,7 +229,8 @@ let once_reduction = "once-reduction"
 (** optimizes added constants into load/store offsets *)
 let optimize_added_constants = "optimize-added-constants"
 
-(** optimizes added constants into load/store offsets, propagating them across locals too *)
+(** optimizes added constants into load/store offsets, propagating them across
+    locals too *)
 let optimize_added_constants_propagate = "optimize-added-constants-propagate"
 
 (** eliminate and reuse casts *)
@@ -245,7 +257,8 @@ let optimize_for_js = "optimize-for-js"
 (** computes compile-time evaluatable expressions *)
 let precompute = "precompute"
 
-(** computes compile-time evaluatable expressions and propagates them through locals *)
+(** computes compile-time evaluatable expressions and propagates them through
+    locals *)
 let precompute_propagate = "precompute-propagate"
 
 (** print in s-expression format *)
@@ -330,19 +343,22 @@ let signature_pruning = "signature-pruning"
 (** apply more specific subtypes to signature types where possible *)
 let signature_refining = "signature-refining"
 
-(** lower sign-ext operations to wasm mvp and disable the sign extension feature *)
+(** lower sign-ext operations to wasm mvp and disable the sign extension feature
+*)
 let signext_lowering = "signext-lowering"
 
 (** miscellaneous globals-related optimizations *)
 let simplify_globals = "simplify-globals"
 
-(** miscellaneous globals-related optimizations, and optimizes where we replaced global.gets with constants *)
+(** miscellaneous globals-related optimizations, and optimizes where we replaced
+    global.gets with constants *)
 let simplify_globals_optimizing = "simplify-globals-optimizing"
 
 (** miscellaneous locals-related optimizations *)
 let simplify_locals = "simplify-locals"
 
-(** miscellaneous locals-related optimizations (no nesting at all; preserves flatness) *)
+(** miscellaneous locals-related optimizations (no nesting at all; preserves
+    flatness) *)
 let simplify_locals_nonesting = "simplify-locals-nonesting"
 
 (** miscellaneous locals-related optimizations (no tees) *)

binaryen-archive/src/passes.mli

@@ -13,7 +13,8 @@ val dae : t
 (** removes arguments to calls in an lto-like manner *)
 
 val dae_optimizing : t
-(** removes arguments to calls in an lto-like manner, and optimizes where we removed *)
+(** removes arguments to calls in an lto-like manner, and optimizes where we
+    removed *)
 
 val abstract_type_refining : t
 (** refine and merge abstract (never-created) types *)
@@ -76,7 +77,8 @@ val flatten : t
 (** flattens out code, removing nesting *)
 
 val fpcast_emu : t
-(** emulates function pointer casts, allowing incorrect indirect calls to (sometimes) work *)
+(** emulates function pointer casts, allowing incorrect indirect calls to
+    (sometimes) work *)
 
 val func_metrics : t
 (** reports function metrics *)
@@ -85,7 +87,9 @@ val generate_dyncalls : t
 (** generate dynCall fuctions used by emscripten ABI *)
 
 val generate_i64_dyncalls : t
-(** generate dynCall functions used by emscripten ABI, but only for functions with i64 in their signature (which cannot be invoked via the wasm table without JavaScript BigInt support). *)
+(** generate dynCall functions used by emscripten ABI, but only for functions
+    with i64 in their signature (which cannot be invoked via the wasm table
+    without JavaScript BigInt support). *)
 
 val generate_global_effects : t
 (** generate global effect info (helps later passes) *)
@@ -103,7 +107,8 @@ val gto : t
 (** globally optimize GC types *)
 
 val gufa : t
-(** Grand Unified Flow Analysis: optimize the entire program using information about what content can actually appear in each location *)
+(** Grand Unified Flow Analysis: optimize the entire program using information
+    about what content can actually appear in each location *)
 
 val gufa_optimizing : t
 (** GUFA plus local optimizations in functions we modified *)
@@ -133,7 +138,8 @@ val legalize_js_interface : t
 (** legalizes i64 types on the import/export boundary *)
 
 val legalize_js_interface_minimally : t
-(** legalizes i64 types on the import/export boundary in a minimal manner, only on things only JS will call *)
+(** legalizes i64 types on the import/export boundary in a minimal manner, only
+    on things only JS will call *)
 
 val local_cse : t
 (** common subexpression elimination inside basic blocks *)
@@ -178,16 +184,20 @@ val metrics : t
 (** reports metrics *)
 
 val minify_imports : t
-(** minifies import names (only those, and not export names), and emits a mapping to the minified ones *)
+(** minifies import names (only those, and not export names), and emits a
+    mapping to the minified ones *)
 
 val minify_imports_and_exports : t
-(** minifies both import and export names, and emits a mapping to the minified ones *)
+(** minifies both import and export names, and emits a mapping to the minified
+    ones *)
 
 val minify_imports_and_exports_and_modules : t
-(** minifies both import and export names, and emits a mapping to the minified ones, and minifies the modules as well *)
+(** minifies both import and export names, and emits a mapping to the minified
+    ones, and minifies the modules as well *)
 
 val mod_asyncify_always_and_only_unwind : t
-(** apply the assumption that asyncify imports always unwind, and we never rewind *)
+(** apply the assumption that asyncify imports always unwind, and we never
+    rewind *)
 
 val mod_asyncify_never_unwind : t
 (** apply the assumption that asyncify never unwinds *)
@@ -202,7 +212,8 @@ val multi_memory_lowering : t
 (** combines multiple memories into a single memory *)
 
 val multi_memory_lowering_with_bounds_checks : t
-(** combines multiple memories into a single memory, trapping if the read or write is larger than the length of the memory's data *)
+(** combines multiple memories into a single memory, trapping if the read or
+    write is larger than the length of the memory's data *)
 
 val nm : t
 (** name list *)
@@ -217,7 +228,8 @@ val optimize_added_constants : t
 (** optimizes added constants into load/store offsets *)
 
 val optimize_added_constants_propagate : t
-(** optimizes added constants into load/store offsets, propagating them across locals too *)
+(** optimizes added constants into load/store offsets, propagating them across
+    locals too *)
 
 val optimize_casts : t
 (** eliminate and reuse casts *)
@@ -244,7 +256,8 @@ val precompute : t
 (** computes compile-time evaluatable expressions *)
 
 val precompute_propagate : t
-(** computes compile-time evaluatable expressions and propagates them through locals *)
+(** computes compile-time evaluatable expressions and propagates them through
+    locals *)
 
 val print : t
 (** print in s-expression format *)
@@ -334,13 +347,15 @@ val simplify_globals : t
 (** miscellaneous globals-related optimizations *)
 
 val simplify_globals_optimizing : t
-(** miscellaneous globals-related optimizations, and optimizes where we replaced global.gets with constants *)
+(** miscellaneous globals-related optimizations, and optimizes where we replaced
+    global.gets with constants *)
 
 val simplify_locals : t
 (** miscellaneous locals-related optimizations *)
 
 val simplify_locals_nonesting : t
-(** miscellaneous locals-related optimizations (no nesting at all; preserves flatness) *)
+(** miscellaneous locals-related optimizations (no nesting at all; preserves
+    flatness) *)
 
 val simplify_locals_notee : t
 (** miscellaneous locals-related optimizations (no tees) *)