@grain/binaryen.ml 0.15.0 → 0.17.1

binaryen-archive/esy.lock/opam/omd.1.3.1/opam

@@ -0,0 +1,39 @@
+opam-version: "2.0"
+maintainer: "Philippe Wang <philippe.wang@gmail.com>"
+authors: [ "Philippe Wang <philippe.wang@gmail.com>" ]
+license: "ISC"
+homepage: "https://github.com/ocaml/omd"
+dev-repo: "git+https://github.com/ocaml/omd.git"
+bug-reports: "https://github.com/ocaml/omd/issues"
+tags: [ "org:ocamllabs" "org:mirage"  ]
+build: [
+  ["ocaml" "setup.ml" "-configure" "--prefix" prefix]
+  ["ocaml" "setup.ml" "-build"]
+  ["ocaml" "setup.ml" "-configure" "--enable-tests"] {with-test}
+  ["ocaml" "setup.ml" "-build"] {with-test}
+  ["ocaml" "setup.ml" "-test"] {with-test}
+]
+install: ["ocaml" "setup.ml" "-install"]
+remove: [
+  ["ocaml" "%{etc}%/omd/setup.ml" "-C" "%{etc}%/omd" "-uninstall"]
+]
+depends: [
+  "ocaml" {>= "4.01"}
+  "base-bigarray"
+  "base-bytes"
+  "ocamlbuild" {build}
+  "ocamlfind" {build & >= "1.5"}
+]
+synopsis: "A Markdown frontend in pure OCaml."
+description: """
+This Markdown library is implemented using only pure OCaml (including
+I/O operations provided by the standard OCaml compiler distribution).
+OMD is meant to be as faithful as possible to the original Markdown.
+Additionally, OMD implements a few Github markdown features, an
+extension mechanism, and some other features. Note that the opam
+package installs both the OMD library and the command line tool `omd`."""
+url {
+  src:
+    "https://github.com/Chris00/omd/releases/download/1.3.1/omd-1.3.1.tar.gz"
+  checksum: "md5=845fc38e86ec0e85721130f2dd044d00"
+}

binaryen-archive/esy.lock/opam/ordering.3.2.0/opam

@@ -0,0 +1,39 @@
+opam-version: "2.0"
+synopsis: "Element ordering"
+description: "Element ordering"
+maintainer: ["Jane Street Group, LLC <opensource@janestreet.com>"]
+authors: ["Jane Street Group, LLC <opensource@janestreet.com>"]
+license: "MIT"
+homepage: "https://github.com/ocaml/dune"
+doc: "https://dune.readthedocs.io/"
+bug-reports: "https://github.com/ocaml/dune/issues"
+depends: [
+  "dune" {>= "3.0"}
+  "ocaml" {>= "4.08.0"}
+  "odoc" {with-doc}
+]
+dev-repo: "git+https://github.com/ocaml/dune.git"
+build: [
+  ["dune" "subst"] {dev}
+  ["rm" "-rf" "vendor/csexp"]
+  ["rm" "-rf" "vendor/pp"]
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@doc" {with-doc}
+  ]
+]
+url {
+  src:
+    "https://github.com/ocaml/dune/releases/download/3.2.0/chrome-trace-3.2.0.tbz"
+  checksum: [
+    "sha256=bd1fbce6ae79ed1eb26fa89bb2e2e23978afceb3f53f5578cf1bdab08a1ad5bc"
+    "sha512=b99e82d7e2233a9dd8c1fae591a03f9470fcdf9750d0e428cee2d4c8bcfa4da1595e9e10af2f234279a6ca8a120a773b247d4761d2c39210fc6101076631690e"
+  ]
+}
+x-commit-hash: "43af00f79e41ce9101d42b36dab13e1f68d49a7a"

binaryen-archive/esy.lock/opam/{ppx_yojson_conv_lib.v0.14.0 → ppx_yojson_conv_lib.v0.15.0}/opam

