@grain/binaryen.ml 0.25.0 → 0.27.0

binaryen-archive/esy.lock/opam/{yojson.2.2.2 → yojson.3.0.0}/opam

@@ -16,9 +16,8 @@ doc: "https://ocaml.org/p/yojson/latest"
 bug-reports: "https://github.com/ocaml-community/yojson/issues"
 depends: [
   "dune" {>= "2.7"}
-  "ocaml" {>= "4.02.3"}
+  "ocaml" {>= "4.08"}
   "alcotest" {with-test & >= "0.8.5"}
-  "seq" {>= "0.2.2"}
   "odoc" {with-doc}
 ]
 build: [
@@ -38,10 +37,10 @@ build: [
 dev-repo: "git+https://github.com/ocaml-community/yojson.git"
 url {
   src:
-    "https://github.com/ocaml-community/yojson/releases/download/2.2.2/yojson-2.2.2.tbz"
+    "https://github.com/ocaml-community/yojson/releases/download/3.0.0/yojson-3.0.0.tbz"
   checksum: [
-    "sha256=9abfad8c9a79d4723ad2f6448e669c1e68dbfc87cc54a1b7c064b0c90912c595"
-    "sha512=ac52eae3ca1d3129a7885ca638e6ae5bcfc387598a82cc30d3e4988fd154f1756719c399f96e950d898c79a6dbd4ccc44b6f468bcafbd620e6945a0415b41e0c"
+    "sha256=99414da7609b92a02474ef4b49ecda15edc8cbba5229341b124e7e4695c39610"
+    "sha512=896d0ea829a36ccadba6628800369c1a3ab9e7c64dbda8b76331889c9db481cd64e137f467481ae80a8dd5fca45d748bfa71f58641806cc1bb1a007f8291789f"
   ]
 }
-x-commit-hash: "3f82b79d1865eec82c6f498ee1835a90c74c31b4"
+x-commit-hash: "b2193e8e0c88c6501710d08b836b3219673383f3"

binaryen-archive/package.json

@@ -1,19 +1,22 @@
 {
   "name": "@grain/binaryen.ml",
-  "version": "0.25.0",
+  "version": "0.27.0",
   "description": "OCaml bindings for Binaryen.",
   "author": "Oscar Spencer <oscar@grain-lang.org>",
   "license": "Apache-2.0",
+  "installConfig": {
+    "pnp": false
+  },
   "dependencies": {
-    "ocaml": ">= 4.13.0 < 5.0.0",
-    "@grain/libbinaryen": ">= 115.0.0 < 116.0.0",
+    "ocaml": ">= 4.13.0 < 5.4.0",
+    "@grain/libbinaryen": "117.0.0-b",
     "@opam/dune": ">= 3.0.0",
     "@opam/dune-configurator": ">= 3.0.0"
   },
   "devDependencies": {
-    "@opam/js_of_ocaml-compiler": ">= 4.1.0 < 6.0.0",
-    "@opam/ocamlformat": "0.24.1",
-    "@opam/ocaml-lsp-server": ">= 1.9.1 < 1.13.0"
+    "@opam/js_of_ocaml-compiler": ">= 6.0.0 < 7.0.0",
+    "@opam/ocamlformat": "0.27.0",
+    "@opam/ocaml-lsp-server": ">= 1.9.1 < 2.0.0"
   },
   "resolutions": {
     "@opam/ocp-indent": "1.7.0"

binaryen-archive/src/expression.c

@@ -442,11 +442,11 @@ caml_binaryen_pop(value _module, value _ty) {
 }
 
 CAMLprim value
-caml_binaryen_i31_new(value _module, value _val) {
+caml_binaryen_ref_i31(value _module, value _val) {
   CAMLparam2(_module, _val);
   BinaryenModuleRef module = BinaryenModuleRef_val(_module);
   BinaryenExpressionRef val = BinaryenExpressionRef_val(_val);
-  BinaryenExpressionRef exp = BinaryenI31New(module, val);
+  BinaryenExpressionRef exp = BinaryenRefI31(module, val);
   CAMLreturn(alloc_BinaryenExpressionRef(exp));
 }
 
@@ -717,9 +717,9 @@ caml_binaryen_expression_id_tuple_extract(value unit) {
   CAMLreturn(Val_int(BinaryenTupleExtractId()));
 }
 CAMLprim value
-caml_binaryen_expression_id_i31_new(value unit) {
+caml_binaryen_expression_id_ref_i31(value unit) {
   CAMLparam1(unit);
-  CAMLreturn(Val_int(BinaryenI31NewId()));
+  CAMLreturn(Val_int(BinaryenRefI31Id()));
 }
 CAMLprim value
 caml_binaryen_expression_id_i31_get(value unit) {

binaryen-archive/src/expression.js

@@ -542,9 +542,9 @@ function caml_binaryen_pop(wasm_mod, typ) {
   return Binaryen._BinaryenPop(wasm_mod, typ);
 }
 
-//Provides: caml_binaryen_i31_new
-function caml_binaryen_i31_new(wasm_mod, typ) {
-  return wasm_mod.i31.new(typ);
+//Provides: caml_binaryen_ref_i31
+function caml_binaryen_ref_i31(wasm_mod, typ) {
+  return wasm_mod.ref.i31(typ);
 }
 
 //Provides: caml_binaryen_i31_get
@@ -812,10 +812,10 @@ function caml_binaryen_expression_id_tuple_make() {
 function caml_binaryen_expression_id_tuple_extract() {
   return Binaryen.TupleExtractId;
 }
-//Provides: caml_binaryen_expression_id_i31_new
+//Provides: caml_binaryen_expression_id_ref_i31
 //Requires: Binaryen
-function caml_binaryen_expression_id_i31_new() {
-  return Binaryen.I31NewId;
+function caml_binaryen_expression_id_ref_i31() {
+  return Binaryen.RefI31Id;
 }
 //Provides: caml_binaryen_expression_id_i31_get
 //Requires: Binaryen
@@ -882,11 +882,12 @@ function caml_binaryen_expression_id_array_len() {
 
 //Provides: caml_binaryen_expression_print
 //Requires: Binaryen
+//Requires: caml_sys_fds
 //Requires: caml_string_of_jsstring
 //Requires: caml_ml_output, caml_ml_string_length
 function caml_binaryen_expression_print(expr) {
   var text = Binaryen.emitText(expr);
-  var chanid = 1; // stdout
+  var chanid = caml_sys_fds[1].chanid; // stdout
   var s = caml_string_of_jsstring(text);
   caml_ml_output(chanid, s, 0, caml_ml_string_length(s));
 }

binaryen-archive/src/expression.ml

@@ -285,9 +285,9 @@ external id_tuple_extract : unit -> int
 
 let id_tuple_extract = id_tuple_extract ()
 
-external id_i31_new : unit -> int = "caml_binaryen_expression_id_i31_new"
+external id_ref_i31 : unit -> int = "caml_binaryen_expression_id_ref_i31"
 
-let id_i31_new = id_i31_new ()
+let id_ref_i31 = id_ref_i31 ()
 
 external id_i31_get : unit -> int = "caml_binaryen_expression_id_i31_get"
 
@@ -394,7 +394,7 @@ let get_kind expr =
   | n when n = id_rethrow -> Rethrow
   | n when n = id_tuple_make -> TupleMake
   | n when n = id_tuple_extract -> TupleExtract
-  | n when n = id_i31_new -> I31New
+  | n when n = id_ref_i31 -> I31New
   | n when n = id_i31_get -> I31Get
   | n when n = id_call_ref -> CallRef
   | n when n = id_ref_test -> RefTest
@@ -706,22 +706,9 @@ 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 *)
-
-  (* Binaryen v113 still uses indexes for data segements, so we only want to change the binding itself, not our interface *)
-  let make wasm_mod segment dest offset size memory_name =
-    make wasm_mod (string_of_int segment) dest offset size memory_name
-
   external get_segment : t -> string = "caml_binaryen_memory_init_get_segment"
-
-  (* Binaryen v113 still uses indexes for data segements, so we only want to change the binding itself, not our interface *)
-  let get_segment expr = int_of_string (get_segment expr)
-
   external set_segment : t -> string -> unit
     = "caml_binaryen_memory_init_set_segment"
-
-  (* Binaryen v113 still uses indexes for data segements, so we only want to change the binding itself, not our interface *)
-  let set_segment expr segment = set_segment expr (string_of_int 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"
@@ -733,20 +720,9 @@ end
 module Data_drop = struct
   external make : Module.t -> string -> t = "caml_binaryen_data_drop"
   (** Module, segment. *)
-
-  (* Binaryen v113 still uses indexes for data segements, so we only want to change the binding itself, not our interface *)
-  let make wasm_mod segment = make wasm_mod (string_of_int segment)
-
   external get_segment : t -> string = "caml_binaryen_data_drop_get_segment"
-
-  (* Binaryen v113 still uses indexes for data segements, so we only want to change the binding itself, not our interface *)
-  let get_segment expr = int_of_string (get_segment expr)
-
   external set_segment : t -> string -> unit
     = "caml_binaryen_data_drop_set_segment"
-
-  (* Binaryen v113 still uses indexes for data segements, so we only want to change the binding itself, not our interface *)
-  let set_segment expr segment = set_segment expr (string_of_int segment)
 end
 
 module Memory_copy = struct
@@ -820,7 +796,7 @@ module Pop = struct
 end
 
 module I31 = struct
-  external make : Module.t -> t -> t = "caml_binaryen_i31_new"
+  external make : Module.t -> t -> t = "caml_binaryen_ref_i31"
   (** Module, value *)
 
   external get : Module.t -> t -> bool -> t = "caml_binaryen_i31_get"

binaryen-archive/src/expression.mli

@@ -256,9 +256,9 @@ module Memory_grow : sig
 end
 
 module Memory_init : sig
-  val make : Module.t -> int -> t -> t -> t -> string -> t
-  val get_segment : t -> int
-  val set_segment : t -> int -> unit
+  val make : Module.t -> string -> t -> t -> t -> string -> t
+  val get_segment : t -> string
+  val set_segment : t -> string -> unit
   val get_dest : t -> t
   val set_dest : t -> t -> unit
   val get_offset : t -> t
@@ -268,9 +268,9 @@ module Memory_init : sig
 end
 
 module Data_drop : sig
-  val make : Module.t -> int -> t
-  val get_segment : t -> int
-  val set_segment : t -> int -> unit
+  val make : Module.t -> string -> t
+  val get_segment : t -> string
+  val set_segment : t -> string -> unit
 end
 
 module Memory_copy : sig

binaryen-archive/src/memory.c

@@ -8,19 +8,25 @@
 
 
 CAMLprim value
-caml_binaryen_set_memory(value _module, value _initial, value _maximum, value _exportName, value _segments, value _segmentPassive, value _segmentOffsets, value _segmentSizes, value _shared, value _memory64, value _memoryName) {
-  CAMLparam5(_module, _initial, _maximum, _exportName, _segments);
-  CAMLxparam5(_segmentPassive, _segmentOffsets, _segmentSizes, _shared, _memory64);
-  CAMLxparam1(_memoryName);
+caml_binaryen_set_memory(value _module, value _initial, value _maximum, value _exportName, value _segment_names, value _segment_data, value _segmentPassive, value _segmentOffsets, value _segmentSizes, value _shared, value _memory64, value _memoryName) {
+  CAMLparam5(_module, _initial, _maximum, _exportName, _segment_names);
+  CAMLxparam5(_segment_data, _segmentPassive, _segmentOffsets, _segmentSizes, _shared);
+  CAMLxparam2(_memory64, _memoryName);
   BinaryenModuleRef module = BinaryenModuleRef_val(_module);
   BinaryenIndex initial = Int_val(_initial);
   BinaryenIndex maximum = Int_val(_maximum);
   char* exportName = Safe_String_val(_exportName);
-  _segments = array_of_list(_segments);
-  int segmentsLen = array_length(_segments);
-  const char* segments[segmentsLen];
-  for (int i = 0; i < segmentsLen; i++) {
-    segments[i] = Safe_String_val(Field(_segments, i));
+  _segment_names = array_of_list(_segment_names);
+  int segmentNamesLen = array_length(_segment_names);
+  const char* segment_names[segmentNamesLen];
+  for (int i = 0; i < segmentNamesLen; i++) {
+    segment_names[i] = Safe_String_val(Field(_segment_names, i));
+  }
+  _segment_data = array_of_list(_segment_data);
+  int segmentDataLen = array_length(_segment_data);
+  const char* segment_data[segmentDataLen];
+  for (int i = 0; i < segmentDataLen; i++) {
+    segment_data[i] = Safe_String_val(Field(_segment_data, i));
   }
   _segmentPassive = array_of_list(_segmentPassive);
   int segmentPassiveLen = array_length(_segmentPassive);
@@ -43,12 +49,12 @@ caml_binaryen_set_memory(value _module, value _initial, value _maximum, value _e
   bool shared = Bool_val(_shared);
   bool memory64 = Bool_val(_memory64);
   char* memoryName = Safe_String_val(_memoryName);
-  BinaryenSetMemory(module, initial, maximum, exportName, segments, segmentPassive, segmentOffsets, segmentSizes, segmentsLen, shared, memory64, memoryName);
+  BinaryenSetMemory(module, initial, maximum, exportName, segment_names, segment_data, segmentPassive, segmentOffsets, segmentSizes, segmentNamesLen, shared, memory64, memoryName);
   CAMLreturn(Val_unit);
 }
 CAMLprim value
 caml_binaryen_set_memory__bytecode(value * argv) {
-  return caml_binaryen_set_memory(argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10]);
+  return caml_binaryen_set_memory(argv[0], argv[1], argv[2], argv[3], argv[4], argv[5], argv[6], argv[7], argv[8], argv[9], argv[10], argv[11]);
 }
 
 CAMLprim value
@@ -111,28 +117,28 @@ caml_binaryen_get_num_memory_segments(value _module) {
 }
 
 CAMLprim value
-caml_binaryen_get_memory_segment_byte_offset(value _module, value _id) {
-  CAMLparam2(_module, _id);
+caml_binaryen_get_memory_segment_byte_offset(value _module, value _name) {
+  CAMLparam2(_module, _name);
   BinaryenModuleRef module = BinaryenModuleRef_val(_module);
-  BinaryenIndex id = Int_val(_id);
-  CAMLreturn(Val_int(BinaryenGetMemorySegmentByteOffset(module, id)));
+  char* name = Safe_String_val(_name);
+  CAMLreturn(Val_int(BinaryenGetMemorySegmentByteOffset(module, name)));
 }
 
 CAMLprim value
-caml_binaryen_get_memory_segment_passive(value _module, value _id) {
-  CAMLparam2(_module, _id);
+caml_binaryen_get_memory_segment_passive(value _module, value _name) {
+  CAMLparam2(_module, _name);
   BinaryenModuleRef module = BinaryenModuleRef_val(_module);
-  BinaryenIndex id = Int_val(_id);
-  CAMLreturn(Val_bool(BinaryenGetMemorySegmentPassive(module, id)));
+  char* name = Safe_String_val(_name);
+  CAMLreturn(Val_bool(BinaryenGetMemorySegmentPassive(module, name)));
 }
 
 CAMLprim value
-caml_binaryen_get_memory_segment_data(value _module, value _id) {
-  CAMLparam2(_module, _id);
+caml_binaryen_get_memory_segment_data(value _module, value _name) {
+  CAMLparam2(_module, _name);
   BinaryenModuleRef module = BinaryenModuleRef_val(_module);
-  BinaryenIndex id = Int_val(_id);
-  size_t size = BinaryenGetMemorySegmentByteLength(module, id);
+  char* name = Safe_String_val(_name);
+  size_t size = BinaryenGetMemorySegmentByteLength(module, name);
   CAMLprim value bytes = caml_alloc_string(size);
-  BinaryenCopyMemorySegmentData(module, id, (char*)Bytes_val(bytes));
+  BinaryenCopyMemorySegmentData(module, name, (char*)Bytes_val(bytes));
   CAMLreturn(bytes);
 }

binaryen-archive/src/memory.js

@@ -6,7 +6,8 @@ function caml_binaryen_set_memory(
   initial,
   maximum,
   exportName,
-  segments,
+  segmentNames,
+  segmentData,
   segmentPassives,
   segmentOffsets,
   segmentSizes,
@@ -14,11 +15,13 @@ function caml_binaryen_set_memory(
   memory64,
   memoryName
 ) {
+  var datas = caml_list_to_js_array(segmentData);
   var passives = caml_list_to_js_array(segmentPassives);
   var offsets = caml_list_to_js_array(segmentOffsets);
-  var segs = caml_list_to_js_array(segments).map(function (segment, idx) {
+  var segs = caml_list_to_js_array(segmentNames).map(function (name, idx) {
     return {
-      data: caml_convert_bytes_to_array(segment),
+      name: caml_jsstring_of_string(name),
+      data: caml_convert_bytes_to_array(datas[idx]),
       passive: caml_js_from_bool(passives[idx]),
       offset: offsets[idx],
     };
@@ -48,7 +51,8 @@ function caml_binaryen_set_memory__bytecode() {
     arguments[7],
     arguments[8],
     arguments[9],
-    arguments[10]
+    arguments[10],
+    arguments[11]
   );
 }
 
@@ -108,20 +112,22 @@ function caml_binaryen_get_num_memory_segments(wasm_mod) {
 }
 
 //Provides: caml_binaryen_get_memory_segment_byte_offset
-function caml_binaryen_get_memory_segment_byte_offset(wasm_mod, idx) {
-  var info = wasm_mod.getMemorySegmentInfoByIndex(idx);
+//Requires: caml_jsstring_of_string
+function caml_binaryen_get_memory_segment_byte_offset(wasm_mod, name) {
+  var info = wasm_mod.getMemorySegmentInfo(caml_jsstring_of_string(name));
   return info.offset;
 }
 
 //Provides: caml_binaryen_get_memory_segment_passive
-function caml_binaryen_get_memory_segment_passive(wasm_mod, idx) {
-  var info = wasm_mod.getMemorySegmentInfoByIndex(idx);
+//Requires: caml_jsstring_of_string
+function caml_binaryen_get_memory_segment_passive(wasm_mod, name) {
+  var info = wasm_mod.getMemorySegmentInfo(caml_jsstring_of_string(name));
   return info.passive;
 }
 
 //Provides: caml_binaryen_get_memory_segment_data
-//Requires: caml_bytes_of_array
-function caml_binaryen_get_memory_segment_data(wasm_mod, idx) {
-  var info = wasm_mod.getMemorySegmentInfoByIndex(idx);
+//Requires: caml_bytes_of_array, caml_jsstring_of_string
+function caml_binaryen_get_memory_segment_data(wasm_mod, name) {
+  var info = wasm_mod.getMemorySegmentInfo(caml_jsstring_of_string(name));
   return caml_bytes_of_array(info.data);
 }

binaryen-archive/src/memory.ml

@@ -3,6 +3,7 @@ external set_memory :
   int ->
   int ->
   string ->
+  string list ->
   bytes list ->
   bool list ->
   Expression.t list ->
@@ -12,7 +13,7 @@ external set_memory :
   string ->
   unit = "caml_binaryen_set_memory__bytecode" "caml_binaryen_set_memory"
 
-type segment = { data : bytes; kind : segment_kind; size : int }
+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 . *)
@@ -20,26 +21,36 @@ let set_memory wasm_mod initial maximum export_name (segments : segment list)
     shared memory64 moduleName =
   let split_segments segments =
     List.fold_right
-      (fun { data; kind; size }
-           (segment_data, segment_passive, segment_offsets, segment_sizes) ->
+      (fun { name; data; kind; size }
+           ( segment_name,
+             segment_data,
+             segment_passive,
+             segment_offsets,
+             segment_sizes ) ->
         match kind with
         | Active { offset } ->
-            ( data :: segment_data,
+            ( name :: segment_name,
+              data :: segment_data,
               false :: segment_passive,
               offset :: segment_offsets,
               size :: segment_sizes )
         | Passive ->
-            ( data :: segment_data,
+            ( name :: segment_name,
+              data :: segment_data,
               true :: segment_passive,
               Expression.Null.make () :: segment_offsets,
               size :: segment_sizes ))
-      segments ([], [], [], [])
+      segments ([], [], [], [], [])
   in
-  let segment_data, segment_passive, segment_offsets, segment_sizes =
+  let ( segment_name,
+        segment_data,
+        segment_passive,
+        segment_offsets,
+        segment_sizes ) =
     split_segments segments
   in
-  set_memory wasm_mod initial maximum export_name segment_data segment_passive
-    segment_offsets segment_sizes shared memory64 moduleName
+  set_memory wasm_mod initial maximum export_name segment_name segment_data
+    segment_passive segment_offsets segment_sizes shared memory64 moduleName
 
 external has_memory : Module.t -> bool = "caml_binaryen_has_memory"
 
@@ -59,11 +70,11 @@ let unlimited = -1
 external get_num_segments : Module.t -> int
   = "caml_binaryen_get_num_memory_segments"
 
-external get_segment_byte_offset : Module.t -> int -> int
+external get_segment_byte_offset : Module.t -> string -> int
   = "caml_binaryen_get_memory_segment_byte_offset"
 
-external get_segment_passive : Module.t -> int -> bool
+external get_segment_passive : Module.t -> string -> bool
   = "caml_binaryen_get_memory_segment_passive"
 
-external get_segment_data : Module.t -> int -> bytes
+external get_segment_data : Module.t -> string -> bytes
   = "caml_binaryen_get_memory_segment_data"

binaryen-archive/src/memory.mli

@@ -1,4 +1,4 @@
-type segment = { data : bytes; kind : segment_kind; size : int }
+type segment = { name : string; data : bytes; kind : segment_kind; size : int }
 and segment_kind = Passive | Active of { offset : Expression.t }
 
 val set_memory :
@@ -20,6 +20,6 @@ val is_shared : Module.t -> string -> bool
 val is_64 : Module.t -> string -> bool
 val unlimited : int
 val get_num_segments : Module.t -> int
-val get_segment_byte_offset : Module.t -> int -> int
-val get_segment_passive : Module.t -> int -> bool
-val get_segment_data : Module.t -> int -> bytes
+val get_segment_byte_offset : Module.t -> string -> int
+val get_segment_passive : Module.t -> string -> bool
+val get_segment_data : Module.t -> string -> bytes

binaryen-archive/src/module.js

@@ -17,31 +17,34 @@ function caml_binaryen_module_parse(text) {
 }
 
 //Provides: caml_binaryen_module_print
+//Requires: caml_sys_fds
 //Requires: caml_string_of_jsstring
 //Requires: caml_ml_output, caml_ml_string_length
 function caml_binaryen_module_print(wasm_mod) {
   var text = wasm_mod.emitText();
-  var chanid = 1; // stdout
+  var chanid = caml_sys_fds[1].chanid; // stdout
   var s = caml_string_of_jsstring(text);
   caml_ml_output(chanid, s, 0, caml_ml_string_length(s));
 }
 
 //Provides: caml_binaryen_module_print_asmjs
+//Requires: caml_sys_fds
 //Requires: caml_string_of_jsstring
 //Requires: caml_ml_output, caml_ml_string_length
 function caml_binaryen_module_print_asmjs(wasm_mod) {
   var asm = wasm_mod.emitAsmjs();
-  var chanid = 1; // stdout
+  var chanid = caml_sys_fds[1].chanid; // stdout
   var s = caml_string_of_jsstring(asm);
   caml_ml_output(chanid, s, 0, caml_ml_string_length(s));
 }
 
 //Provides: caml_binaryen_module_print_stack_ir
+//Requires: caml_sys_fds
 //Requires: caml_string_of_jsstring, caml_js_from_bool
 //Requires: caml_ml_output, caml_ml_string_length
 function caml_binaryen_module_print_stack_ir(wasm_mod, optimize) {
   var stackir = wasm_mod.emitStackIR(caml_js_from_bool(optimize));
-  var chanid = 1; // stdout
+  var chanid = caml_sys_fds[1].chanid; // stdout
   var s = caml_string_of_jsstring(stackir);
   caml_ml_output(chanid, s, 0, caml_ml_string_length(s));
 }

binaryen-archive/test/dune

@@ -4,8 +4,7 @@
  (modes exe js)
  (flags
   :standard
-  (:include ./config/ocamlopt_flags.sexp))
- (js_of_ocaml))
+  (:include ./config/ocamlopt_flags.sexp)))
 
 (rule
  (alias runtest)

binaryen-archive/test/test.expected

@@ -16,8 +16,8 @@
  (global $max_int64_mut (mut i64) (i64.const 9223372036854775807))
  (global $test_float64_bits f64 (f64.const 1.23))
  (memory $0 1)
- (data $0 (i32.const 0) "hello")
- (data $1 "world")
+ (data $hello (i32.const 0) "hello")
+ (data $world "world")
  (table $table 1 1 funcref)
  (elem $elem (i32.const 0) $adder)
  (export "adder" (func $adder))
@@ -28,7 +28,9 @@
   (block $add (result i32)
    (if
     (i32.const 0)
-    (unreachable)
+    (then
+     (unreachable)
+    )
    )
    (i32.add
     (select
@@ -44,7 +46,7 @@
  )
  (func $start (type $1)
   (block $start
-   (memory.init $1
+   (memory.init $world
     (i32.const 2048)
     (i32.const 0)
     (i32.const 5)
@@ -73,8 +75,8 @@
  (type $3 (func (param anyref) (result i32)))
  (import "future-wasi" "write" (func $write (type $2) (param anyref i32 i32) (result i32)))
  (memory $0 1)
- (data $0 (i32.const 0) "hello")
- (data $1 "world")
+ (data $hello (i32.const 0) "hello")
+ (data $world "world")
  (table $table 1 1 funcref)
  (elem $elem (i32.const 0) $adder)
  (export "adder" (func $adder))
@@ -94,7 +96,7 @@
   )
  )
  (func $start (type $1) (; has Stack IR ;)
-  (memory.init $1
+  (memory.init $world
    (i32.const 2048)
    (i32.const 0)
    (i32.const 5)
@@ -115,11 +117,11 @@
  )
 )
 (module
- (type $type$0 (func (param anyref i32 i32) (result i32)))
- (type $type$1 (func (param i32 i32) (result i32)))
- (type $type$2 (func))
- (type $type$3 (func (param anyref) (result i32)))
- (import "future-wasi" "write" (func $fimport$0 (type $type$0) (param anyref i32 i32) (result i32)))
+ (type $type (func (param anyref i32 i32) (result i32)))
+ (type $type_1 (func (param i32 i32) (result i32)))
+ (type $type_2 (func))
+ (type $type_3 (func (param anyref) (result i32)))
+ (import "future-wasi" "write" (func $fimport$0 (type $type) (param anyref i32 i32) (result i32)))
  (memory $0 1)
  (data $0 (i32.const 0) "hello")
  (data $1 "world")
@@ -129,7 +131,7 @@
  (export "memory" (memory $0))
  (export "hello" (func $2))
  (start $1)
- (func $0 (type $type$1) (param $0 i32) (param $1 i32) (result i32)
+ (func $0 (type $type_1) (param $0 i32) (param $1 i32) (result i32)
   (i32.add
    (select
     (local.get $0)
@@ -141,7 +143,7 @@
    (local.get $1)
   )
  )
- (func $1 (type $type$2)
+ (func $1 (type $type_2)
   (memory.init $1
    (i32.const 2048)
    (i32.const 0)
@@ -154,7 +156,7 @@
    )
   )
  )
- (func $2 (type $type$3) (param $0 anyref) (result i32)
+ (func $2 (type $type_3) (param $0 anyref) (result i32)
   (call $fimport$0
    (local.get $0)
    (i32.const 0)
@@ -163,11 +165,11 @@
  )
 )
 (module
- (type $type$0 (func (param anyref i32 i32) (result i32)))
- (type $type$1 (func (param i32 i32) (result i32)))
- (type $type$2 (func))
- (type $type$3 (func (param anyref) (result i32)))
- (import "future-wasi" "write" (func $fimport$0 (type $type$0) (param anyref i32 i32) (result i32)))
+ (type $type (func (param anyref i32 i32) (result i32)))
+ (type $type_1 (func (param i32 i32) (result i32)))
+ (type $type_2 (func))
+ (type $type_3 (func (param anyref) (result i32)))
+ (import "future-wasi" "write" (func $fimport$0 (type $type) (param anyref i32 i32) (result i32)))
  (memory $0 1)
  (data $0 (i32.const 0) "hello")
  (data $1 "world")
@@ -177,7 +179,7 @@
  (export "memory" (memory $0))
  (export "hello" (func $2))
  (start $1)
- (func $0 (type $type$1) (param $0 i32) (param $1 i32) (result i32)
+ (func $0 (type $type_1) (param $0 i32) (param $1 i32) (result i32)
   local.get $0
   local.get $1
   i32.load
@@ -186,7 +188,7 @@
   local.get $1
   i32.add
  )
- (func $1 (type $type$2)
+ (func $1 (type $type_2)
   i32.const 2048
   i32.const 0
   i32.const 5
@@ -196,7 +198,7 @@
   call $0
   drop
  )
- (func $2 (type $type$3) (param $0 anyref) (result i32)
+ (func $2 (type $type_3) (param $0 anyref) (result i32)
   local.get $0
   i32.const 0
   i32.const 1