feat!: Update to libbinaryen v114 (#198)

chore!: Restrict ocaml to <5 when installing with esy
feat: Add `strip_eh` pass

---------

Co-authored-by: Blaine Bublitz <[email protected]>

binaryen.opam

@@ -16,5 +16,5 @@ depends: [
   "dune" {>= "3.0.0"}
   "dune-configurator" {>= "3.0.0"}
   "js_of_ocaml-compiler" {>= "4.1.0" < "6.0.0"}
-  "libbinaryen" {>= "113.0.0" < "114.0.0"}
+  "libbinaryen" {>= "114.0.0" < "115.0.0"}
 ]

package.json

@@ -5,8 +5,8 @@
   "author": "Oscar Spencer <[email protected]>",
   "license": "Apache-2.0",
   "dependencies": {
-    "ocaml": ">= 4.12.0",
-    "@grain/libbinaryen": ">= 113.0.0 < 114.0.0",
+    "ocaml": ">= 4.12.0 < 5.0.0",
+    "@grain/libbinaryen": ">= 114.0.0 < 115.0.0",
     "@opam/dune": ">= 3.0.0",
     "@opam/dune-configurator": ">= 3.0.0"
   },

src/passes.ml

@@ -387,6 +387,9 @@ let strip_dwarf = "strip-dwarf"
 (** strip the wasm producers section *)
 let strip_producers = "strip-producers"
 
+(** strip EH instructions *)
+let strip_eh = "strip-eh"
+
 (** strip the wasm target features section *)
 let strip_target_features = "strip-target-features"
 

src/passes.mli

@@ -384,6 +384,9 @@ val strip_dwarf : t
 val strip_producers : t
 (** strip the wasm producers section *)
 
+val strip_eh : t
+(** strip EH instructions *)
+
 val strip_target_features : t
 (** strip the wasm target features section *)
 

test/test.expected

@@ -11,7 +11,7 @@
  (type $none_=>_none (func))
  (type $anyref_i32_i32_=>_i32 (func (param anyref i32 i32) (result i32)))
  (type $anyref_=>_i32 (func (param anyref) (result i32)))
- (import "future-wasi" "write" (func $write (param anyref i32 i32) (result i32)))
+ (import "future-wasi" "write" (func $write (type $anyref_i32_i32_=>_i32) (param anyref 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))
@@ -71,7 +71,7 @@
  (type $none_=>_none (func))
  (type $anyref_i32_i32_=>_i32 (func (param anyref i32 i32) (result i32)))
  (type $anyref_=>_i32 (func (param anyref) (result i32)))
- (import "future-wasi" "write" (func $write (param anyref i32 i32) (result i32)))
+ (import "future-wasi" "write" (func $write (type $anyref_i32_i32_=>_i32) (param anyref i32 i32) (result i32)))
  (memory $0 1)
  (data $0 (i32.const 0) "hello")
  (data $1 "world")
@@ -119,7 +119,7 @@
  (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 (param anyref i32 i32) (result i32)))
+ (import "future-wasi" "write" (func $fimport$0 (type $type$0) (param anyref i32 i32) (result i32)))
  (memory $0 1)
  (data $0 (i32.const 0) "hello")
  (data $1 "world")
@@ -167,7 +167,7 @@
  (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 (param anyref i32 i32) (result i32)))
+ (import "future-wasi" "write" (func $fimport$0 (type $type$0) (param anyref i32 i32) (result i32)))
  (memory $0 1)
  (data $0 (i32.const 0) "hello")
  (data $1 "world")

test/test.ml

@@ -248,6 +248,7 @@ let _ =
       Passes.monomorphize;
       Passes.signext_lowering;
       Passes.discard_global_effects;
+      Passes.strip_eh;
     ]
 
 let _ =