@grain/binaryen.ml 0.21.0 → 0.23.0

binaryen-archive/src/passes.mli

@@ -15,6 +15,9 @@ val dae : t
 val dae_optimizing : t
 (** removes arguments to calls in an lto-like manner, and optimizes where we removed *)
 
+val abstract_type_refining : t
+(** refine and merge abstract (never-created) types *)
+
 val coalesce_locals : t
 (** reduce # of locals by coalescing *)
 
@@ -198,6 +201,9 @@ val monomorphize_always : t
 val multi_memory_lowering : t
 (** combines multiple memories into a single memory *)
 
+val multi_memory_lowering_with_bounds_checks : t
+(** combines multiple memories into a single memory, trapping if the read or write is larger than the length of the memory's data *)
+
 val nm : t
 (** name list *)
 
@@ -285,6 +291,9 @@ val remove_unused_nonfunction_module_elements : t
 val remove_unused_names : t
 (** removes names from locations that are never branched to *)
 
+val remove_unused_types : t
+(** remove unused private GC types *)
+
 val reorder_functions : t
 (** sorts functions by access frequency *)
 
@@ -384,6 +393,12 @@ val trap_mode_clamp : t
 val trap_mode_js : t
 (** replace trapping operations with js semantics *)
 
+val type_merging : t
+(** merge types to their supertypes where possible *)
+
+val type_ssa : t
+(** create new nominal types to help other optimizations *)
+
 val untee : t
 (** removes local.tees, replacing them with sets and gets *)
 

binaryen-archive/src/type.c

@@ -77,9 +77,9 @@ caml_binaryen_type_i31ref(value unit) {
 }
 
 CAMLprim value
-caml_binaryen_type_dataref(value unit) {
+caml_binaryen_type_structref(value unit) {
   CAMLparam1(unit);
-  BinaryenType ty = BinaryenTypeDataref();
+  BinaryenType ty = BinaryenTypeStructref();
   CAMLreturn(alloc_BinaryenType(ty));
 }
 

binaryen-archive/src/type.js

@@ -58,10 +58,10 @@ function caml_binaryen_type_i31ref() {
   return Binaryen.i31ref;
 }
 
-//Provides: caml_binaryen_type_dataref
+//Provides: caml_binaryen_type_structref
 //Requires: Binaryen
-function caml_binaryen_type_dataref() {
-  return Binaryen.dataref;
+function caml_binaryen_type_structref() {
+  return Binaryen.structref;
 }
 
 //Provides: caml_binaryen_type_arrayref

binaryen-archive/src/type.ml

@@ -40,9 +40,9 @@ external i31ref : unit -> t = "caml_binaryen_type_i31ref"
 
 let i31ref = i31ref ()
 
-external dataref : unit -> t = "caml_binaryen_type_dataref"
+external structref : unit -> t = "caml_binaryen_type_structref"
 
-let dataref = dataref ()
+let structref = structref ()
 
 external arrayref : unit -> t = "caml_binaryen_type_arrayref"
 

binaryen-archive/src/type.mli

@@ -10,7 +10,7 @@ val funcref : t
 val anyref : t
 val eqref : t
 val i31ref : t
-val dataref : t
+val structref : t
 val arrayref : t
 val stringref : t
 val stringview_wtf8 : t

binaryen-archive/test/test.expected

@@ -16,15 +16,15 @@
  (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")
- (data "world")
+ (data $0 (i32.const 0) "hello")
+ (data $1 "world")
  (table $table 1 1 funcref)
  (elem $elem (i32.const 0) $adder)
  (export "adder" (func $adder))
  (export "memory" (memory $0))
  (export "hello" (func $hello))
  (start $start)
- (func $adder (param $0 i32) (param $1 i32) (result i32)
+ (func $adder (type $i32_i32_=>_i32) (param $0 i32) (param $1 i32) (result i32)
   (block $add (result i32)
    (if
     (i32.const 0)
@@ -42,9 +42,9 @@
    )
   )
  )
- (func $start
+ (func $start (type $none_=>_none)
   (block $start
-   (memory.init 1
+   (memory.init $1
     (i32.const 2048)
     (i32.const 0)
     (i32.const 5)
@@ -58,7 +58,7 @@
    )
   )
  )
- (func $hello (param $0 anyref) (result i32)
+ (func $hello (type $anyref_=>_i32) (param $0 anyref) (result i32)
   (call $write
    (local.get $0)
    (i32.const 0)
@@ -73,15 +73,15 @@
  (type $anyref_=>_i32 (func (param anyref) (result i32)))
  (import "future-wasi" "write" (func $write (param anyref i32 i32) (result i32)))
  (memory $0 1)
- (data (i32.const 0) "hello")
- (data "world")
+ (data $0 (i32.const 0) "hello")
+ (data $1 "world")
  (table $table 1 1 funcref)
  (elem $elem (i32.const 0) $adder)
  (export "adder" (func $adder))
  (export "memory" (memory $0))
  (export "hello" (func $hello))
  (start $start)
- (func $adder (; has Stack IR ;) (param $0 i32) (param $1 i32) (result i32)
+ (func $adder (type $i32_i32_=>_i32) (; has Stack IR ;) (param $0 i32) (param $1 i32) (result i32)
   (i32.add
    (select
     (local.get $0)
@@ -93,8 +93,8 @@
    (local.get $1)
   )
  )
- (func $start (; has Stack IR ;)
-  (memory.init 1
+ (func $start (type $none_=>_none) (; has Stack IR ;)
+  (memory.init $1
    (i32.const 2048)
    (i32.const 0)
    (i32.const 5)
@@ -106,7 +106,7 @@
    )
   )
  )
- (func $hello (; has Stack IR ;) (param $0 anyref) (result i32)
+ (func $hello (type $anyref_=>_i32) (; has Stack IR ;) (param $0 anyref) (result i32)
   (call $write
    (local.get $0)
    (i32.const 0)
@@ -121,15 +121,15 @@
  (type $type$3 (func (param anyref) (result i32)))
  (import "future-wasi" "write" (func $fimport$0 (param anyref i32 i32) (result i32)))
  (memory $0 1)
- (data (i32.const 0) "hello")
- (data "world")
+ (data $0 (i32.const 0) "hello")
+ (data $1 "world")
  (table $0 1 1 funcref)
- (elem (i32.const 0) $0)
+ (elem $0 (i32.const 0) $0)
  (export "adder" (func $0))
  (export "memory" (memory $0))
  (export "hello" (func $2))
  (start $1)
- (func $0 (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,8 +141,8 @@
    (local.get $1)
   )
  )
- (func $1
-  (memory.init 1
+ (func $1 (type $type$2)
+  (memory.init $1
    (i32.const 2048)
    (i32.const 0)
    (i32.const 5)
@@ -154,7 +154,7 @@
    )
   )
  )
- (func $2 (param $0 anyref) (result i32)
+ (func $2 (type $type$3) (param $0 anyref) (result i32)
   (call $fimport$0
    (local.get $0)
    (i32.const 0)
@@ -169,15 +169,15 @@
  (type $type$3 (func (param anyref) (result i32)))
  (import "future-wasi" "write" (func $fimport$0 (param anyref i32 i32) (result i32)))
  (memory $0 1)
- (data (i32.const 0) "hello")
- (data "world")
+ (data $0 (i32.const 0) "hello")
+ (data $1 "world")
  (table $0 1 1 funcref)
- (elem (i32.const 0) $0)
+ (elem $0 (i32.const 0) $0)
  (export "adder" (func $0))
  (export "memory" (memory $0))
  (export "hello" (func $2))
  (start $1)
- (func $0 (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 $0
@@ -186,17 +186,17 @@
   local.get $1
   i32.add
  )
- (func $1
+ (func $1 (type $type$2)
   i32.const 2048
   i32.const 0
   i32.const 5
-  memory.init $0 1
+  memory.init $0 $1
   i32.const 3
   i32.const 5
   call $0
   drop
  )
- (func $2 (param $0 anyref) (result i32)
+ (func $2 (type $type$3) (param $0 anyref) (result i32)
   local.get $0
   i32.const 0
   i32.const 1

binaryen-archive/src/type_system.c

@@ -1,40 +0,0 @@
-#define CAML_NAME_SPACE
-#include <caml/mlvalues.h>
-#include <caml/fail.h>
-#include <caml/memory.h>
-
-#include "binaryen-c.h"
-#include "ocaml_helpers.h"
-
-
-CAMLprim value
-caml_binaryen_type_system_equirecursive(value unit) {
-  CAMLparam1(unit);
-  CAMLreturn(Val_int(BinaryenTypeSystemEquirecursive()));
-}
-
-CAMLprim value
-caml_binaryen_type_system_nominal(value unit) {
-  CAMLparam1(unit);
-  CAMLreturn(Val_int(BinaryenTypeSystemNominal()));
-}
-
-CAMLprim value
-caml_binaryen_type_system_isorecursive(value unit) {
-  CAMLparam1(unit);
-  CAMLreturn(Val_int(BinaryenTypeSystemIsorecursive()));
-}
-
-CAMLprim value
-caml_binaryen_get_type_system(value unit) {
-  CAMLparam1(unit);
-  CAMLreturn(Val_int(BinaryenGetTypeSystem()));
-}
-
-CAMLprim value
-caml_binaryen_set_type_system(value _typeSystem) {
-  CAMLparam1(_typeSystem);
-  BinaryenTypeSystem typeSystem = Int_val(_typeSystem);
-  BinaryenSetTypeSystem(typeSystem);
-  CAMLreturn(Val_unit);
-}

binaryen-archive/src/type_system.js

@@ -1,29 +0,0 @@
-//Provides: caml_binaryen_type_system_equirecursive
-//Requires: Binaryen
-function caml_binaryen_type_system_equirecursive() {
-  return Binaryen._BinaryenTypeSystemEquirecursive();
-}
-
-//Provides: caml_binaryen_type_system_nominal
-//Requires: Binaryen
-function caml_binaryen_type_system_nominal() {
-  return Binaryen._BinaryenTypeSystemNominal();
-}
-
-//Provides: caml_binaryen_type_system_isorecursive
-//Requires: Binaryen
-function caml_binaryen_type_system_isorecursive() {
-  return Binaryen._BinaryenTypeSystemIsorecursive();
-}
-
-//Provides: caml_binaryen_get_type_system
-//Requires: Binaryen
-function caml_binaryen_get_type_system() {
-  return Binaryen._BinaryenGetTypeSystem();
-}
-
-//Provides: caml_binaryen_set_type_system
-//Requires: Binaryen
-function caml_binaryen_set_type_system(typeSystem) {
-  Binaryen._BinaryenSetTypeSystem(typeSystem);
-}

binaryen-archive/src/type_system.ml

@@ -1,7 +0,0 @@
-type t = int
-
-external equirecursive : unit -> t = "caml_binaryen_type_system_equirecursive"
-external nominal : unit -> t = "caml_binaryen_type_system_nominal"
-external isorecursive : unit -> t = "caml_binaryen_type_system_isorecursive"
-external get_type_system : unit -> t = "caml_binaryen_get_type_system"
-external set_type_system : t -> unit = "caml_binaryen_set_type_system"

binaryen-archive/src/type_system.mli

@@ -1,7 +0,0 @@
-type t
-
-val equirecursive : unit -> t
-val nominal : unit -> t
-val isorecursive : unit -> t
-val get_type_system : unit -> t
-val set_type_system : t -> unit