@grain/binaryen.ml 0.14.1 → 0.17.0

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/dune

@@ -1,5 +1,3 @@
-; Tests for the default_implementation (mirrors 0.2.2 usage)
-
 (test
  (name test)
  (modules test)
@@ -9,24 +7,6 @@
  (action
   (run %{test})))
 
-; Tests for binaryen.native implementation
-
-(rule
- (target test_native.ml)
- (action
-  (progn
-   (copy %{dep:test.ml} %{target})
-   (copy test.expected test_native.expected))))
-
-(test
- (name test_native)
- (modules test_native)
- (libraries binaryen binaryen.native)
- (ocamlopt_flags
-  (:include ./config/ocamlopt_flags.sexp))
- (action
-  (run %{test})))
-
 ; Tests for binaryen.js implementation
 
 (rule
@@ -43,8 +23,8 @@
  (modules test_js)
  (modes
   (byte js))
- (libraries binaryen binaryen.js)
+ (libraries binaryen)
  (action
   (run node %{dep:test_js.bc.js}))
  (js_of_ocaml
-  (flags --no-sourcemap)))
+  (flags --no-sourcemap --disable share)))

binaryen-archive/test/test.expected

@@ -13,8 +13,10 @@
  (type $externref_=>_i32 (func (param externref) (result i32)))
  (import "future-wasi" "write" (func $write (param externref i32 i32) (result i32)))
  (global $max_int64 i64 (i64.const 9223372036854775807))
+ (global $max_int64_mut (mut i64) (i64.const 9223372036854775807))
  (global $test_float64_bits f64 (f64.const 1.23))
  (memory $0 1)
+ (data (i32.const 0) "hello")
  (table $table 1 1 funcref)
  (elem $elem (i32.const 0) $adder)
  (export "adder" (func $adder))
@@ -63,6 +65,7 @@
  (type $externref_=>_i32 (func (param externref) (result i32)))
  (import "future-wasi" "write" (func $write (param externref i32 i32) (result i32)))
  (memory $0 1)
+ (data (i32.const 0) "hello")
  (table $table 1 1 funcref)
  (elem $elem (i32.const 0) $adder)
  (export "adder" (func $adder))