@@ -19,6 +19,6 @@ description: "
 Part of the Jane Street's PPX rewriters collection.
 "
 url {
-  src: "https://ocaml.janestreet.com/ocaml-core/v0.14/files/ppx_yojson_conv_lib-v0.14.0.tar.gz"
-  checksum: "md5=e23c5593a7211ad4fb09e26e9a74698a"
+src: "https://ocaml.janestreet.com/ocaml-core/v0.15/files/ppx_yojson_conv_lib-v0.15.0.tar.gz"
+checksum: "sha256=f9d2c5eff4566ec1f1f379b186ed22c8ddd6be0909a160bc5a9ac7abc6a6b684"
 }

binaryen-archive/esy.lock/opam/{ppxlib.0.25.0 → ppxlib.0.26.0}/opam

@@ -24,6 +24,7 @@ depends: [
   "ocaml-compiler-libs" {>= "v0.11.0"}
   "ppx_derivers" {>= "1.0"}
   "sexplib0" {>= "v0.12"}
+  "sexplib0" {with-test & < "v0.15"}
   "stdlib-shims"
   "ocamlfind" {with-test}
   "re" {with-test & >= "1.9.0"}
@@ -53,10 +54,10 @@ build: [
 dev-repo: "git+https://github.com/ocaml-ppx/ppxlib.git"
 url {
   src:
-    "https://github.com/ocaml-ppx/ppxlib/releases/download/0.25.0/ppxlib-0.25.0.tbz"
+    "https://github.com/ocaml-ppx/ppxlib/releases/download/0.26.0/ppxlib-0.26.0.tbz"
   checksum: [
-    "sha256=2d2f150e7715845dc578d254f705a67600be71c986b7e67e81befda612870bd5"
-    "sha512=464220e3d8c75503824b73393df0b8ad16019acf55b8ecef89f8d464cd6d054e470ce4866b244216c5f7b85a5e8abad908aad212a78b4a132f3092fa785da0de"
+    "sha256=63117b67ea5863935455fe921f88fe333c0530f0483f730313303a93af817efd"
+    "sha512=9cfc9587657d17cdee5483e2a03292f872c42886e512bcc7442652e6418ce74c0135c731d8a68288c7fecae7f1b2defd93fe5acf8edb41e25144a8cec2806227"
   ]
 }
-x-commit-hash: "2fde140076144150d01997d529d451bbcae439c4"
+x-commit-hash: "18b1ad68b59d151d662147661e43b159ac491f68"

binaryen-archive/esy.lock/opam/{re.1.10.3 → re.1.10.4}/opam

@@ -8,19 +8,19 @@ authors: [
   "Rudi Grinberg"
   "Gabriel Radanne"
 ]
-license: "LGPL-2.0 with OCaml linking exception"
+license: "LGPL-2.0-or-later WITH OCaml-LGPL-linking-exception"
 homepage: "https://github.com/ocaml/ocaml-re"
 bug-reports: "https://github.com/ocaml/ocaml-re/issues"
 dev-repo: "git+https://github.com/ocaml/ocaml-re.git"
 
 build: [
-  ["dune" "subst"] {pinned}
+  ["dune" "subst"] {dev}
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
 
 depends: [
-  "ocaml" {>= "4.02"}
+  "ocaml" {>= "4.03"}
   "dune" {>= "2.0"}
   "ounit" {with-test}
   "seq"
@@ -37,10 +37,10 @@ Pure OCaml regular expressions with:
 """
 url {
   src:
-    "https://github.com/ocaml/ocaml-re/releases/download/1.10.3/re-1.10.3.tbz"
+    "https://github.com/ocaml/ocaml-re/releases/download/1.10.4/re-1.10.4.tbz"
   checksum: [
-    "sha256=846546967f3fe31765935dd40a6460a9424337ecce7b12727fcba49480790ebb"
-    "sha512=d02103b7b8b8d8bc797341dcc933554745427f3c1b51b54b4ac9ff81badfd68c94726c57548b08e00ca99f3e09741b54b6500e97c19fc0e8fcefd6dfbe71da7f"
+    "sha256=83eb3e4300aa9b1dc7820749010f4362ea83524742130524d78c20ce99ca747c"
+    "sha512=92b05cf92c389fa8c753f2acca837b15dd05a4a2e8e2bec7a269d2e14c35b1a786d394258376648f80b4b99250ba1900cfe68230b8385aeac153149d9ce56099"
   ]
 }
-x-commit-hash: "c5d5df80e128c3d7646b7d8b1322012c5fcc35f3"
+x-commit-hash: "e9a4cecb8294c1839db18b1d0c30e755ec85ed5e"

binaryen-archive/esy.lock/opam/{spawn.v0.15.0 → spawn.v0.15.1}/opam

@@ -45,12 +45,12 @@ build: [
   ]
 ]
 dev-repo: "git+https://github.com/janestreet/spawn.git"
-x-commit-hash: "b5a25cab2f53a5ee9e10a7b8a96506cc61ce1198"
+x-commit-hash: "13d279ebfa8c40d4bafe18cddfdff0de54b4eaff"
 url {
   src:
-    "https://github.com/janestreet/spawn/archive/v0.15.0.tar.gz"
+    "https://github.com/janestreet/spawn/archive/v0.15.1.tar.gz"
   checksum: [
-    "sha256=310fb2a50ac7f64c738182cbabd9d27c1aeae1a08107fe14da8d35a87cbb57c7"
-    "sha512=3a775b57a73efee6adbc30b32fa779f27d11c7008a46f90fdb9da6288533e2d83fc49dbcd770c087f2e4560c5586ff72a9a2985d8929955773cc10d83f126013"
+    "sha256=9afdee314fab6c3fcd689ab6eb5608d6b78078e6dede3953a47debde06c19d50"
+    "sha512=efdb31d5ec5ea36d0bc80224d4ee04e46ce3428d1662870e6cebece92bc313d6eebee378802c0c059dd6e0cafea515308c31b7dfaf04a098eb4566583c1e9ed4"
   ]
 }

binaryen-archive/esy.lock/opam/stdune.3.2.0/opam

@@ -0,0 +1,44 @@
+opam-version: "2.0"
+synopsis: "Dune's unstable standard library"
+description:
+  "This library offers no backwards compatibility guarantees. Use at your own risk."
+maintainer: ["Jane Street Group, LLC <opensource@janestreet.com>"]
+authors: ["Jane Street Group, LLC <opensource@janestreet.com>"]
+license: "MIT"
+homepage: "https://github.com/ocaml/dune"
+doc: "https://dune.readthedocs.io/"
+bug-reports: "https://github.com/ocaml/dune/issues"
+depends: [
+  "dune" {>= "3.0"}
+  "ocaml" {>= "4.08.0"}
+  "dyn" {= version}
+  "ordering" {= version}
+  "pp" {>= "1.1.0"}
+  "csexp" {>= "1.5.0"}
+  "odoc" {with-doc}
+]
+dev-repo: "git+https://github.com/ocaml/dune.git"
+build: [
+  ["dune" "subst"] {dev}
+  ["rm" "-rf" "vendor/csexp"]
+  ["rm" "-rf" "vendor/pp"]
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@doc" {with-doc}
+  ]
+]
+url {
+  src:
+    "https://github.com/ocaml/dune/releases/download/3.2.0/chrome-trace-3.2.0.tbz"
+  checksum: [
+    "sha256=bd1fbce6ae79ed1eb26fa89bb2e2e23978afceb3f53f5578cf1bdab08a1ad5bc"
+    "sha512=b99e82d7e2233a9dd8c1fae591a03f9470fcdf9750d0e428cee2d4c8bcfa4da1595e9e10af2f234279a6ca8a120a773b247d4761d2c39210fc6101076631690e"
+  ]
+}
+x-commit-hash: "43af00f79e41ce9101d42b36dab13e1f68d49a7a"

binaryen-archive/esy.lock/opam/xdg.3.2.0/opam

@@ -0,0 +1,40 @@
+opam-version: "2.0"
+synopsis: "XDG Base Directory Specification"
+description:
+  "https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html"
+maintainer: ["Jane Street Group, LLC <opensource@janestreet.com>"]
+authors: ["Jane Street Group, LLC <opensource@janestreet.com>"]
+license: "MIT"
+homepage: "https://github.com/ocaml/dune"
+doc: "https://dune.readthedocs.io/"
+bug-reports: "https://github.com/ocaml/dune/issues"
+depends: [
+  "dune" {>= "3.0"}
+  "ocaml" {>= "4.08"}
+  "odoc" {with-doc}
+]
+dev-repo: "git+https://github.com/ocaml/dune.git"
+build: [
+  ["dune" "subst"] {dev}
+  ["rm" "-rf" "vendor/csexp"]
+  ["rm" "-rf" "vendor/pp"]
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@doc" {with-doc}
+  ]
+]
+url {
+  src:
+    "https://github.com/ocaml/dune/releases/download/3.2.0/chrome-trace-3.2.0.tbz"
+  checksum: [
+    "sha256=bd1fbce6ae79ed1eb26fa89bb2e2e23978afceb3f53f5578cf1bdab08a1ad5bc"
+    "sha512=b99e82d7e2233a9dd8c1fae591a03f9470fcdf9750d0e428cee2d4c8bcfa4da1595e9e10af2f234279a6ca8a120a773b247d4761d2c39210fc6101076631690e"
+  ]
+}
+x-commit-hash: "43af00f79e41ce9101d42b36dab13e1f68d49a7a"

binaryen-archive/esy.lock/overrides/opam__s__js__of__ocaml_compiler_opam__c__4.0.0_opam_override/package.json

@@ -0,0 +1,3 @@
+{
+  "build": "dune build -p js_of_ocaml-compiler"
+}

binaryen-archive/package.json

@@ -1,17 +1,17 @@
 {
   "name": "@grain/binaryen.ml",
-  "version": "0.15.0",
+  "version": "0.17.1",
   "description": "OCaml bindings for Binaryen.",
   "author": "Oscar Spencer <oscar@grain-lang.org>",
   "license": "Apache-2.0",
   "dependencies": {
     "ocaml": ">= 4.12.0",
-    "@grain/libbinaryen": ">= 105.1.0 < 106.0.0",
-    "@opam/dune": ">= 2.9.1 < 3.0.0",
-    "@opam/dune-configurator": ">= 2.9.1 < 3.0.0"
+    "@grain/libbinaryen": ">= 107.0.0 < 108.0.0",
+    "@opam/dune": ">= 2.9.1",
+    "@opam/dune-configurator": ">= 2.9.1"
   },
   "devDependencies": {
-    "@opam/js_of_ocaml-compiler": ">= 3.10.0 < 4.0.0",
+    "@opam/js_of_ocaml-compiler": ">= 3.10.0",
     "@opam/ocamlformat": "0.20.1",
     "@opam/ocaml-lsp-server": "^1.9.1"
   },

binaryen-archive/src/binaryen_stubs_expressions.c

@@ -1534,7 +1534,12 @@ CAMLprim value
 caml_binaryen_return_get_value(value _exp) {
   CAMLparam1(_exp);
   BinaryenExpressionRef exp = BinaryenExpressionRef_val(_exp);
-  CAMLreturn(alloc_BinaryenExpressionRef(BinaryenReturnGetValue(exp)));
+  BinaryenExpressionRef val = BinaryenReturnGetValue(exp);
+  if (val == NULL) {
+    CAMLreturn(Val_none);
+  } else {
+    CAMLreturn(caml_alloc_some(alloc_BinaryenExpressionRef(val)));
+  }
 }
 
 CAMLprim value

binaryen-archive/src/binaryen_stubs_expressions.js

@@ -1273,8 +1273,9 @@ function caml_binaryen_drop_set_value(exp, value) {
 
 //Provides: caml_binaryen_return_get_value
 //Requires: binaryen
+//Requires: to_option
 function caml_binaryen_return_get_value(exp) {
-  return binaryen.Return.getValue(exp);
+  return to_option(binaryen.Return.getValue(exp));
 }
 
 //Provides: caml_binaryen_return_set_value

binaryen-archive/src/binaryen_stubs_features.c

@@ -113,6 +113,12 @@ caml_binaryen_feature_relaxed_simd(value unit) {
   CAMLreturn(Val_int(BinaryenFeatureRelaxedSIMD()));
 }
 
+CAMLprim value
+caml_binaryen_feature_extended_const(value unit) {
+  CAMLparam1(unit);
+  CAMLreturn(Val_int(BinaryenFeatureExtendedConst()));
+}
+
 CAMLprim value
 caml_binaryen_feature_all(value unit) {
   CAMLparam1(unit);

binaryen-archive/src/binaryen_stubs_features.js

@@ -98,6 +98,12 @@ function caml_binaryen_feature_relaxed_simd() {
   return binaryen.Features.RelaxedSIMD;
 }
 
+//Provides: caml_binaryen_feature_extended_const
+//Requires: binaryen
+function caml_binaryen_feature_extended_const() {
+  return binaryen.Features.ExtendedConst;
+}
+
 //Provides: caml_binaryen_feature_all
 //Requires: binaryen
 function caml_binaryen_feature_all() {

binaryen-archive/src/binaryen_stubs_ops.c

@@ -2167,7 +2167,7 @@ caml_binaryen_binaryen_narrow_u_vec_i32x4_to_vec_i16x8(value unit) {
 CAMLprim value
 caml_binaryen_binaryen_swizzle_vec8x16(value unit) {
   CAMLparam1(unit);
-  BinaryenOp op = BinaryenSwizzleVec8x16();
+  BinaryenOp op = BinaryenSwizzleVecI8x16();
   CAMLreturn(alloc_BinaryenOp(op));
 }
 
@@ -2225,4 +2225,4 @@ caml_binaryen_binaryen_ref_as_i31(value unit) {
   CAMLparam1(unit);
   BinaryenOp op = BinaryenRefAsI31();
   CAMLreturn(alloc_BinaryenOp(op));
-}
+}

binaryen-archive/src/binaryen_stubs_ops.js

@@ -1843,7 +1843,7 @@ function caml_binaryen_binaryen_narrow_u_vec_i32x4_to_vec_i16x8() {
 //Provides: caml_binaryen_binaryen_swizzle_vec8x16
 //Requires: binaryen
 function caml_binaryen_binaryen_swizzle_vec8x16() {
-  return binaryen.Operations.SwizzleVec8x16;
+  return binaryen.Operations.SwizzleVecI8x16;
 }
 
 //Provides: caml_binaryen_binaryen_ref_is_null

binaryen-archive/src/expression.ml

@@ -693,7 +693,7 @@ end
 
 module Return = struct
   external make : Module.t -> t -> t = "caml_binaryen_return"
-  external get_value : t -> t = "caml_binaryen_return_get_value"
+  external get_value : t -> t option = "caml_binaryen_return_get_value"
   external set_value : t -> t -> unit = "caml_binaryen_return_set_value"
 end
 

binaryen-archive/src/expression.mli

@@ -241,7 +241,7 @@ end
 
 module Return : sig
   val make : Module.t -> t -> t
-  val get_value : t -> t
+  val get_value : t -> t option
   val set_value : t -> t -> unit
 end
 

binaryen-archive/src/module.ml

@@ -69,6 +69,10 @@ module Feature = struct
 
   let relaxed_simd = relaxed_simd ()
 
+  external extended_const : unit -> t = "caml_binaryen_feature_extended_const"
+
+  let extended_const = extended_const ()
+
   external all : unit -> t = "caml_binaryen_feature_all"
 
   let all = all ()

binaryen-archive/src/module.mli

@@ -18,6 +18,7 @@ module Feature : sig
   val memory64 : t
   val typed_function_references : t
   val relaxed_simd : t
+  val extended_const : t
   val all : t
 end
 

binaryen-archive/src/passes.ml

@@ -147,6 +147,9 @@ let memory_packing = "memory-packing"
 (** merges blocks to their parents *)
 let merge_blocks = "merge-blocks"
 
+(** merges similar functions when benefical *)
+let merge_similar_functions = "merge-similar-functions"
+
 (** merges locals when beneficial *)
 let merge_locals = "merge-locals"
 
@@ -275,6 +278,9 @@ let safe_heap = "safe-heap"
 (** sets specified globals to specified values *)
 let set_globals = "set-globals"
 
+(** remove params from function signature types where possible *)
+let signature_pruning = "signature-pruning"
+
 (** apply more specific subtypes to signature types where possible *)
 let signature_refining = "signature-refining"
 

binaryen-archive/src/passes.mli

@@ -147,6 +147,9 @@ val memory_packing : t
 val merge_blocks : t
 (** merges blocks to their parents *)
 
+val merge_similar_functions : t
+(** merges similar functions when benefical *)
+
 val merge_locals : t
 (** merges locals when beneficial *)
 
@@ -273,6 +276,9 @@ val safe_heap : t
 val set_globals : t
 (** sets specified globals to specified values *)
 
+val signature_pruning : t
+(** remove params from function signature types where possible *)
+
 val signature_refining : t
 (** apply more specific subtypes to signature types where possible *)
 

binaryen-archive/test/config/ocamlopt_flags.ml

@@ -8,14 +8,7 @@ let () =
         match C.ocaml_config_var c "system" with
         | Some "macosx" ->
             (* These flags preserve the original C++ error behavior. Ref https://github.com/ocaml/ocaml/issues/10423 *)
-            [
-              "-cc";
-              "clang++";
-              "-cclib";
-              "-Wl,-keep_dwarf_unwind";
-              "-cclib";
-              "-Wl,-no_compact_unwind";
-            ]
+            [ "-cc"; "clang++" ]
         | Some _ -> default
         | None -> default
       in

binaryen-archive/test/test.ml

@@ -20,6 +20,20 @@ let _ = Settings.set_low_memory_unused false
 let wasm_mod = Module.create ()
 let _ = Module.set_features wasm_mod [ Module.Feature.all ]
 
+(* Testing Return.get_value *)
+let _ =
+  assert (
+    Option.is_some
+      (Expression.Return.get_value
+         (Expression.Return.make wasm_mod
+            (Expression.Const.make wasm_mod (Literal.int32 0l)))))
+
+let _ =
+  assert (
+    Option.is_none
+      (Expression.Return.get_value
+         (Expression.Return.make wasm_mod (Expression.Null.make ()))))
+
 (* Create function type for i32 (i32, i32) *)
 let params () = Type.create [| Type.int32; Type.int32 |]
 let results = Type.int32
@@ -163,7 +177,10 @@ let _ =
     sourcemap = Some {|{"version":3,"sources":[],"names":[],"mappings":""}|})
 
 let new_mod = Module.read byts
-let _ = Module.run_passes new_mod [ Passes.name_types ]
+
+let _ =
+  Module.run_passes new_mod
+    [ Passes.name_types; Passes.merge_similar_functions ]
 
 let _ =
   Module.set_features new_mod
@@ -183,6 +200,7 @@ let _ =
       Module.Feature.memory64;
       Module.Feature.typed_function_references;
       Module.Feature.relaxed_simd;
+      Module.Feature.extended_const;
       Module.Feature.all;
     ]