diff options
Diffstat (limited to 'test/lit')
38 files changed, 120 insertions, 120 deletions
diff --git a/test/lit/ctor-eval/gc-cycle.wast b/test/lit/ctor-eval/gc-cycle.wast index a6edc28aa..5096da376 100644 --- a/test/lit/ctor-eval/gc-cycle.wast +++ b/test/lit/ctor-eval/gc-cycle.wast @@ -1254,7 +1254,7 @@ ;; CHECK: (type $anyref_=>_none (func (param anyref))) - ;; CHECK: (import "a" "b" (func $import (param anyref))) + ;; CHECK: (import "a" "b" (func $import (type $anyref_=>_none) (param anyref))) (import "a" "b" (func $import (param anyref))) (func $test (export "test") diff --git a/test/lit/ctor-eval/multivalue-local.wast b/test/lit/ctor-eval/multivalue-local.wast index ff3daa339..5ae72afa2 100644 --- a/test/lit/ctor-eval/multivalue-local.wast +++ b/test/lit/ctor-eval/multivalue-local.wast @@ -6,7 +6,7 @@ ;; CHECK: (type $none_=>_i32 (func (result i32))) - ;; CHECK: (import "a" "b" (func $import)) + ;; CHECK: (import "a" "b" (func $import (type $none_=>_none))) (import "a" "b" (func $import)) (func $multivalue-local (export "multivalue-local") (result i32) diff --git a/test/lit/merge/fusing.wat b/test/lit/merge/fusing.wat index 645634b4d..780cf1cf7 100644 --- a/test/lit/merge/fusing.wat +++ b/test/lit/merge/fusing.wat @@ -22,7 +22,7 @@ ;; CHECK: (type $none_=>_i32 (func (result i32))) - ;; CHECK: (import "third" "missing" (func $other.missing)) + ;; CHECK: (import "third" "missing" (func $other.missing (type $none_=>_none))) (import "third" "missing" (func $other.missing)) ;; CHECK: (memory $second.mem 2) diff --git a/test/lit/passes/code-pushing_into_if.wast b/test/lit/passes/code-pushing_into_if.wast index 504d4776d..61c674948 100644 --- a/test/lit/passes/code-pushing_into_if.wast +++ b/test/lit/passes/code-pushing_into_if.wast @@ -2,7 +2,7 @@ ;; RUN: wasm-opt %s --code-pushing -all -S -o - | filecheck %s (module - ;; CHECK: (import "binaryen-intrinsics" "call.without.effects" (func $call.without.effects (param i32 funcref) (result i32))) + ;; CHECK: (import "binaryen-intrinsics" "call.without.effects" (func $call.without.effects (type $i32_funcref_=>_i32) (param i32 funcref) (result i32))) (import "binaryen-intrinsics" "call.without.effects" (func $call.without.effects (param i32 funcref) (result i32))) ;; CHECK: (func $if-nop (type $i32_=>_none) (param $p i32) diff --git a/test/lit/passes/dae_all-features.wast b/test/lit/passes/dae_all-features.wast index 3952747f7..3e628d6af 100644 --- a/test/lit/passes/dae_all-features.wast +++ b/test/lit/passes/dae_all-features.wast @@ -15,9 +15,9 @@ ;; CHECK: (type $f64_=>_none (func (param f64))) - ;; CHECK: (import "a" "b" (func $get-i32 (result i32))) + ;; CHECK: (import "a" "b" (func $get-i32 (type $none_=>_i32) (result i32))) (import "a" "b" (func $get-i32 (result i32))) - ;; CHECK: (import "a" "c" (func $get-f64 (result f64))) + ;; CHECK: (import "a" "c" (func $get-f64 (type $none_=>_f64) (result f64))) (import "a" "c" (func $get-f64 (result f64))) ;; CHECK: (table $0 2 2 funcref) diff --git a/test/lit/passes/flatten_i64-to-i32-lowering.wast b/test/lit/passes/flatten_i64-to-i32-lowering.wast index aa9018581..89ab88820 100644 --- a/test/lit/passes/flatten_i64-to-i32-lowering.wast +++ b/test/lit/passes/flatten_i64-to-i32-lowering.wast @@ -11,7 +11,7 @@ ;; CHECK: (type $none_=>_none (func)) - ;; CHECK: (import "env" "func" (func $import (result i64))) + ;; CHECK: (import "env" "func" (func $import (type $none_=>_i64) (result i64))) (import "env" "func" (func $import (result i64))) ;; CHECK: (global $i64toi32_i32$HIGH_BITS (mut i32) (i32.const 0)) diff --git a/test/lit/passes/generate-dyncalls_all-features.wast b/test/lit/passes/generate-dyncalls_all-features.wast index a7549ad48..4ec8aa15f 100644 --- a/test/lit/passes/generate-dyncalls_all-features.wast +++ b/test/lit/passes/generate-dyncalls_all-features.wast @@ -16,7 +16,7 @@ ;; CHECK: (type $i32_i32_=>_none (func (param i32 i32))) - ;; CHECK: (import "env" "invoke_vii" (func $invoke_vii (param i32 i32 i32))) + ;; CHECK: (import "env" "invoke_vii" (func $invoke_vii (type $i32_i32_i32_=>_none) (param i32 i32 i32))) (import "env" "invoke_vii" (func $invoke_vii (param i32 i32 i32))) ;; CHECK: (table $0 2 2 funcref) @@ -74,7 +74,7 @@ ;; CHECK: (import "env" "table" (table $timport$0 1 1 funcref)) (import "env" "invoke_vii" (func $invoke_vii (param i32 i32 i32))) - ;; CHECK: (import "env" "invoke_vii" (func $invoke_vii (param i32 i32 i32))) + ;; CHECK: (import "env" "invoke_vii" (func $invoke_vii (type $i32_i32_i32_=>_none) (param i32 i32 i32))) (import "env" "table" (table 1 1 funcref)) (elem (i32.const 0) $f) ;; CHECK: (elem $0 (i32.const 0) $f) diff --git a/test/lit/passes/gufa-refs.wast b/test/lit/passes/gufa-refs.wast index 89b249f2a..06998072b 100644 --- a/test/lit/passes/gufa-refs.wast +++ b/test/lit/passes/gufa-refs.wast @@ -14,7 +14,7 @@ ;; CHECK: (type $none_=>_ref|any| (func (result (ref any)))) - ;; CHECK: (import "a" "b" (func $import (result i32))) + ;; CHECK: (import "a" "b" (func $import (type $none_=>_i32) (result i32))) (import "a" "b" (func $import (result i32))) ;; CHECK: (func $no-non-null (type $none_=>_ref|any|) (result (ref any)) @@ -2466,7 +2466,7 @@ ;; CHECK: (type $none_=>_ref|eq| (func (result (ref eq)))) - ;; CHECK: (import "a" "b" (func $import (result i32))) + ;; CHECK: (import "a" "b" (func $import (type $none_=>_i32) (result i32))) (import "a" "b" (func $import (result i32))) ;; CHECK: (export "test-cones" (func $test-cones)) @@ -3520,7 +3520,7 @@ ;; CHECK: (type $none_=>_none (func)) - ;; CHECK: (import "a" "b" (func $import (result i32))) + ;; CHECK: (import "a" "b" (func $import (type $none_=>_i32) (result i32))) (import "a" "b" (func $import (result i32))) ;; CHECK: (func $test (type $none_=>_none) @@ -3571,7 +3571,7 @@ ;; CHECK: (type $none_=>_ref|$B| (func (result (ref $B)))) - ;; CHECK: (import "a" "b" (func $import (result i32))) + ;; CHECK: (import "a" "b" (func $import (type $none_=>_i32) (result i32))) (import "a" "b" (func $import (result i32))) ;; CHECK: (func $foo (type $none_=>_ref|$B|) (result (ref $B)) @@ -4456,7 +4456,7 @@ ;; CHECK: (type $none_=>_i32 (func (result i32))) - ;; CHECK: (import "a" "b" (func $import (result i32))) + ;; CHECK: (import "a" "b" (func $import (type $none_=>_i32) (result i32))) (import "a" "b" (func $import (result i32))) ;; CHECK: (global $func (ref func) (ref.func $reffed-in-global-code)) @@ -5225,7 +5225,7 @@ ;; CHECK: (import "a" "b" (global $A (ref $A))) (import "a" "b" (global $A (ref $A))) - ;; CHECK: (import "a" "c" (func $A (result (ref $A)))) + ;; CHECK: (import "a" "c" (func $A (type $none_=>_ref|$A|) (result (ref $A)))) (import "a" "c" (func $A (result (ref $A)))) ;; CHECK: (global $mut_A (ref $A) (struct.new $A diff --git a/test/lit/passes/gufa-vs-cfp.wast b/test/lit/passes/gufa-vs-cfp.wast index 4a2a6c863..ae63ac7ba 100644 --- a/test/lit/passes/gufa-vs-cfp.wast +++ b/test/lit/passes/gufa-vs-cfp.wast @@ -105,7 +105,7 @@ ;; CHECK: (type $none_=>_none (func)) - ;; CHECK: (import "a" "b" (func $import (result f32))) + ;; CHECK: (import "a" "b" (func $import (type $none_=>_f32) (result f32))) (import "a" "b" (func $import (result f32))) ;; CHECK: (func $test (type $none_=>_none) @@ -357,7 +357,7 @@ ;; CHECK: (type $none_=>_ref|$struct| (func (result (ref $struct)))) - ;; CHECK: (import "a" "b" (func $import (result i32))) + ;; CHECK: (import "a" "b" (func $import (type $none_=>_i32) (result i32))) (import "a" "b" (func $import (result i32))) ;; CHECK: (func $create (type $none_=>_ref|$struct|) (result (ref $struct)) @@ -690,7 +690,7 @@ ;; CHECK: (type $substruct (struct_subtype (field i32) (field f64) $struct)) (type $substruct (struct_subtype i32 f64 $struct)) - ;; CHECK: (import "a" "b" (func $import (result i32))) + ;; CHECK: (import "a" "b" (func $import (type $none_=>_i32) (result i32))) (import "a" "b" (func $import (result i32))) ;; CHECK: (func $test (type $none_=>_none) @@ -744,7 +744,7 @@ ;; CHECK: (type $substruct (struct_subtype (field i32) (field f64) $struct)) (type $substruct (struct_subtype i32 f64 $struct)) - ;; CHECK: (import "a" "b" (func $import (result i32))) + ;; CHECK: (import "a" "b" (func $import (type $none_=>_i32) (result i32))) (import "a" "b" (func $import (result i32))) ;; CHECK: (func $test (type $none_=>_none) @@ -796,7 +796,7 @@ ;; CHECK: (type $none_=>_none (func)) - ;; CHECK: (import "a" "b" (func $import (result i32))) + ;; CHECK: (import "a" "b" (func $import (type $none_=>_i32) (result i32))) (import "a" "b" (func $import (result i32))) ;; CHECK: (func $test (type $none_=>_none) @@ -853,7 +853,7 @@ ;; CHECK: (type $none_=>_none (func)) - ;; CHECK: (import "a" "b" (func $import (result i32))) + ;; CHECK: (import "a" "b" (func $import (type $none_=>_i32) (result i32))) (import "a" "b" (func $import (result i32))) ;; CHECK: (func $test (type $none_=>_none) @@ -925,7 +925,7 @@ ;; CHECK: (type $none_=>_none (func)) - ;; CHECK: (import "a" "b" (func $import (result i32))) + ;; CHECK: (import "a" "b" (func $import (type $none_=>_i32) (result i32))) (import "a" "b" (func $import (result i32))) ;; CHECK: (func $test (type $none_=>_none) @@ -1150,7 +1150,7 @@ ;; CHECK: (type $none_=>_ref|$struct3| (func (result (ref $struct3)))) - ;; CHECK: (import "a" "b" (func $import (result anyref))) + ;; CHECK: (import "a" "b" (func $import (type $none_=>_anyref) (result anyref))) (import "a" "b" (func $import (result anyref))) ;; CHECK: (func $create1 (type $none_=>_ref|$struct1|) (result (ref $struct1)) @@ -1384,7 +1384,7 @@ ;; CHECK: (type $none_=>_ref|$struct3| (func (result (ref $struct3)))) - ;; CHECK: (import "a" "b" (func $import (result i32))) + ;; CHECK: (import "a" "b" (func $import (type $none_=>_i32) (result i32))) (import "a" "b" (func $import (result i32))) ;; CHECK: (func $create1 (type $none_=>_ref|$struct1|) (result (ref $struct1)) @@ -1689,7 +1689,7 @@ ;; CHECK: (type $none_=>_none (func)) - ;; CHECK: (import "a" "b" (func $import (result i32))) + ;; CHECK: (import "a" "b" (func $import (type $none_=>_i32) (result i32))) (import "a" "b" (func $import (result i32))) ;; CHECK: (func $create1 (type $none_=>_ref|$struct1|) (result (ref $struct1)) @@ -1805,7 +1805,7 @@ ;; CHECK: (type $none_=>_none (func)) - ;; CHECK: (import "a" "b" (func $import (result i32))) + ;; CHECK: (import "a" "b" (func $import (type $none_=>_i32) (result i32))) (import "a" "b" (func $import (result i32))) ;; CHECK: (func $create1 (type $none_=>_ref|$struct1|) (result (ref $struct1)) diff --git a/test/lit/passes/gufa.wast b/test/lit/passes/gufa.wast index a4d983377..deb9d0fef 100644 --- a/test/lit/passes/gufa.wast +++ b/test/lit/passes/gufa.wast @@ -10,7 +10,7 @@ ;; CHECK: (type $i32_=>_i32 (func (param i32) (result i32))) - ;; CHECK: (import "a" "b" (func $import (result i32))) + ;; CHECK: (import "a" "b" (func $import (type $none_=>_i32) (result i32))) (import "a" "b" (func $import (result i32))) @@ -869,7 +869,7 @@ ;; CHECK: (type $none_=>_none (func)) - ;; CHECK: (import "a" "b" (func $import (result i32))) + ;; CHECK: (import "a" "b" (func $import (type $none_=>_i32) (result i32))) (import "a" "b" (func $import (result i32))) ;; CHECK: (func $internal (type $none_=>_i32) (result i32) @@ -930,11 +930,11 @@ ;; CHECK: (type $none_=>_none (func)) - ;; CHECK: (import "binaryen-intrinsics" "call.without.effects" (func $call-without-effects (param i32 funcref))) + ;; CHECK: (import "binaryen-intrinsics" "call.without.effects" (func $call-without-effects (type $i32_funcref_=>_none) (param i32 funcref))) (import "binaryen-intrinsics" "call.without.effects" (func $call-without-effects (param i32 funcref))) - ;; CHECK: (import "other" "import" (func $other-import (param funcref))) + ;; CHECK: (import "other" "import" (func $other-import (type $funcref_=>_none) (param funcref))) (import "other" "import" (func $other-import (param funcref))) @@ -1000,11 +1000,11 @@ ;; CHECK: (type $ref?|$A|_=>_none (func (param (ref null $A)))) - ;; CHECK: (import "binaryen-intrinsics" "call.without.effects" (func $call-without-effects (param i32 funcref))) + ;; CHECK: (import "binaryen-intrinsics" "call.without.effects" (func $call-without-effects (type $i32_funcref_=>_none) (param i32 funcref))) (import "binaryen-intrinsics" "call.without.effects" (func $call-without-effects (param i32 funcref))) - ;; CHECK: (import "other" "import" (func $other-import (param funcref))) + ;; CHECK: (import "other" "import" (func $other-import (type $funcref_=>_none) (param funcref))) (import "other" "import" (func $other-import (param funcref))) diff --git a/test/lit/passes/inlining-eh.wast b/test/lit/passes/inlining-eh.wast index 62cd400c0..8c6138a4c 100644 --- a/test/lit/passes/inlining-eh.wast +++ b/test/lit/passes/inlining-eh.wast @@ -3,7 +3,7 @@ (module ;; --------------------------------------------------------------------------- - ;; CHECK: (import "a" "b" (func $foo (result i32))) + ;; CHECK: (import "a" "b" (func $foo (type $none_=>_i32) (result i32))) (import "a" "b" (func $foo (result i32))) ;; CHECK: (tag $tag$0 (param i32)) (tag $tag$0 (param i32)) diff --git a/test/lit/passes/inlining-unreachable.wast b/test/lit/passes/inlining-unreachable.wast index 50d84fee3..8f7d46f93 100644 --- a/test/lit/passes/inlining-unreachable.wast +++ b/test/lit/passes/inlining-unreachable.wast @@ -70,7 +70,7 @@ ;; CHECK: (type $none_=>_none (func)) - ;; CHECK: (import "env" "imported" (func $imported (param i32) (result i32))) + ;; CHECK: (import "env" "imported" (func $imported (type $i32_=>_i32) (param i32) (result i32))) (import "env" "imported" (func $imported (param i32) (result i32))) ;; CHECK: (func $caller (type $none_=>_none) diff --git a/test/lit/passes/inlining_splitting.wast b/test/lit/passes/inlining_splitting.wast index d51812404..8b9c30daf 100644 --- a/test/lit/passes/inlining_splitting.wast +++ b/test/lit/passes/inlining_splitting.wast @@ -16,7 +16,7 @@ ;; CHECK: (type $i64_i32_f64_=>_none (func (param i64 i32 f64))) - ;; CHECK: (import "out" "func" (func $import)) + ;; CHECK: (import "out" "func" (func $import (type $none_=>_none))) (import "out" "func" (func $import)) ;; CHECK: (global $glob i32 (i32.const 1)) diff --git a/test/lit/passes/inlining_splitting_basics.wast b/test/lit/passes/inlining_splitting_basics.wast index 443686101..d1fa904a1 100644 --- a/test/lit/passes/inlining_splitting_basics.wast +++ b/test/lit/passes/inlining_splitting_basics.wast @@ -16,14 +16,14 @@ ;; NORMAL_: (type $i32_=>_i32 (func (param i32) (result i32))) - ;; NORMAL_: (import "a" "b" (func $import)) + ;; NORMAL_: (import "a" "b" (func $import (type $none_=>_none))) ;; PARTIAL: (type $none_=>_none (func)) ;; PARTIAL: (type $i32_=>_none (func (param i32))) ;; PARTIAL: (type $i32_=>_i32 (func (param i32) (result i32))) - ;; PARTIAL: (import "a" "b" (func $import)) + ;; PARTIAL: (import "a" "b" (func $import (type $none_=>_none))) (import "a" "b" (func $import)) ;; Pattern A: functions beginning with diff --git a/test/lit/passes/instrument-memory-gc.wast b/test/lit/passes/instrument-memory-gc.wast index 4d78ebdda..2e9047e79 100644 --- a/test/lit/passes/instrument-memory-gc.wast +++ b/test/lit/passes/instrument-memory-gc.wast @@ -26,61 +26,61 @@ ;; CHECK: (type $ref|$array|_=>_none (func (param (ref $array)))) - ;; CHECK: (import "env" "load_ptr" (func $load_ptr (param i32 i32 i32 i32) (result i32))) + ;; CHECK: (import "env" "load_ptr" (func $load_ptr (type $i32_i32_i32_i32_=>_i32) (param i32 i32 i32 i32) (result i32))) - ;; CHECK: (import "env" "load_val_i32" (func $load_val_i32 (param i32 i32) (result i32))) + ;; CHECK: (import "env" "load_val_i32" (func $load_val_i32 (type $i32_i32_=>_i32) (param i32 i32) (result i32))) - ;; CHECK: (import "env" "load_val_i64" (func $load_val_i64 (param i32 i64) (result i64))) + ;; CHECK: (import "env" "load_val_i64" (func $load_val_i64 (type $i32_i64_=>_i64) (param i32 i64) (result i64))) - ;; CHECK: (import "env" "load_val_f32" (func $load_val_f32 (param i32 f32) (result f32))) + ;; CHECK: (import "env" "load_val_f32" (func $load_val_f32 (type $i32_f32_=>_f32) (param i32 f32) (result f32))) - ;; CHECK: (import "env" "load_val_f64" (func $load_val_f64 (param i32 f64) (result f64))) + ;; CHECK: (import "env" "load_val_f64" (func $load_val_f64 (type $i32_f64_=>_f64) (param i32 f64) (result f64))) - ;; CHECK: (import "env" "store_ptr" (func $store_ptr (param i32 i32 i32 i32) (result i32))) + ;; CHECK: (import "env" "store_ptr" (func $store_ptr (type $i32_i32_i32_i32_=>_i32) (param i32 i32 i32 i32) (result i32))) - ;; CHECK: (import "env" "store_val_i32" (func $store_val_i32 (param i32 i32) (result i32))) + ;; CHECK: (import "env" "store_val_i32" (func $store_val_i32 (type $i32_i32_=>_i32) (param i32 i32) (result i32))) - ;; CHECK: (import "env" "store_val_i64" (func $store_val_i64 (param i32 i64) (result i64))) + ;; CHECK: (import "env" "store_val_i64" (func $store_val_i64 (type $i32_i64_=>_i64) (param i32 i64) (result i64))) - ;; CHECK: (import "env" "store_val_f32" (func $store_val_f32 (param i32 f32) (result f32))) + ;; CHECK: (import "env" "store_val_f32" (func $store_val_f32 (type $i32_f32_=>_f32) (param i32 f32) (result f32))) - ;; CHECK: (import "env" "store_val_f64" (func $store_val_f64 (param i32 f64) (result f64))) + ;; CHECK: (import "env" "store_val_f64" (func $store_val_f64 (type $i32_f64_=>_f64) (param i32 f64) (result f64))) - ;; CHECK: (import "env" "struct_get_val_i32" (func $struct_get_val_i32 (param i32 i32) (result i32))) + ;; CHECK: (import "env" "struct_get_val_i32" (func $struct_get_val_i32 (type $i32_i32_=>_i32) (param i32 i32) (result i32))) - ;; CHECK: (import "env" "struct_get_val_i64" (func $struct_get_val_i64 (param i32 i64) (result i64))) + ;; CHECK: (import "env" "struct_get_val_i64" (func $struct_get_val_i64 (type $i32_i64_=>_i64) (param i32 i64) (result i64))) - ;; CHECK: (import "env" "struct_get_val_f32" (func $struct_get_val_f32 (param i32 f32) (result f32))) + ;; CHECK: (import "env" "struct_get_val_f32" (func $struct_get_val_f32 (type $i32_f32_=>_f32) (param i32 f32) (result f32))) - ;; CHECK: (import "env" "struct_get_val_f64" (func $struct_get_val_f64 (param i32 f64) (result f64))) + ;; CHECK: (import "env" "struct_get_val_f64" (func $struct_get_val_f64 (type $i32_f64_=>_f64) (param i32 f64) (result f64))) - ;; CHECK: (import "env" "struct_set_val_i32" (func $struct_set_val_i32 (param i32 i32) (result i32))) + ;; CHECK: (import "env" "struct_set_val_i32" (func $struct_set_val_i32 (type $i32_i32_=>_i32) (param i32 i32) (result i32))) - ;; CHECK: (import "env" "struct_set_val_i64" (func $struct_set_val_i64 (param i32 i64) (result i64))) + ;; CHECK: (import "env" "struct_set_val_i64" (func $struct_set_val_i64 (type $i32_i64_=>_i64) (param i32 i64) (result i64))) - ;; CHECK: (import "env" "struct_set_val_f32" (func $struct_set_val_f32 (param i32 f32) (result f32))) + ;; CHECK: (import "env" "struct_set_val_f32" (func $struct_set_val_f32 (type $i32_f32_=>_f32) (param i32 f32) (result f32))) - ;; CHECK: (import "env" "struct_set_val_f64" (func $struct_set_val_f64 (param i32 f64) (result f64))) + ;; CHECK: (import "env" "struct_set_val_f64" (func $struct_set_val_f64 (type $i32_f64_=>_f64) (param i32 f64) (result f64))) - ;; CHECK: (import "env" "array_get_val_i32" (func $array_get_val_i32 (param i32 i32) (result i32))) + ;; CHECK: (import "env" "array_get_val_i32" (func $array_get_val_i32 (type $i32_i32_=>_i32) (param i32 i32) (result i32))) - ;; CHECK: (import "env" "array_get_val_i64" (func $array_get_val_i64 (param i32 i64) (result i64))) + ;; CHECK: (import "env" "array_get_val_i64" (func $array_get_val_i64 (type $i32_i64_=>_i64) (param i32 i64) (result i64))) - ;; CHECK: (import "env" "array_get_val_f32" (func $array_get_val_f32 (param i32 f32) (result f32))) + ;; CHECK: (import "env" "array_get_val_f32" (func $array_get_val_f32 (type $i32_f32_=>_f32) (param i32 f32) (result f32))) - ;; CHECK: (import "env" "array_get_val_f64" (func $array_get_val_f64 (param i32 f64) (result f64))) + ;; CHECK: (import "env" "array_get_val_f64" (func $array_get_val_f64 (type $i32_f64_=>_f64) (param i32 f64) (result f64))) - ;; CHECK: (import "env" "array_set_val_i32" (func $array_set_val_i32 (param i32 i32) (result i32))) + ;; CHECK: (import "env" "array_set_val_i32" (func $array_set_val_i32 (type $i32_i32_=>_i32) (param i32 i32) (result i32))) - ;; CHECK: (import "env" "array_set_val_i64" (func $array_set_val_i64 (param i32 i64) (result i64))) + ;; CHECK: (import "env" "array_set_val_i64" (func $array_set_val_i64 (type $i32_i64_=>_i64) (param i32 i64) (result i64))) - ;; CHECK: (import "env" "array_set_val_f32" (func $array_set_val_f32 (param i32 f32) (result f32))) + ;; CHECK: (import "env" "array_set_val_f32" (func $array_set_val_f32 (type $i32_f32_=>_f32) (param i32 f32) (result f32))) - ;; CHECK: (import "env" "array_set_val_f64" (func $array_set_val_f64 (param i32 f64) (result f64))) + ;; CHECK: (import "env" "array_set_val_f64" (func $array_set_val_f64 (type $i32_f64_=>_f64) (param i32 f64) (result f64))) - ;; CHECK: (import "env" "array_get_index" (func $array_get_index (param i32 i32) (result i32))) + ;; CHECK: (import "env" "array_get_index" (func $array_get_index (type $i32_i32_=>_i32) (param i32 i32) (result i32))) - ;; CHECK: (import "env" "array_set_index" (func $array_set_index (param i32 i32) (result i32))) + ;; CHECK: (import "env" "array_set_index" (func $array_set_index (type $i32_i32_=>_i32) (param i32 i32) (result i32))) ;; CHECK: (func $structs (type $ref|$struct|_=>_none) (param $x (ref $struct)) ;; CHECK-NEXT: (drop diff --git a/test/lit/passes/intrinsic-lowering.wast b/test/lit/passes/intrinsic-lowering.wast index cd072545b..3e67400dc 100644 --- a/test/lit/passes/intrinsic-lowering.wast +++ b/test/lit/passes/intrinsic-lowering.wast @@ -6,15 +6,15 @@ (type $none (func)) ;; call.without.effects with no params. - ;; CHECK: (import "binaryen-intrinsics" "call.without.effects" (func $cwe-v (param funcref) (result i32))) + ;; CHECK: (import "binaryen-intrinsics" "call.without.effects" (func $cwe-v (type $funcref_=>_i32) (param funcref) (result i32))) (import "binaryen-intrinsics" "call.without.effects" (func $cwe-v (param funcref) (result i32))) ;; call.without.effects with some params. - ;; CHECK: (import "binaryen-intrinsics" "call.without.effects" (func $cwe-dif (param f64 i32 funcref) (result f32))) + ;; CHECK: (import "binaryen-intrinsics" "call.without.effects" (func $cwe-dif (type $f64_i32_funcref_=>_f32) (param f64 i32 funcref) (result f32))) (import "binaryen-intrinsics" "call.without.effects" (func $cwe-dif (param f64) (param i32) (param funcref) (result f32))) ;; call.without.effects with no result. - ;; CHECK: (import "binaryen-intrinsics" "call.without.effects" (func $cwe-n (param funcref))) + ;; CHECK: (import "binaryen-intrinsics" "call.without.effects" (func $cwe-n (type $funcref_=>_none) (param funcref))) (import "binaryen-intrinsics" "call.without.effects" (func $cwe-n (param funcref))) ;; CHECK: (func $test (type $ref?|$none|_=>_none) (param $none (ref null $none)) diff --git a/test/lit/passes/jspi-args.wast b/test/lit/passes/jspi-args.wast index e915f02c0..c99acdd41 100644 --- a/test/lit/passes/jspi-args.wast +++ b/test/lit/passes/jspi-args.wast @@ -7,9 +7,9 @@ ;; CHECK: (type $externref_f64_=>_i32 (func (param externref f64) (result i32))) - ;; CHECK: (import "js" "sleep_sync" (func $sleep_sync (param f64) (result i32))) + ;; CHECK: (import "js" "sleep_sync" (func $sleep_sync (type $f64_=>_i32) (param f64) (result i32))) (import "js" "sleep_async" (func $sleep_async (param f64) (result i32))) - ;; CHECK: (import "js" "sleep_async" (func $import$sleep_async (param externref f64) (result i32))) + ;; CHECK: (import "js" "sleep_async" (func $import$sleep_async (type $externref_f64_=>_i32) (param externref f64) (result i32))) (import "js" "sleep_sync" (func $sleep_sync (param f64) (result i32))) ;; CHECK: (global $suspender (mut externref) (ref.null noextern)) diff --git a/test/lit/passes/jspi-split-module.wast b/test/lit/passes/jspi-split-module.wast index d3484bacf..9bda495c6 100644 --- a/test/lit/passes/jspi-split-module.wast +++ b/test/lit/passes/jspi-split-module.wast @@ -10,7 +10,7 @@ ;; CHECK: (type $externref_=>_none (func (param externref))) -;; CHECK: (import "env" "__load_secondary_module" (func $import$__load_secondary_module (param externref))) +;; CHECK: (import "env" "__load_secondary_module" (func $import$__load_secondary_module (type $externref_=>_none) (param externref))) ;; CHECK: (global $suspender (mut externref) (ref.null noextern)) diff --git a/test/lit/passes/jspi.wast b/test/lit/passes/jspi.wast index bac7ca0c3..f13c7aa77 100644 --- a/test/lit/passes/jspi.wast +++ b/test/lit/passes/jspi.wast @@ -18,11 +18,11 @@ ;; CHECK: (type $externref_i32_=>_none (func (param externref i32))) - ;; CHECK: (import "js" "compute_delta" (func $import$compute_delta (param externref f64) (result i32))) + ;; CHECK: (import "js" "compute_delta" (func $import$compute_delta (type $externref_f64_=>_i32) (param externref f64) (result i32))) (import "js" "compute_delta" (func $compute_delta (param f64) (result i32))) - ;; CHECK: (import "js" "import_and_export" (func $import$import_and_export (param externref i32) (result i32))) + ;; CHECK: (import "js" "import_and_export" (func $import$import_and_export (type $externref_i32_=>_i32) (param externref i32) (result i32))) (import "js" "import_and_export" (func $import_and_export (param i32) (result i32))) - ;; CHECK: (import "js" "import_void_return" (func $import$import_void_return (param externref i32))) + ;; CHECK: (import "js" "import_void_return" (func $import$import_void_return (type $externref_i32_=>_none) (param externref i32))) (import "js" "import_void_return" (func $import_void_return (param i32))) ;; CHECK: (global $suspender (mut externref) (ref.null noextern)) diff --git a/test/lit/passes/legalize-js-interface_all-features.wast b/test/lit/passes/legalize-js-interface_all-features.wast index beca1ab19..fc33d5141 100644 --- a/test/lit/passes/legalize-js-interface_all-features.wast +++ b/test/lit/passes/legalize-js-interface_all-features.wast @@ -16,15 +16,15 @@ ;; CHECK: (type $i32_i64_i64_=>_none (func (param i32 i64 i64))) - ;; CHECK: (import "env" "setTempRet0" (func $setTempRet0 (param i32))) + ;; CHECK: (import "env" "setTempRet0" (func $setTempRet0 (type $i32_=>_none) (param i32))) (import "env" "imported" (func $imported (result i64))) - ;; CHECK: (import "env" "getTempRet0" (func $getTempRet0 (result i32))) + ;; CHECK: (import "env" "getTempRet0" (func $getTempRet0 (type $none_=>_i32) (result i32))) (import "env" "other" (func $other (param i32) (param i64) (param i64))) - ;; CHECK: (import "env" "imported" (func $legalimport$imported (result i32))) + ;; CHECK: (import "env" "imported" (func $legalimport$imported (type $none_=>_i32) (result i32))) (import "env" "ref-func-arg" (func $ref-func-arg (result i64))) - ;; CHECK: (import "env" "other" (func $legalimport$other (param i32 i32 i32 i32 i32))) + ;; CHECK: (import "env" "other" (func $legalimport$other (type $i32_i32_i32_i32_i32_=>_none) (param i32 i32 i32 i32 i32))) - ;; CHECK: (import "env" "ref-func-arg" (func $legalimport$ref-func-arg (result i32))) + ;; CHECK: (import "env" "ref-func-arg" (func $legalimport$ref-func-arg (type $none_=>_i32) (result i32))) ;; CHECK: (elem declare func $legalfunc$ref-func-arg) diff --git a/test/lit/passes/local-subtyping-nn.wast b/test/lit/passes/local-subtyping-nn.wast index c81e2bb6c..fc2009b21 100644 --- a/test/lit/passes/local-subtyping-nn.wast +++ b/test/lit/passes/local-subtyping-nn.wast @@ -5,7 +5,7 @@ (module (type $struct (struct)) - ;; CHECK: (import "out" "i32" (func $i32 (result i32))) + ;; CHECK: (import "out" "i32" (func $i32 (type $none_=>_i32) (result i32))) (import "out" "i32" (func $i32 (result i32))) ;; CHECK: (func $non-nullable (type $none_=>_none) diff --git a/test/lit/passes/local-subtyping.wast b/test/lit/passes/local-subtyping.wast index 2ae05fb90..2d6e2fb05 100644 --- a/test/lit/passes/local-subtyping.wast +++ b/test/lit/passes/local-subtyping.wast @@ -14,9 +14,9 @@ (type $array (array_subtype i8 data)) - ;; CHECK: (import "out" "i32" (func $i32 (result i32))) + ;; CHECK: (import "out" "i32" (func $i32 (type $none_=>_i32) (result i32))) (import "out" "i32" (func $i32 (result i32))) - ;; CHECK: (import "out" "i64" (func $i64 (result i64))) + ;; CHECK: (import "out" "i64" (func $i64 (type $none_=>_i64) (result i64))) (import "out" "i64" (func $i64 (result i64))) ;; Refinalization can find a more specific type, where the declared type was diff --git a/test/lit/passes/monomorphize.wast b/test/lit/passes/monomorphize.wast index 22326fb43..02a709c5a 100644 --- a/test/lit/passes/monomorphize.wast +++ b/test/lit/passes/monomorphize.wast @@ -20,12 +20,12 @@ ;; ALWAYS: (type $ref|$B|_=>_none (func (param (ref $B)))) - ;; ALWAYS: (import "a" "b" (func $import (param (ref $A)))) + ;; ALWAYS: (import "a" "b" (func $import (type $ref|$A|_=>_none) (param (ref $A)))) ;; CAREFUL: (type $ref|$A|_=>_none (func (param (ref $A)))) ;; CAREFUL: (type $none_=>_none (func)) - ;; CAREFUL: (import "a" "b" (func $import (param (ref $A)))) + ;; CAREFUL: (import "a" "b" (func $import (type $ref|$A|_=>_none) (param (ref $A)))) (import "a" "b" (func $import (param (ref $A)))) ;; ALWAYS: (func $calls (type $none_=>_none) @@ -341,7 +341,7 @@ ;; ALWAYS: (type $ref|$A|_=>_none (func (param (ref $A)))) - ;; ALWAYS: (import "a" "b" (func $import (param (ref $B)))) + ;; ALWAYS: (import "a" "b" (func $import (type $ref|$B|_=>_none) (param (ref $B)))) ;; ALWAYS: (global $global (mut i32) (i32.const 1)) ;; CAREFUL: (type $ref|$B|_=>_none (func (param (ref $B)))) @@ -350,7 +350,7 @@ ;; CAREFUL: (type $ref|$A|_=>_none (func (param (ref $A)))) - ;; CAREFUL: (import "a" "b" (func $import (param (ref $B)))) + ;; CAREFUL: (import "a" "b" (func $import (type $ref|$B|_=>_none) (param (ref $B)))) ;; CAREFUL: (global $global (mut i32) (i32.const 1)) (global $global (mut i32) (i32.const 1)) diff --git a/test/lit/passes/once-reduction.wast b/test/lit/passes/once-reduction.wast index 9e99313e4..6ec5511df 100644 --- a/test/lit/passes/once-reduction.wast +++ b/test/lit/passes/once-reduction.wast @@ -199,7 +199,7 @@ (module ;; CHECK: (type $none_=>_none (func)) - ;; CHECK: (import "env" "foo" (func $foo)) + ;; CHECK: (import "env" "foo" (func $foo (type $none_=>_none))) (import "env" "foo" (func $foo)) ;; CHECK: (global $once (mut i32) (i32.const 42)) @@ -239,7 +239,7 @@ (module ;; CHECK: (type $none_=>_none (func)) - ;; CHECK: (import "env" "foo" (func $foo)) + ;; CHECK: (import "env" "foo" (func $foo (type $none_=>_none))) (import "env" "foo" (func $foo)) ;; CHECK: (global $once (mut i32) (i32.const 42)) @@ -280,7 +280,7 @@ (module ;; CHECK: (type $none_=>_none (func)) - ;; CHECK: (import "env" "foo" (func $foo)) + ;; CHECK: (import "env" "foo" (func $foo (type $none_=>_none))) (import "env" "foo" (func $foo)) ;; CHECK: (global $once (mut i32) (i32.const 42)) @@ -321,7 +321,7 @@ (module ;; CHECK: (type $none_=>_none (func)) - ;; CHECK: (import "env" "foo" (func $foo)) + ;; CHECK: (import "env" "foo" (func $foo (type $none_=>_none))) (import "env" "foo" (func $foo)) ;; CHECK: (global $once (mut i32) (i32.const 42)) diff --git a/test/lit/passes/optimize-instructions-gc-tnh.wast b/test/lit/passes/optimize-instructions-gc-tnh.wast index dd5407f31..831d229a2 100644 --- a/test/lit/passes/optimize-instructions-gc-tnh.wast +++ b/test/lit/passes/optimize-instructions-gc-tnh.wast @@ -11,8 +11,8 @@ ;; NO_TNH: (type $void (func)) (type $void (func)) - ;; TNH: (import "a" "b" (func $import (result i32))) - ;; NO_TNH: (import "a" "b" (func $import (result i32))) + ;; TNH: (import "a" "b" (func $import (type $none_=>_i32) (result i32))) + ;; NO_TNH: (import "a" "b" (func $import (type $none_=>_i32) (result i32))) (import "a" "b" (func $import (result i32))) ;; TNH: (func $ref.eq (type $eqref_eqref_=>_i32) (param $a eqref) (param $b eqref) (result i32) diff --git a/test/lit/passes/optimize-instructions-gc.wast b/test/lit/passes/optimize-instructions-gc.wast index 7872a10bc..c55ca8b05 100644 --- a/test/lit/passes/optimize-instructions-gc.wast +++ b/test/lit/passes/optimize-instructions-gc.wast @@ -41,7 +41,7 @@ ;; CHECK: (type $struct_i64 (func (param structref) (result i64))) (type $struct_i64 (func (param (ref null struct)) (result i64))) - ;; CHECK: (import "env" "get-i32" (func $get-i32 (result i32))) + ;; CHECK: (import "env" "get-i32" (func $get-i32 (type $none_=>_i32) (result i32))) (import "env" "get-i32" (func $get-i32 (result i32))) ;; These functions test if an `if` with subtyped arms is correctly folded diff --git a/test/lit/passes/optimize-instructions-ignore-traps.wast b/test/lit/passes/optimize-instructions-ignore-traps.wast index a2602bf4c..177c10b6a 100644 --- a/test/lit/passes/optimize-instructions-ignore-traps.wast +++ b/test/lit/passes/optimize-instructions-ignore-traps.wast @@ -5,7 +5,7 @@ (module ;; CHECK: (type $0 (func (param i32 i32) (result i32))) (type $0 (func (param i32 i32) (result i32))) - ;; CHECK: (import "a" "b" (func $get-i32 (result i32))) + ;; CHECK: (import "a" "b" (func $get-i32 (type $none_=>_i32) (result i32))) ;; CHECK: (memory $0 0) (memory $0 0) diff --git a/test/lit/passes/precompute-gc.wast b/test/lit/passes/precompute-gc.wast index 926c412b3..20d6230be 100644 --- a/test/lit/passes/precompute-gc.wast +++ b/test/lit/passes/precompute-gc.wast @@ -24,7 +24,7 @@ (type $func-return-i32 (func (result i32))) - ;; CHECK: (import "fuzzing-support" "log-i32" (func $log (param i32))) + ;; CHECK: (import "fuzzing-support" "log-i32" (func $log (type $i32_=>_none) (param i32))) (import "fuzzing-support" "log-i32" (func $log (param i32))) ;; CHECK: (func $test-fallthrough (type $func-return-i32) (result i32) diff --git a/test/lit/passes/remove-unused-module-elements-refs.wast b/test/lit/passes/remove-unused-module-elements-refs.wast index 61315384d..f9d1bc3fd 100644 --- a/test/lit/passes/remove-unused-module-elements-refs.wast +++ b/test/lit/passes/remove-unused-module-elements-refs.wast @@ -471,15 +471,15 @@ ;; CHECK: (type $funcref_=>_none (func (param funcref))) - ;; CHECK: (import "binaryen-intrinsics" "call.without.effects" (func $call-without-effects (param funcref))) + ;; CHECK: (import "binaryen-intrinsics" "call.without.effects" (func $call-without-effects (type $funcref_=>_none) (param funcref))) ;; OPEN_WORLD: (type $funcref_=>_none (func (param funcref))) - ;; OPEN_WORLD: (import "binaryen-intrinsics" "call.without.effects" (func $call-without-effects (param funcref))) + ;; OPEN_WORLD: (import "binaryen-intrinsics" "call.without.effects" (func $call-without-effects (type $funcref_=>_none) (param funcref))) (import "binaryen-intrinsics" "call.without.effects" (func $call-without-effects (param funcref))) - ;; CHECK: (import "other" "import" (func $other-import (param funcref))) - ;; OPEN_WORLD: (import "other" "import" (func $other-import (param funcref))) + ;; CHECK: (import "other" "import" (func $other-import (type $funcref_=>_none) (param funcref))) + ;; OPEN_WORLD: (import "other" "import" (func $other-import (type $funcref_=>_none) (param funcref))) (import "other" "import" (func $other-import (param funcref))) @@ -548,15 +548,15 @@ ;; CHECK: (type $funcref_=>_none (func (param funcref))) - ;; CHECK: (import "binaryen-intrinsics" "call.without.effects" (func $call-without-effects (param funcref))) + ;; CHECK: (import "binaryen-intrinsics" "call.without.effects" (func $call-without-effects (type $funcref_=>_none) (param funcref))) ;; OPEN_WORLD: (type $funcref_=>_none (func (param funcref))) - ;; OPEN_WORLD: (import "binaryen-intrinsics" "call.without.effects" (func $call-without-effects (param funcref))) + ;; OPEN_WORLD: (import "binaryen-intrinsics" "call.without.effects" (func $call-without-effects (type $funcref_=>_none) (param funcref))) (import "binaryen-intrinsics" "call.without.effects" (func $call-without-effects (param funcref))) - ;; CHECK: (import "other" "import" (func $other-import (param funcref))) - ;; OPEN_WORLD: (import "other" "import" (func $other-import (param funcref))) + ;; CHECK: (import "other" "import" (func $other-import (type $funcref_=>_none) (param funcref))) + ;; OPEN_WORLD: (import "other" "import" (func $other-import (type $funcref_=>_none) (param funcref))) (import "other" "import" (func $other-import (param funcref))) @@ -1870,10 +1870,10 @@ ;; CHECK: (type $none_=>_i32 (func (result i32))) - ;; CHECK: (import "binaryen-intrinsics" "call.without.effects" (func $call.without.effects (param funcref) (result i32))) + ;; CHECK: (import "binaryen-intrinsics" "call.without.effects" (func $call.without.effects (type $funcref_=>_i32) (param funcref) (result i32))) ;; OPEN_WORLD: (type $none_=>_i32 (func (result i32))) - ;; OPEN_WORLD: (import "binaryen-intrinsics" "call.without.effects" (func $call.without.effects (param funcref) (result i32))) + ;; OPEN_WORLD: (import "binaryen-intrinsics" "call.without.effects" (func $call.without.effects (type $funcref_=>_i32) (param funcref) (result i32))) (import "binaryen-intrinsics" "call.without.effects" (func $call.without.effects (param funcref) (result i32))) ;; CHECK: (elem declare func $getter) diff --git a/test/lit/passes/remove-unused-module-elements_all-features.wast b/test/lit/passes/remove-unused-module-elements_all-features.wast index c8b4a57df..04f0233e6 100644 --- a/test/lit/passes/remove-unused-module-elements_all-features.wast +++ b/test/lit/passes/remove-unused-module-elements_all-features.wast @@ -467,7 +467,7 @@ ;; CHECK: (import "env" "imported" (global $imported i32)) (import "env" "imported" (global $imported i32)) - ;; CHECK: (import "env" "_puts" (func $_puts (param i32) (result i32))) + ;; CHECK: (import "env" "_puts" (func $_puts (type $i32_=>_i32) (param i32) (result i32))) (import "env" "forgetme" (global $forgetme i32)) (import "env" "_puts" (func $_puts (param i32) (result i32))) (import "env" "forget_puts" (func $forget_puts (param i32) (result i32))) @@ -547,7 +547,7 @@ (module ;; imported start cannot be removed ;; CHECK: (type $none_=>_none (func)) - ;; CHECK: (import "env" "start" (func $start)) + ;; CHECK: (import "env" "start" (func $start (type $none_=>_none))) (import "env" "start" (func $start)) ;; CHECK: (start $start) (start $start) diff --git a/test/lit/passes/signature-pruning.wast b/test/lit/passes/signature-pruning.wast index 55010a250..12477c2cd 100644 --- a/test/lit/passes/signature-pruning.wast +++ b/test/lit/passes/signature-pruning.wast @@ -398,7 +398,7 @@ ;; As above, but now an import also uses this signature, which prevents us ;; from changing anything. - ;; CHECK: (import "out" "func" (func $import (param i32))) + ;; CHECK: (import "out" "func" (func $import (type $sig) (param i32))) (import "out" "func" (func $import (type $sig) (param i32))) (memory 1 1) @@ -847,7 +847,7 @@ ;; CHECK: (type $none_=>_i32 (func (result i32))) - ;; CHECK: (import "binaryen-intrinsics" "call.without.effects" (func $cwe (param i32 funcref) (result i32))) + ;; CHECK: (import "binaryen-intrinsics" "call.without.effects" (func $cwe (type $i32_funcref_=>_i32) (param i32 funcref) (result i32))) (import "binaryen-intrinsics" "call.without.effects" (func $cwe (param i32 funcref) (result i32))) ;; CHECK: (elem declare func $func) diff --git a/test/lit/passes/signature-refining.wast b/test/lit/passes/signature-refining.wast index 996adf658..0f12cbde0 100644 --- a/test/lit/passes/signature-refining.wast +++ b/test/lit/passes/signature-refining.wast @@ -763,7 +763,7 @@ ;; CHECK: (type $struct (struct )) (type $struct (struct)) - ;; CHECK: (import "a" "b" (func $import (param structref))) + ;; CHECK: (import "a" "b" (func $import (type $structref_=>_none) (param structref))) (import "a" "b" (func $import (param (ref null struct)))) ;; CHECK: (func $test (type $none_=>_none) diff --git a/test/lit/passes/type-ssa_and_merging.wast b/test/lit/passes/type-ssa_and_merging.wast index a642660db..19c6bf882 100644 --- a/test/lit/passes/type-ssa_and_merging.wast +++ b/test/lit/passes/type-ssa_and_merging.wast @@ -21,8 +21,8 @@ ;; NOP: (type $none_=>_i32 (func (result i32))) - ;; NOP: (import "a" "b" (func $import (result i32))) - ;; YES: (import "a" "b" (func $import (result i32))) + ;; NOP: (import "a" "b" (func $import (type $none_=>_i32) (result i32))) + ;; YES: (import "a" "b" (func $import (type $none_=>_i32) (result i32))) (import "a" "b" (func $import (result i32))) ;; NOP: (export "main1" (func $main1)) diff --git a/test/lit/passes/vacuum-gc.wast b/test/lit/passes/vacuum-gc.wast index bbb0c4c64..2629a238a 100644 --- a/test/lit/passes/vacuum-gc.wast +++ b/test/lit/passes/vacuum-gc.wast @@ -4,9 +4,9 @@ (module ;; CHECK: (type ${} (struct )) - ;; CHECK: (import "binaryen-intrinsics" "call.without.effects" (func $call.without.effects (param i32 i32 funcref) (result anyref))) + ;; CHECK: (import "binaryen-intrinsics" "call.without.effects" (func $call.without.effects (type $i32_i32_funcref_=>_anyref) (param i32 i32 funcref) (result anyref))) (import "binaryen-intrinsics" "call.without.effects" (func $call.without.effects (param i32 i32 funcref) (result (ref null any)))) - ;; CHECK: (import "binaryen-intrinsics" "call.without.effects" (func $call.without.effects.non.null (param i32 i32 funcref) (result (ref any)))) + ;; CHECK: (import "binaryen-intrinsics" "call.without.effects" (func $call.without.effects.non.null (type $i32_i32_funcref_=>_ref|any|) (param i32 i32 funcref) (result (ref any)))) (import "binaryen-intrinsics" "call.without.effects" (func $call.without.effects.non.null (param i32 i32 funcref) (result (ref any)))) (type ${} (struct)) diff --git a/test/lit/passes/vacuum-intrinsics.wast b/test/lit/passes/vacuum-intrinsics.wast index 9d9a25d01..91c24f553 100644 --- a/test/lit/passes/vacuum-intrinsics.wast +++ b/test/lit/passes/vacuum-intrinsics.wast @@ -2,13 +2,13 @@ ;; RUN: wasm-opt %s --vacuum -all -S -o - | filecheck %s (module - ;; CHECK: (import "binaryen-intrinsics" "call.without.effects" (func $call.without.effects (param funcref) (result i32))) + ;; CHECK: (import "binaryen-intrinsics" "call.without.effects" (func $call.without.effects (type $funcref_=>_i32) (param funcref) (result i32))) (import "binaryen-intrinsics" "call.without.effects" (func $call.without.effects (param funcref) (result i32))) - ;; CHECK: (import "binaryen-intrinsics" "call.without.effects" (func $call.without.effects-fj (param f32 funcref) (result i64))) + ;; CHECK: (import "binaryen-intrinsics" "call.without.effects" (func $call.without.effects-fj (type $f32_funcref_=>_i64) (param f32 funcref) (result i64))) (import "binaryen-intrinsics" "call.without.effects" (func $call.without.effects-fj (param f32) (param funcref) (result i64))) - ;; CHECK: (import "binaryen-intrinsics" "call.without.effects" (func $call.without.effects-ref (param funcref) (result (ref any)))) + ;; CHECK: (import "binaryen-intrinsics" "call.without.effects" (func $call.without.effects-ref (type $funcref_=>_ref|any|) (param funcref) (result (ref any)))) (import "binaryen-intrinsics" "call.without.effects" (func $call.without.effects-ref (param funcref) (result (ref any)))) ;; CHECK: (func $used (type $none_=>_i32) (result i32) diff --git a/test/lit/passes/vacuum_all-features.wast b/test/lit/passes/vacuum_all-features.wast index 1a64521ed..c312cb448 100644 --- a/test/lit/passes/vacuum_all-features.wast +++ b/test/lit/passes/vacuum_all-features.wast @@ -21,7 +21,7 @@ ;; CHECK: (type $none_=>_f64 (func (result f64))) - ;; CHECK: (import "env" "int" (func $int (result i32))) + ;; CHECK: (import "env" "int" (func $int (type $3) (result i32))) ;; CHECK: (global $Int i32 (i32.const 0)) (global $Int i32 (i32.const 0)) diff --git a/test/lit/validation/closed-world-interface-intrinsics.wast b/test/lit/validation/closed-world-interface-intrinsics.wast index 0b3515acc..91133d6dc 100644 --- a/test/lit/validation/closed-world-interface-intrinsics.wast +++ b/test/lit/validation/closed-world-interface-intrinsics.wast @@ -16,7 +16,7 @@ ;; CHECK: (type $ref|$struct|_=>_none (func (param (ref $struct)))) - ;; CHECK: (import "binaryen-intrinsics" "call.without.effects" (func $cwe (param (ref $struct) funcref))) + ;; CHECK: (import "binaryen-intrinsics" "call.without.effects" (func $cwe (type $ref|$struct|_funcref_=>_none) (param (ref $struct) funcref))) (import "binaryen-intrinsics" "call.without.effects" (func $cwe (param (ref $struct)) (param funcref))) ;; CHECK: (elem declare func $func) diff --git a/test/lit/wat-kitchen-sink.wast b/test/lit/wat-kitchen-sink.wast index e40a31f98..1183b3fcc 100644 --- a/test/lit/wat-kitchen-sink.wast +++ b/test/lit/wat-kitchen-sink.wast @@ -168,7 +168,7 @@ ;; CHECK: (import "mod" "" (global $gimport$1 (ref null $many))) - ;; CHECK: (import "mod" "f5" (func $fimport$1)) + ;; CHECK: (import "mod" "f5" (func $fimport$1 (type $void))) ;; CHECK: (global $2 (mut i32) (i32.const 0)) |