@@ -98,12 +101,13 @@
  )
 )
 (module
- (type $externref_i32_i32_=>_i32 (func (param externref i32 i32) (result i32)))
- (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
- (type $none_=>_none (func))
- (type $externref_=>_i32 (func (param externref) (result i32)))
+ (type $type$0 (func (param externref i32 i32) (result i32)))
+ (type $type$1 (func (param i32 i32) (result i32)))
+ (type $type$2 (func))
+ (type $type$3 (func (param externref) (result i32)))
  (import "future-wasi" "write" (func $fimport$0 (param externref i32 i32) (result i32)))
  (memory $0 1)
+ (data (i32.const 0) "hello")
  (table $0 1 1 funcref)
  (elem (i32.const 0) $0)
  (export "adder" (func $0))

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
@@ -34,15 +48,18 @@ let select =
 
 let bin = Expression.Binary.make wasm_mod Op.add_int32 select (y ())
 
+let if_ =
+  Expression.If.make wasm_mod
+    (Expression.Const.make wasm_mod (Literal.int32 0l))
+    (Expression.Unreachable.make wasm_mod)
+    (Expression.Null.make ())
+
+let _ = assert (Expression.If.get_if_false if_ = None)
+
 let add =
-  Expression.Block.make wasm_mod ~return_type:Type.int32 "add"
-    [
-      Expression.If.make wasm_mod
-        (Expression.Const.make wasm_mod (Literal.int32 0l))
-        (Expression.Unreachable.make wasm_mod)
-        (Expression.Null.make ());
-      bin;
-    ]
+  Expression.Block.make wasm_mod ~return_type:Type.int32 "add" [ if_; bin ]
+
+let _ = assert (Expression.Block.get_name add = Some "add")
 
 (* Create the add function *)
 let adder = Function.add_function wasm_mod "adder" (params ()) results [||] add
@@ -91,6 +108,10 @@ let _ =
   Global.add_global wasm_mod "max_int64" Type.int64 false
     (Expression.Const.make wasm_mod (Literal.int64 Int64.max_int))
 
+let _ =
+  Global.add_global wasm_mod "max_int64_mut" Type.int64 true
+    (Expression.Const.make wasm_mod (Literal.int64 Int64.max_int))
+
 let _ =
   Global.add_global wasm_mod "test_float64_bits" Type.float64 false
     (Expression.Const.make wasm_mod (Literal.float64_bits 0x3FF3AE147AE147AEL))
@@ -100,7 +121,15 @@ let _ =
     (Expression.Const.make wasm_mod (Literal.int32 0l))
 
 let _ = Function.set_start wasm_mod start
-let _ = Memory.set_memory wasm_mod 1 Memory.unlimited "memory" [] false
+
+let segment : Binaryen.Memory.segment =
+  let data = "hello" in
+  let passive = false in
+  let offset = Expression.Const.make wasm_mod (Literal.int32 0l) in
+  let size = String.length data in
+  { data; passive; offset; size }
+
+let _ = Memory.set_memory wasm_mod 1 Memory.unlimited "memory" [ segment ] false
 
 (* Create an imported "write" function i32 (externref, i32, i32) *)
 (* Similar to the example here: https://bytecodealliance.org/articles/reference-types-in-wasmtime *)
@@ -139,9 +168,20 @@ let _ = Module.print wasm_mod
 
 (* 3. Copy previous module bytes into new module, validate, and print *)
 
-let byts, _ = Module.write wasm_mod None
+let byts, no_sourcemap = Module.write wasm_mod None
+let _ = assert (no_sourcemap = None)
+let _, sourcemap = Module.write wasm_mod (Some "test.wasm.map")
+
+let _ =
+  assert (
+    sourcemap = Some {|{"version":3,"sources":[],"names":[],"mappings":""}|})
+
 let new_mod = Module.read byts
 
+let _ =
+  Module.run_passes new_mod
+    [ Passes.name_types; Passes.merge_similar_functions ]
+
 let _ =
   Module.set_features new_mod
     [
@@ -160,6 +200,7 @@ let _ =
       Module.Feature.memory64;
       Module.Feature.typed_function_references;
       Module.Feature.relaxed_simd;
+      Module.Feature.extended_const;
       Module.Feature.all;
     ]
 

binaryen-archive/esy.lock/opam/js_of_ocaml-ppx.3.11.0/opam

@@ -1,44 +0,0 @@
-opam-version: "2.0"
-synopsis: "Compiler from OCaml bytecode to JavaScript"
-description:
-  "Js_of_ocaml is a compiler from OCaml bytecode to JavaScript. It makes it possible to run pure OCaml programs in JavaScript environment like browsers and Node.js"
-maintainer: ["Ocsigen team <dev@ocsigen.org>"]
-authors: ["Ocsigen team <dev@ocsigen.org>"]
-license:
-  "GPL-2.0-or-later AND LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception"
-homepage: "https://ocsigen.github.io/js_of_ocaml"
-doc: "https://ocsigen.github.io/js_of_ocaml"
-bug-reports: "https://github.com/ocsigen/js_of_ocaml/issues"
-depends: [
-  "dune" {>= "2.8"}
-  "ocaml" {>= "4.04"}
-  "js_of_ocaml" {= version}
-  "ppxlib" {>= "0.15.0"}
-  "num" {with-test}
-  "ppx_expect" {with-test}
-  "re" {>= "1.9.0" & with-test}
-  "odoc" {with-doc}
-]
-dev-repo: "git+https://github.com/ocsigen/js_of_ocaml.git"
-build: [
-  ["dune" "subst"] {dev}
-  [
-    "dune"
-    "build"
-    "-p"
-    name
-    "-j"
-    jobs
-    "@install"
-    "@doc" {with-doc}
-  ]
-]
-url {
-  src:
-    "https://github.com/ocsigen/js_of_ocaml/releases/download/3.11.0/js_of_ocaml-3.11.0.tbz"
-  checksum: [
-    "sha256=158dafe7271ac79157981d1c3f5f177ec78a0099c38f861ae14e7ac06bd29c3a"
-    "sha512=d83f0988aa1089fa01a0a693d7e6a832018c5a8ce707f44685809769377ef7ef59ce48229b1612966bd9166b610d66ddff8f2606f6c3f09c49f601b74842fde1"
-  ]
-}
-x-commit-hash: "4572278dea9cc8a7d44d65b440004a2ec3bce7a7"

binaryen-archive/esy.lock/opam/js_of_ocaml.3.11.0/opam

@@ -1,45 +0,0 @@
-opam-version: "2.0"
-synopsis: "Compiler from OCaml bytecode to JavaScript"
-description:
-  "Js_of_ocaml is a compiler from OCaml bytecode to JavaScript. It makes it possible to run pure OCaml programs in JavaScript environment like browsers and Node.js"
-maintainer: ["Ocsigen team <dev@ocsigen.org>"]
-authors: ["Ocsigen team <dev@ocsigen.org>"]
-license:
-  "GPL-2.0-or-later AND LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception"
-homepage: "https://ocsigen.github.io/js_of_ocaml"
-doc: "https://ocsigen.github.io/js_of_ocaml"
-bug-reports: "https://github.com/ocsigen/js_of_ocaml/issues"
-depends: [
-  "dune" {>= "2.8"}
-  "ocaml" {>= "4.04"}
-  "js_of_ocaml-compiler" {= version}
-  "ppxlib" {>= "0.15"}
-  "uchar"
-  "num" {with-test}
-  "ppx_expect" {with-test}
-  "re" {>= "1.9.0" & with-test}
-  "odoc" {with-doc}
-]
-dev-repo: "git+https://github.com/ocsigen/js_of_ocaml.git"
-build: [
-  ["dune" "subst"] {dev}
-  [
-    "dune"
-    "build"
-    "-p"
-    name
-    "-j"
-    jobs
-    "@install"
-    "@doc" {with-doc}
-  ]
-]
-url {
-  src:
-    "https://github.com/ocsigen/js_of_ocaml/releases/download/3.11.0/js_of_ocaml-3.11.0.tbz"
-  checksum: [
-    "sha256=158dafe7271ac79157981d1c3f5f177ec78a0099c38f861ae14e7ac06bd29c3a"
-    "sha512=d83f0988aa1089fa01a0a693d7e6a832018c5a8ce707f44685809769377ef7ef59ce48229b1612966bd9166b610d66ddff8f2606f6c3f09c49f601b74842fde1"
-  ]
-}
-x-commit-hash: "4572278dea9cc8a7d44d65b440004a2ec3bce7a7"

binaryen-archive/esy.lock/opam/uchar.0.0.2/opam

@@ -1,36 +0,0 @@
-opam-version: "2.0"
-maintainer: "Daniel Bünzli <daniel.buenzl i@erratique.ch>"
-authors: ["Daniel Bünzli <daniel.buenzl i@erratique.ch>"]
-homepage: "http://ocaml.org"
-doc: "https://ocaml.github.io/uchar/"
-dev-repo: "git+https://github.com/ocaml/uchar.git"
-bug-reports: "https://github.com/ocaml/uchar/issues"
-tags: [ "text" "character" "unicode" "compatibility" "org:ocaml.org" ]
-license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
-depends: [
-  "ocaml" {>= "3.12.0"}
-  "ocamlbuild" {build}
-]
-build: [
-  ["ocaml" "pkg/git.ml"]
-  [
-    "ocaml"
-    "pkg/build.ml"
-    "native=%{ocaml:native}%"
-    "native-dynlink=%{ocaml:native-dynlink}%"
-  ]
-]
-synopsis: "Compatibility library for OCaml's Uchar module"
-description: """
-The `uchar` package provides a compatibility library for the
-[`Uchar`][1] module introduced in OCaml 4.03.
-
-The `uchar` package is distributed under the license of the OCaml
-compiler. See [LICENSE](LICENSE) for details.
-
-[1]: http://caml.inria.fr/pub/docs/manual-ocaml/libref/Uchar.html"""
-url {
-  src:
-    "https://github.com/ocaml/uchar/releases/download/v0.0.2/uchar-0.0.2.tbz"
-  checksum: "md5=c9ba2c738d264c420c642f7bb1cf4a36"
-}

binaryen-archive/esy.lock/overrides/opam__s__uchar_opam__c__0.0.2_opam_override/files/winpatch.patch

@@ -1,11 +0,0 @@
---- ./pkg/topkg.ml
-+++ ./pkg/topkg.ml
-@@ -344,7 +344,7 @@
-   let build ccomp btool bdir pkg mvs =
-     let ext_to_string = Exts.ext_to_string ccomp in
-     let install, exec = build_strings btool bdir ext_to_string mvs in
--    let e = Sys.command exec in
-+    let e = Sys.command ("bash -c '" ^ exec ^ "'") in
-     if e <> 0 then exit e else
-     let install_file = pkg ^ ".install" in
-     try

binaryen-archive/esy.lock/overrides/opam__s__uchar_opam__c__0.0.2_opam_override/package.json

@@ -1,11 +0,0 @@
-{
-  "build": [
-    [
-      "bash",
-      "-c",
-      "#{os == 'windows' ? 'patch -p1 < winpatch.patch' : 'true' }"
-    ],
-    "ocaml pkg/git.ml",
-    "ocaml pkg/build.ml native=true native-dynlink=true"
-  ]
-}