Skip to content

Commit e2fd403

Browse files
committed
feat!: Upgrade to Binaryen v117
1 parent 88e1085 commit e2fd403

File tree

15 files changed

+172
-173
lines changed

15 files changed

+172
-173
lines changed

esy.lock/index.json

Lines changed: 48 additions & 53 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

esy.lock/opam/js_of_ocaml-compiler.5.8.2/opam

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

esy.lock/opam/ocamlbuild.0.15.0/opam renamed to esy.lock/opam/ocamlbuild.0.16.1/opam

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

esy.lock/opam/ppx_yojson_conv_lib.v0.15.0/opam renamed to esy.lock/opam/ppx_yojson_conv_lib.v0.16.0/opam

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

esy.lock/opam/ppxlib.0.32.1/opam renamed to esy.lock/opam/ppxlib.0.33.0/opam

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

esy.lock/opam/sedlex.3.3/opam

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
"@opam/ocaml-lsp-server": ">= 1.9.1 < 1.13.0"
1717
},
1818
"resolutions": {
19-
"@opam/ocp-indent": "1.7.0"
19+
"@opam/ocp-indent": "1.7.0",
20+
"@grain/libbinaryen": "link:../libbinaryen"
2021
},
2122
"esy": {
2223
"build": "dune build -p binaryen"

src/expression.ml

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -706,22 +706,9 @@ module Memory_init = struct
706706
external make : Module.t -> string -> t -> t -> t -> string -> t
707707
= "caml_binaryen_memory_init__bytecode" "caml_binaryen_memory_init"
708708
(** Module, segment, destination, offset, size, memory_name *)
709-
710-
(* Binaryen v113 still uses indexes for data segements, so we only want to change the binding itself, not our interface *)
711-
let make wasm_mod segment dest offset size memory_name =
712-
make wasm_mod (string_of_int segment) dest offset size memory_name
713-
714709
external get_segment : t -> string = "caml_binaryen_memory_init_get_segment"
715-
716-
(* Binaryen v113 still uses indexes for data segements, so we only want to change the binding itself, not our interface *)
717-
let get_segment expr = int_of_string (get_segment expr)
718-
719710
external set_segment : t -> string -> unit
720711
= "caml_binaryen_memory_init_set_segment"
721-
722-
(* Binaryen v113 still uses indexes for data segements, so we only want to change the binding itself, not our interface *)
723-
let set_segment expr segment = set_segment expr (string_of_int segment)
724-
725712
external get_dest : t -> t = "caml_binaryen_memory_init_get_dest"
726713
external set_dest : t -> t -> unit = "caml_binaryen_memory_init_set_dest"
727714
external get_offset : t -> t = "caml_binaryen_memory_init_get_offset"
@@ -733,20 +720,9 @@ end
733720
module Data_drop = struct
734721
external make : Module.t -> string -> t = "caml_binaryen_data_drop"
735722
(** Module, segment. *)
736-
737-
(* Binaryen v113 still uses indexes for data segements, so we only want to change the binding itself, not our interface *)
738-
let make wasm_mod segment = make wasm_mod (string_of_int segment)
739-
740723
external get_segment : t -> string = "caml_binaryen_data_drop_get_segment"
741-
742-
(* Binaryen v113 still uses indexes for data segements, so we only want to change the binding itself, not our interface *)
743-
let get_segment expr = int_of_string (get_segment expr)
744-
745724
external set_segment : t -> string -> unit
746725
= "caml_binaryen_data_drop_set_segment"
747-
748-
(* Binaryen v113 still uses indexes for data segements, so we only want to change the binding itself, not our interface *)
749-
let set_segment expr segment = set_segment expr (string_of_int segment)
750726
end
751727

752728
module Memory_copy = struct

0 commit comments

Comments
 (0)