diff options
| author | Heejin Ahn <aheejin@gmail.com> | 2019-05-24 16:39:52 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-24 16:39:52 -0700 |
| commit | 899263882c48dba8e34717af1e28005f8888dca7 (patch) | |
| tree | 1cea8fa707526b4408a247db5cade5b50e6fa667 /test | |
| parent | dc37d7b74edde1876f2114ad8edd10ab076e778f (diff) | |
| download | binaryen-899263882c48dba8e34717af1e28005f8888dca7.tar.gz binaryen-899263882c48dba8e34717af1e28005f8888dca7.tar.bz2 binaryen-899263882c48dba8e34717af1e28005f8888dca7.zip | |
Refactor type and function parsing (#2143)
- Refactored & fixed typeuse parsing rules so now the rules more closely
follow the spec. There have been multiple parsing rules that were
different in subtle ways, which are supposed to be the same according
to the spec.
- Duplicate types, i.e., types with the same signature, in the type
section are allowed as long as they don't have the same given name.
If a name is given, we use it; if type name is not given, we
generate one in the form of `$FUNCSIG$` + signature string. If the
same generated name already exists in the type section, we append
`_` at the end. This causes most of the changes in the autogenerated
type names in test outputs.
- A typeuse has to be in the order of (type) -> (param) -> (result),
if more than one of them exist. In case of function definitions,
(local) has to be after all of these. Fixed some test cases that
violate this rule.
- When only (param)/(result) are given, its type will be the type with
the smallest existing type index whose parameter and result are the
same. If there's no such type, a new type will be created and
inserted.
- Added a test case `duplicate_types.wast` to test type namings for
duplicate types.
- Refactored `parseFunction` function.
- Add more overrides to helper functions: `getSig` and
`ensureFunctionType`.
Diffstat (limited to 'test')
128 files changed, 1487 insertions, 1450 deletions
diff --git a/test/bulk-memory.wast.from-wast b/test/bulk-memory.wast.from-wast index 0f4ec70fa..960ac65e4 100644 --- a/test/bulk-memory.wast.from-wast +++ b/test/bulk-memory.wast.from-wast @@ -1,25 +1,25 @@ (module - (type $0 (func)) + (type $FUNCSIG$v (func)) (memory $0 1024 1024) (data (i32.const 0) "hello, world") - (func $memory.init (; 0 ;) (type $0) + (func $memory.init (; 0 ;) (type $FUNCSIG$v) (memory.init 0 (i32.const 512) (i32.const 0) (i32.const 12) ) ) - (func $data.drop (; 1 ;) (type $0) + (func $data.drop (; 1 ;) (type $FUNCSIG$v) (data.drop 0) ) - (func $memory.copy (; 2 ;) (type $0) + (func $memory.copy (; 2 ;) (type $FUNCSIG$v) (memory.copy (i32.const 512) (i32.const 0) (i32.const 12) ) ) - (func $memory.fill (; 3 ;) (type $0) + (func $memory.fill (; 3 ;) (type $FUNCSIG$v) (memory.fill (i32.const 0) (i32.const 42) diff --git a/test/complexTextNames.wast.from-wast b/test/complexTextNames.wast.from-wast index 7ea6975f6..d045fd406 100644 --- a/test/complexTextNames.wast.from-wast +++ b/test/complexTextNames.wast.from-wast @@ -1,10 +1,10 @@ (module - (type $0 (func)) + (type $FUNCSIG$v (func)) (export "$zoo (.bar)" (func $1)) - (func $foo\20\28.bar\29 (; 0 ;) (type $0) + (func $foo\20\28.bar\29 (; 0 ;) (type $FUNCSIG$v) (nop) ) - (func $1 (; 1 ;) (type $0) + (func $1 (; 1 ;) (type $FUNCSIG$v) (call $foo\20\28.bar\29) ) ) diff --git a/test/ctor-eval/bad-indirect-call2.wast.out b/test/ctor-eval/bad-indirect-call2.wast.out index 16f2b33a5..61ef71afb 100644 --- a/test/ctor-eval/bad-indirect-call2.wast.out +++ b/test/ctor-eval/bad-indirect-call2.wast.out @@ -1,13 +1,13 @@ (module - (type $FUNCSIG$v (func)) + (type $v (func)) (import "env" "_abort" (func $_abort)) (memory $0 256 256) (data (i32.const 10) "waka waka waka waka waka") (table $0 2 2 funcref) (elem (i32.const 0) $_abort $call-indirect) (export "test1" (func $test1)) - (func $test1 (; 1 ;) (type $FUNCSIG$v) - (call_indirect (type $FUNCSIG$v) + (func $test1 (; 1 ;) (type $v) + (call_indirect (type $v) (i32.const 0) ) (i32.store8 @@ -15,7 +15,7 @@ (i32.const 120) ) ) - (func $call-indirect (; 2 ;) (type $FUNCSIG$v) + (func $call-indirect (; 2 ;) (type $v) (i32.store8 (i32.const 40) (i32.const 67) diff --git a/test/ctor-eval/imported2.wast.out b/test/ctor-eval/imported2.wast.out index 8d9148920..b0788065e 100644 --- a/test/ctor-eval/imported2.wast.out +++ b/test/ctor-eval/imported2.wast.out @@ -1,11 +1,11 @@ (module - (type $0 (func)) + (type $FUNCSIG$v (func)) (memory $0 256 256) (data (i32.const 10) "wasa waka waka waka waka") (global $mine (mut i32) (i32.const 1)) (export "test2" (func $test2)) (export "test3" (func $test3)) - (func $test2 (; 0 ;) (type $0) + (func $test2 (; 0 ;) (type $FUNCSIG$v) (global.set $mine (i32.const 2) ) @@ -14,7 +14,7 @@ (i32.const 115) ) ) - (func $test3 (; 1 ;) (type $0) + (func $test3 (; 1 ;) (type $FUNCSIG$v) (i32.store8 (i32.const 14) (i32.const 115) diff --git a/test/ctor-eval/imported3.wast.out b/test/ctor-eval/imported3.wast.out index 101c1adaa..47ab523c1 100644 --- a/test/ctor-eval/imported3.wast.out +++ b/test/ctor-eval/imported3.wast.out @@ -1,9 +1,9 @@ (module - (type $0 (func)) + (type $FUNCSIG$v (func)) (memory $0 256 256) (data (i32.const 10) "waka waka waka waka waka") (export "test1" (func $test1)) - (func $test1 (; 0 ;) (type $0) + (func $test1 (; 0 ;) (type $FUNCSIG$v) (i32.store8 (i32.const 13) (i32.const 115) diff --git a/test/ctor-eval/indirect-call3.wast.out b/test/ctor-eval/indirect-call3.wast.out index 27351bcce..370e73b42 100644 --- a/test/ctor-eval/indirect-call3.wast.out +++ b/test/ctor-eval/indirect-call3.wast.out @@ -1,10 +1,10 @@ (module - (type $FUNCSIG$v (func)) + (type $v (func)) (import "env" "tableBase" (global $tableBase i32)) (import "env" "_abort" (func $_abort)) (memory $0 256 256) (data (i32.const 10) "waka waka xaka waka waka\00\00\00\00\00\00C") - (func $call-indirect (; 1 ;) (type $FUNCSIG$v) + (func $call-indirect (; 1 ;) (type $v) (i32.store8 (i32.const 40) (i32.const 67) diff --git a/test/ctor-eval/just_some.wast.out b/test/ctor-eval/just_some.wast.out index b7a1aa2be..d61eb9548 100644 --- a/test/ctor-eval/just_some.wast.out +++ b/test/ctor-eval/just_some.wast.out @@ -1,13 +1,13 @@ (module - (type $0 (func)) + (type $FUNCSIG$v (func)) (memory $0 256 256) (data (i32.const 10) "wasa waka waka waka waka") (export "test2" (func $test2)) (export "test3" (func $test3)) - (func $test2 (; 0 ;) (type $0) + (func $test2 (; 0 ;) (type $FUNCSIG$v) (unreachable) ) - (func $test3 (; 1 ;) (type $0) + (func $test3 (; 1 ;) (type $FUNCSIG$v) (i32.store8 (i32.const 13) (i32.const 113) diff --git a/test/ctor-eval/no_partial.wast.out b/test/ctor-eval/no_partial.wast.out index ac943d57c..ad8006a7c 100644 --- a/test/ctor-eval/no_partial.wast.out +++ b/test/ctor-eval/no_partial.wast.out @@ -1,9 +1,9 @@ (module - (type $0 (func)) + (type $FUNCSIG$v (func)) (memory $0 256 256) (data (i32.const 10) "waka waka waka waka waka") (export "test1" (func $test1)) - (func $test1 (; 0 ;) (type $0) + (func $test1 (; 0 ;) (type $FUNCSIG$v) (i32.store8 (i32.const 12) (i32.const 115) diff --git a/test/ctor-eval/unsafe_call.wast.out b/test/ctor-eval/unsafe_call.wast.out index d92a4cd2f..eec593fb9 100644 --- a/test/ctor-eval/unsafe_call.wast.out +++ b/test/ctor-eval/unsafe_call.wast.out @@ -1,9 +1,9 @@ (module - (type $0 (func)) + (type $FUNCSIG$v (func)) (memory $0 256 256) (data (i32.const 10) "waka waka waka waka waka") (export "test1" (func $test1)) - (func $test1 (; 0 ;) (type $0) + (func $test1 (; 0 ;) (type $FUNCSIG$v) (call $unsafe-to-call) (i32.store (i32.const 12) @@ -18,7 +18,7 @@ (i32.const 120) ) ) - (func $unsafe-to-call (; 1 ;) (type $0) + (func $unsafe-to-call (; 1 ;) (type $FUNCSIG$v) (unreachable) ) ) diff --git a/test/duplicate_types.wast b/test/duplicate_types.wast new file mode 100644 index 000000000..2fd5e2f4b --- /dev/null +++ b/test/duplicate_types.wast @@ -0,0 +1,15 @@ +(module ;; tests duplicate types are named properly + (type (func)) + (type (func)) + (type (func)) + (type (func (param i32))) + (type $0 (func (param i32))) + (type (func (param i32))) + (type $b (func (param i32) (result f32))) + (type (func (param i32) (result f32))) + + (func $f0 (param i32)) + (func $f1 (param i32) (result i32) + (i32.const 0) + ) +) diff --git a/test/duplicate_types.wast.from-wast b/test/duplicate_types.wast.from-wast new file mode 100644 index 000000000..a47730b16 --- /dev/null +++ b/test/duplicate_types.wast.from-wast @@ -0,0 +1,17 @@ +(module + (type $FUNCSIG$v (func)) + (type $FUNCSIG$v_ (func)) + (type $FUNCSIG$v__ (func)) + (type $FUNCSIG$vi (func (param i32))) + (type $0 (func (param i32))) + (type $FUNCSIG$vi_ (func (param i32))) + (type $b (func (param i32) (result f32))) + (type $FUNCSIG$fi (func (param i32) (result f32))) + (type $FUNCSIG$ii (func (param i32) (result i32))) + (func $f0 (; 0 ;) (type $FUNCSIG$vi) (param $0 i32) + (nop) + ) + (func $f1 (; 1 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32) + (i32.const 0) + ) +) diff --git a/test/duplicate_types.wast.fromBinary b/test/duplicate_types.wast.fromBinary new file mode 100644 index 000000000..b38198087 --- /dev/null +++ b/test/duplicate_types.wast.fromBinary @@ -0,0 +1,18 @@ +(module + (type $0 (func)) + (type $1 (func)) + (type $2 (func)) + (type $3 (func (param i32))) + (type $4 (func (param i32))) + (type $5 (func (param i32))) + (type $6 (func (param i32) (result f32))) + (type $7 (func (param i32) (result f32))) + (type $8 (func (param i32) (result i32))) + (func $f0 (; 0 ;) (type $3) (param $0 i32) + (nop) + ) + (func $f1 (; 1 ;) (type $8) (param $0 i32) (result i32) + (i32.const 0) + ) +) + diff --git a/test/duplicate_types.wast.fromBinary.noDebugInfo b/test/duplicate_types.wast.fromBinary.noDebugInfo new file mode 100644 index 000000000..c266462a8 --- /dev/null +++ b/test/duplicate_types.wast.fromBinary.noDebugInfo @@ -0,0 +1,18 @@ +(module + (type $0 (func)) + (type $1 (func)) + (type $2 (func)) + (type $3 (func (param i32))) + (type $4 (func (param i32))) + (type $5 (func (param i32))) + (type $6 (func (param i32) (result f32))) + (type $7 (func (param i32) (result f32))) + (type $8 (func (param i32) (result i32))) + (func $0 (; 0 ;) (type $3) (param $0 i32) + (nop) + ) + (func $1 (; 1 ;) (type $8) (param $0 i32) (result i32) + (i32.const 0) + ) +) + diff --git a/test/exception-handling.wast.from-wast b/test/exception-handling.wast.from-wast index 3866a3561..7a09f402f 100644 --- a/test/exception-handling.wast.from-wast +++ b/test/exception-handling.wast.from-wast @@ -1,7 +1,7 @@ (module - (type $0 (func (param except_ref) (result except_ref))) + (type $FUNCSIG$ee (func (param except_ref) (result except_ref))) (memory $0 1 1) - (func $except_ref_test (; 0 ;) (type $0) (param $0 except_ref) (result except_ref) + (func $except_ref_test (; 0 ;) (type $FUNCSIG$ee) (param $0 except_ref) (result except_ref) (local.get $0) ) ) diff --git a/test/export-import.wast.from-wast b/test/export-import.wast.from-wast index 6615cead6..f8ebdfd24 100644 --- a/test/export-import.wast.from-wast +++ b/test/export-import.wast.from-wast @@ -1,6 +1,5 @@ (module (type $v (func)) - (type $FUNCSIG$v (func)) (import "env" "test2" (global $test2 i32)) (import "env" "test1" (func $test1)) (export "test1" (func $test1)) diff --git a/test/export-import.wast.fromBinary b/test/export-import.wast.fromBinary index 492a05273..aaab00c2d 100644 --- a/test/export-import.wast.fromBinary +++ b/test/export-import.wast.fromBinary @@ -1,6 +1,5 @@ (module (type $0 (func)) - (type $1 (func)) (import "env" "test2" (global $gimport$1 i32)) (import "env" "test1" (func $test1)) (export "test1" (func $test1)) diff --git a/test/export-import.wast.fromBinary.noDebugInfo b/test/export-import.wast.fromBinary.noDebugInfo index 3064e637d..94942c901 100644 --- a/test/export-import.wast.fromBinary.noDebugInfo +++ b/test/export-import.wast.fromBinary.noDebugInfo @@ -1,6 +1,5 @@ (module (type $0 (func)) - (type $1 (func)) (import "env" "test2" (global $gimport$1 i32)) (import "env" "test1" (func $fimport$0)) (export "test1" (func $fimport$0)) diff --git a/test/fn_prolog_epilog.debugInfo.wast.from-wast b/test/fn_prolog_epilog.debugInfo.wast.from-wast index ba4fdc8d1..1a1933171 100644 --- a/test/fn_prolog_epilog.debugInfo.wast.from-wast +++ b/test/fn_prolog_epilog.debugInfo.wast.from-wast @@ -1,7 +1,7 @@ (module - (type $0 (func)) + (type $FUNCSIG$v (func)) ;;@ src.cpp:1:1 - (func $0 (; 0 ;) (type $0) + (func $0 (; 0 ;) (type $FUNCSIG$v) (nop) ;;@ src.cpp:2:1 (block $l0 diff --git a/test/lld/duplicate_imports.wast.out b/test/lld/duplicate_imports.wast.out index 3a9798679..d0e31a253 100644 --- a/test/lld/duplicate_imports.wast.out +++ b/test/lld/duplicate_imports.wast.out @@ -2,7 +2,6 @@ (type $0 (func (param i32) (result i32))) (type $1 (func (result i32))) (type $2 (func)) - (type $FUNCSIG$ii (func (param i32) (result i32))) (type $FUNCSIG$ij (func (param i64) (result i32))) (type $FUNCSIG$fifd (func (param i32 f32 f64) (result f32))) (type $FUNCSIG$fidd (func (param i32 f64 f64) (result f32))) diff --git a/test/lld/em_asm_shared.wast.out b/test/lld/em_asm_shared.wast.out index 3a5268380..a76906028 100644 --- a/test/lld/em_asm_shared.wast.out +++ b/test/lld/em_asm_shared.wast.out @@ -6,9 +6,9 @@ (type $4 (func (param i32 i32))) (type $5 (func (param i32) (result i32))) (type $6 (func (param i32 i32) (result i32))) - (type $FUNCSIG$iiii (func (param i32 i32 i32) (result i32))) (type $FUNCSIG$i (func (result i32))) (type $FUNCSIG$vi (func (param i32))) + (type $FUNCSIG$iiii (func (param i32 i32 i32) (result i32))) (import "env" "memory" (memory $0 0)) (data (global.get $gimport$3) "{ Module.print(\"Hello world\"); }\00{ return $0 + $1; }\00{ Module.print(\"Got \" + $0); }\00") (import "env" "table" (table $0 0 funcref)) diff --git a/test/lld/em_js_O0.wast.out b/test/lld/em_js_O0.wast.out index 697a5082f..21651a1db 100644 --- a/test/lld/em_js_O0.wast.out +++ b/test/lld/em_js_O0.wast.out @@ -1,5 +1,5 @@ (module - (type $0 (func (result i32))) + (type $FUNCSIG$i (func (result i32))) (import "env" "memory" (memory $0 256 256)) (data (i32.const 1024) "(void)<::>{ out(\"no args works\"); }\00(void)<::>{ out(\"no args returning int\"); return 12; }\00(void)<::>{ out(\"no args returning double\"); return 12.25; }\00(int x)<::>{ out(\" takes ints: \" + x);}\00(double d)<::>{ out(\" takes doubles: \" + d);}\00(char* str)<::>{ out(\" takes strings: \" + UTF8ToString(str)); return 7.75; }\00(int x, int y)<::>{ out(\" takes multiple ints: \" + x + \", \" + y); return 6; }\00(int x, const char* str, double d)<::>{ out(\" mixed arg types: \" + x + \", \" + UTF8ToString(str) + \", \" + d); return 8.125; }\00(int unused)<::>{ out(\" ignores unused args\"); return 5.5; }\00(int x, int y)<::>{ out(\" skips unused args: \" + y); return 6; }\00(double x, double y, double z)<::>{ out(\" \" + x + \" + \" + z); return x + z; }\00(void)<::>{ out(\" can use <::> separator in user code\"); return 15; }\00(void)<::>{ var x, y; x = {}; y = 3; x[y] = [1, 2, 3]; out(\" can have commas in user code: \" + x[y]); return x[y][1]; }\00(void)<::>{ var jsString = \'\e3\81\93\e3\82\93\e3\81\ab\e3\81\a1\e3\81\af\'; var lengthBytes = lengthBytesUTF8(jsString); var stringOnWasmHeap = _malloc(lengthBytes); stringToUTF8(jsString, stringOnWasmHeap, lengthBytes+1); return stringOnWasmHeap; }\00(void)<::>{ var jsString = \'hello from js\'; var lengthBytes = jsString.length+1; var stringOnWasmHeap = _malloc(lengthBytes); stringToUTF8(jsString, stringOnWasmHeap, lengthBytes+1); return stringOnWasmHeap; }\00BEGIN\n\00 noarg_int returned: %d\n\00 noarg_double returned: %f\n\00 stringarg returned: %f\n\00string arg\00 multi_intarg returned: %d\n\00 multi_mixedarg returned: %f\n\00hello\00 unused_args returned: %d\n\00 skip_args returned: %f\n\00 add_outer returned: %f\n\00 user_separator returned: %d\n\00 user_comma returned: %d\n\00 return_str returned: %s\n\00 return_utf8_str returned: %s\n\00END\n\00\00\cc\1a\00\00\00\00\00\00\00\00\00\00\00\00\00\00T!\"\19\0d\01\02\03\11K\1c\0c\10\04\0b\1d\12\1e\'hnopqb \05\06\0f\13\14\15\1a\08\16\07($\17\18\t\n\0e\1b\1f%#\83\82}&*+<=>?CGJMXYZ[\\]^_`acdefgijklrstyz{|\00\00\00\00\00\00\00\00\00Illegal byte sequence\00Domain error\00Result not representable\00Not a tty\00Permission denied\00Operation not permitted\00No such file or directory\00No such process\00File exists\00Value too large for data type\00No space left on device\00Out of memory\00Resource busy\00Interrupted system call\00Resource temporarily unavailable\00Invalid seek\00Cross-device link\00Read-only file system\00Directory not empty\00Connection reset by peer\00Operation timed out\00Connection refused\00Host is down\00Host is unreachable\00Address in use\00Broken pipe\00I/O error\00No such device or address\00Block device required\00No such device\00Not a directory\00Is a directory\00Text file busy\00Exec format error\00Invalid argument\00Argument list too long\00Symbolic link loop\00Filename too long\00Too many open files in system\00No file descriptors available\00Bad file descriptor\00No child process\00Bad address\00File too large\00Too many links\00No locks available\00Resource deadlock would occur\00State not recoverable\00Previous owner died\00Operation canceled\00Function not implemented\00No message of desired type\00Identifier removed\00Device not a stream\00No data available\00Device timeout\00Out of streams resources\00Link has been severed\00Protocol error\00Bad message\00File descriptor in bad state\00Not a socket\00Destination address required\00Message too large\00Protocol wrong type for socket\00Protocol not available\00Protocol not supported\00Socket type not supported\00Not supported\00Protocol family not supported\00Address family not supported by protocol\00Address not available\00Network is down\00Network unreachable\00Connection reset by network\00Connection aborted\00No buffer space available\00Socket is connected\00Socket not connected\00Cannot send after socket shutdown\00Operation already in progress\00Operation in progress\00Stale file handle\00Remote I/O error\00Quota exceeded\00No medium found\00Wrong medium type\00No error information\00\00-+ 0X0x\00(null)\00\00\00\00\11\00\n\00\11\11\11\00\00\00\00\05\00\00\00\00\00\00\t\00\00\00\00\0b\00\00\00\00\00\00\00\00\11\00\0f\n\11\11\11\03\n\07\00\01\13\t\0b\0b\00\00\t\06\0b\00\00\0b\00\06\11\00\00\00\11\11\11\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\0b\00\00\00\00\00\00\00\00\11\00\n\n\11\11\11\00\n\00\00\02\00\t\0b\00\00\00\t\00\0b\00\00\0b\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\0c\00\00\00\00\00\00\00\00\00\00\00\0c\00\00\00\00\0c\00\00\00\00\t\0c\00\00\00\00\00\0c\00\00\0c\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\0e\00\00\00\00\00\00\00\00\00\00\00\0d\00\00\00\04\0d\00\00\00\00\t\0e\00\00\00\00\00\0e\00\00\0e\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\10\00\00\00\00\00\00\00\00\00\00\00\0f\00\00\00\00\0f\00\00\00\00\t\10\00\00\00\00\00\10\00\00\10\00\00\12\00\00\00\12\12\12\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\12\00\00\00\12\12\12\00\00\00\00\00\00\t\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\0b\00\00\00\00\00\00\00\00\00\00\00\n\00\00\00\00\n\00\00\00\00\t\0b\00\00\00\00\00\0b\00\00\0b\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\0c\00\00\00\00\00\00\00\00\00\00\00\0c\00\00\00\00\0c\00\00\00\00\t\0c\00\00\00\00\00\0c\00\00\0c\00\000123456789ABCDEF-0X+0X 0X-0x+0x 0x\00inf\00INF\00nan\00NAN\00.\00") (data (i32.const 5232) "\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00") diff --git a/test/lld/hello_world.wast.mem.out b/test/lld/hello_world.wast.mem.out index b3c6ad55c..5201dd6d9 100644 --- a/test/lld/hello_world.wast.mem.out +++ b/test/lld/hello_world.wast.mem.out @@ -3,7 +3,6 @@ (type $1 (func)) (type $2 (func (result i32))) (type $3 (func (param i32 i32) (result i32))) - (type $FUNCSIG$ii (func (param i32) (result i32))) (import "env" "puts" (func $puts (param i32) (result i32))) (memory $0 2) (table $0 1 1 funcref) diff --git a/test/lld/hello_world.wast.out b/test/lld/hello_world.wast.out index b20f4e6ca..2f0a97d78 100644 --- a/test/lld/hello_world.wast.out +++ b/test/lld/hello_world.wast.out @@ -3,7 +3,6 @@ (type $1 (func)) (type $2 (func (result i32))) (type $3 (func (param i32 i32) (result i32))) - (type $FUNCSIG$ii (func (param i32) (result i32))) (import "env" "puts" (func $puts (param i32) (result i32))) (memory $0 2) (data (i32.const 568) "Hello, world\00") diff --git a/test/lld/recursive.wast.out b/test/lld/recursive.wast.out index 18b9c7db0..1d0ea9f8b 100644 --- a/test/lld/recursive.wast.out +++ b/test/lld/recursive.wast.out @@ -2,7 +2,6 @@ (type $0 (func (param i32 i32) (result i32))) (type $1 (func)) (type $2 (func (result i32))) - (type $FUNCSIG$iii (func (param i32 i32) (result i32))) (import "env" "printf" (func $printf (param i32 i32) (result i32))) (memory $0 2) (data (i32.const 568) "%d:%d\n\00Result: %d\n\00") diff --git a/test/lld/reserved_func_ptr.wast.out b/test/lld/reserved_func_ptr.wast.out index 0244ee522..3f8468c38 100644 --- a/test/lld/reserved_func_ptr.wast.out +++ b/test/lld/reserved_func_ptr.wast.out @@ -6,7 +6,6 @@ (type $4 (func (param f64 i32) (result f64))) (type $5 (func (param i32 i32 i32))) (type $6 (func (param i32) (result i32))) - (type $FUNCSIG$ii (func (param i32) (result i32))) (type $FUNCSIG$viii (func (param i32 i32 i32))) (import "env" "_Z4atoiPKc" (func $atoi\28char\20const*\29 (param i32) (result i32))) (memory $0 2) diff --git a/test/lld/shared.wast.out b/test/lld/shared.wast.out index 135aa3e5b..1e2ab04eb 100644 --- a/test/lld/shared.wast.out +++ b/test/lld/shared.wast.out @@ -2,8 +2,8 @@ (type $0 (func (param i32) (result i32))) (type $1 (func)) (type $2 (func (result i32))) - (type $FUNCSIG$ii (func (param i32) (result i32))) (type $FUNCSIG$i (func (result i32))) + (type $FUNCSIG$ii (func (param i32) (result i32))) (import "env" "memory" (memory $0 0)) (data (global.get $gimport$2) "Hello, world\00\00\00\00\00\00\00\00\01\00\00\00") (import "env" "table" (table $0 2 funcref)) diff --git a/test/metadce/rooted-export.wast.dced b/test/metadce/rooted-export.wast.dced index a66014133..636be324b 100644 --- a/test/metadce/rooted-export.wast.dced +++ b/test/metadce/rooted-export.wast.dced @@ -1,7 +1,7 @@ (module - (type $0 (func)) + (type $FUNCSIG$v (func)) (export "wasm_func_b" (func $b_wasm_func)) - (func $b_wasm_func (; 0 ;) (type $0) + (func $b_wasm_func (; 0 ;) (type $FUNCSIG$v) (unreachable) ) ) diff --git a/test/newsyntax.wast.from-wast b/test/newsyntax.wast.from-wast index 923846519..09758b90d 100644 --- a/test/newsyntax.wast.from-wast +++ b/test/newsyntax.wast.from-wast @@ -1,10 +1,9 @@ (module - (type $0 (func)) - (type $FUNCSIG$iid (func (param i32 f64) (result i32))) (type $FUNCSIG$v (func)) + (type $FUNCSIG$iid (func (param i32 f64) (result i32))) (import "env" "table" (table $0 9 9 funcref)) (export "call_indirect" (func $0)) - (func $0 (; 0 ;) (type $0) + (func $0 (; 0 ;) (type $FUNCSIG$v) (drop (call_indirect (type $FUNCSIG$iid) (i32.const 10) diff --git a/test/newsyntax.wast.fromBinary b/test/newsyntax.wast.fromBinary index b8636ace4..3def8819d 100644 --- a/test/newsyntax.wast.fromBinary +++ b/test/newsyntax.wast.fromBinary @@ -1,7 +1,6 @@ (module (type $0 (func)) (type $1 (func (param i32 f64) (result i32))) - (type $2 (func)) (import "env" "table" (table $timport$0 9 9 funcref)) (export "call_indirect" (func $0)) (func $0 (; 0 ;) (type $0) @@ -12,7 +11,7 @@ (i32.const 30) ) ) - (call_indirect (type $2) + (call_indirect (type $0) (i32.const 1) ) ) diff --git a/test/newsyntax.wast.fromBinary.noDebugInfo b/test/newsyntax.wast.fromBinary.noDebugInfo index b8636ace4..3def8819d 100644 --- a/test/newsyntax.wast.fromBinary.noDebugInfo +++ b/test/newsyntax.wast.fromBinary.noDebugInfo @@ -1,7 +1,6 @@ (module (type $0 (func)) (type $1 (func (param i32 f64) (result i32))) - (type $2 (func)) (import "env" "table" (table $timport$0 9 9 funcref)) (export "call_indirect" (func $0)) (func $0 (; 0 ;) (type $0) @@ -12,7 +11,7 @@ (i32.const 30) ) ) - (call_indirect (type $2) + (call_indirect (type $0) (i32.const 1) ) ) diff --git a/test/passes/1.txt b/test/passes/1.txt index 08aa9f611..3e12ecba6 100644 --- a/test/passes/1.txt +++ b/test/passes/1.txt @@ -1,22 +1,22 @@ (module - (type $0 (func)) - (type $1 (func (result i32))) - (type $2 (func (param i32) (result i32))) - (type $3 (func (param i32))) - (func $trivial (; 0 ;) (type $0) + (type $FUNCSIG$v (func)) + (type $FUNCSIG$i (func (result i32))) + (type $FUNCSIG$ii (func (param i32) (result i32))) + (type $FUNCSIG$vi (func (param i32))) + (func $trivial (; 0 ;) (type $FUNCSIG$v) (nop) ) - (func $trivial2 (; 1 ;) (type $0) + (func $trivial2 (; 1 ;) (type $FUNCSIG$v) (call $trivial) (call $trivial) ) - (func $return-void (; 2 ;) (type $0) + (func $return-void (; 2 ;) (type $FUNCSIG$v) (nop) ) - (func $return-val (; 3 ;) (type $1) (result i32) + (func $return-val (; 3 ;) (type $FUNCSIG$i) (result i32) (i32.const 1) ) - (func $ifs (; 4 ;) (type $2) (param $0 i32) (result i32) + (func $ifs (; 4 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32) (if (result i32) (local.get $0) (select @@ -31,7 +31,7 @@ ) ) ) - (func $loops (; 5 ;) (type $3) (param $0 i32) + (func $loops (; 5 ;) (type $FUNCSIG$vi) (param $0 i32) (if (local.get $0) (loop $shape$2$continue @@ -52,12 +52,12 @@ ) ) ) - (func $br-out (; 6 ;) (type $3) (param $0 i32) + (func $br-out (; 6 ;) (type $FUNCSIG$vi) (param $0 i32) (call $br-out (i32.const 5) ) ) - (func $unreachable (; 7 ;) (type $3) (param $0 i32) + (func $unreachable (; 7 ;) (type $FUNCSIG$vi) (param $0 i32) (if (i32.eqz (local.get $0) @@ -82,10 +82,10 @@ ) ) ) - (func $empty-blocks (; 8 ;) (type $3) (param $0 i32) + (func $empty-blocks (; 8 ;) (type $FUNCSIG$vi) (param $0 i32) (nop) ) - (func $before-and-after (; 9 ;) (type $3) (param $0 i32) + (func $before-and-after (; 9 ;) (type $FUNCSIG$vi) (param $0 i32) (call $before-and-after (i32.const 1) ) @@ -181,7 +181,7 @@ (i32.const 25) ) ) - (func $switch (; 10 ;) (type $3) (param $0 i32) + (func $switch (; 10 ;) (type $FUNCSIG$vi) (param $0 i32) (call $switch (i32.const 1) ) @@ -199,10 +199,10 @@ (i32.const 3) ) ) - (func $no-return (; 11 ;) (type $0) + (func $no-return (; 11 ;) (type $FUNCSIG$v) (nop) ) - (func $if-br-wat (; 12 ;) (type $3) (param $0 i32) + (func $if-br-wat (; 12 ;) (type $FUNCSIG$vi) (param $0 i32) (call $if-br-wat (i32.const 0) ) diff --git a/test/passes/O.txt b/test/passes/O.txt index 1ab7b31fd..0d3284a9f 100644 --- a/test/passes/O.txt +++ b/test/passes/O.txt @@ -1,13 +1,13 @@ (module - (type $0 (func (result i32))) - (type $1 (func (param i64))) - (type $2 (func (param i32) (result i32))) + (type $FUNCSIG$i (func (result i32))) + (type $FUNCSIG$vj (func (param i64))) + (type $FUNCSIG$ii (func (param i32) (result i32))) (export "ret" (func $ret)) (export "waka" (func $if-0-unreachable-to-none)) (export "many-selects" (func $many-selects)) (export "end-if-else" (func $end-if-else)) (export "end-if-else-call" (func $end-if-else-call)) - (func $ret (; 0 ;) (; has Stack IR ;) (type $0) (result i32) + (func $ret (; 0 ;) (; has Stack IR ;) (type $FUNCSIG$i) (result i32) (drop (call $ret) ) @@ -19,10 +19,10 @@ ) (i32.const 999) ) - (func $if-0-unreachable-to-none (; 1 ;) (; has Stack IR ;) (type $1) (param $0 i64) + (func $if-0-unreachable-to-none (; 1 ;) (; has Stack IR ;) (type $FUNCSIG$vj) (param $0 i64) (unreachable) ) - (func $many-selects (; 2 ;) (; has Stack IR ;) (type $2) (param $0 i32) (result i32) + (func $many-selects (; 2 ;) (; has Stack IR ;) (type $FUNCSIG$ii) (param $0 i32) (result i32) (select (i32.const -1073741824) (select @@ -39,14 +39,14 @@ ) ) ) - (func $end-if-else (; 3 ;) (; has Stack IR ;) (type $2) (param $0 i32) (result i32) + (func $end-if-else (; 3 ;) (; has Stack IR ;) (type $FUNCSIG$ii) (param $0 i32) (result i32) (select (i32.const 1) (local.get $0) (local.get $0) ) ) - (func $end-if-else-call (; 4 ;) (; has Stack IR ;) (type $2) (param $0 i32) (result i32) + (func $end-if-else-call (; 4 ;) (; has Stack IR ;) (type $FUNCSIG$ii) (param $0 i32) (result i32) (if (result i32) (local.get $0) (call $ret) diff --git a/test/passes/O1.txt b/test/passes/O1.txt index 09dd3d056..2d1e75d6e 100644 --- a/test/passes/O1.txt +++ b/test/passes/O1.txt @@ -1,9 +1,9 @@ (module - (type $0 (func (result i32))) + (type $FUNCSIG$i (func (result i32))) (memory $0 1 1) (global $global$0 (mut i32) (i32.const 10)) (export "foo" (func $0)) - (func $0 (; 0 ;) (type $0) (result i32) + (func $0 (; 0 ;) (type $FUNCSIG$i) (result i32) (global.set $global$0 (i32.const 0) ) diff --git a/test/passes/O1_print-stack-ir.txt b/test/passes/O1_print-stack-ir.txt index 7a6354ff1..088ee663b 100644 --- a/test/passes/O1_print-stack-ir.txt +++ b/test/passes/O1_print-stack-ir.txt @@ -1,7 +1,7 @@ (module - (type $0 (func (param i32) (result i32))) + (type $FUNCSIG$ii (func (param i32) (result i32))) (export "stacky-help" (func $stacky-help)) - (func $stacky-help (; 0 ;) (type $0) (param $0 i32) (result i32) + (func $stacky-help (; 0 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32) (i32.add (call $stacky-help (i32.const 0) @@ -25,9 +25,9 @@ ) ) (module - (type $0 (func (param i32) (result i32))) + (type $FUNCSIG$ii (func (param i32) (result i32))) (export "stacky-help" (func $stacky-help)) - (func $stacky-help (; 0 ;) (type $0) (param $0 i32) (result i32) + (func $stacky-help (; 0 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32) (i32.add (call $stacky-help (i32.const 0) diff --git a/test/passes/O2_precompute-propagate_print-stack-ir.txt b/test/passes/O2_precompute-propagate_print-stack-ir.txt index 95fb2c52b..e89a8890c 100644 --- a/test/passes/O2_precompute-propagate_print-stack-ir.txt +++ b/test/passes/O2_precompute-propagate_print-stack-ir.txt @@ -1,7 +1,7 @@ (module - (type $0 (func (param i32 i32 i32 i64) (result i64))) + (type $FUNCSIG$jiiij (func (param i32 i32 i32 i64) (result i64))) (export "func" (func $0)) - (func $0 (; 0 ;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i64) (result i64) + (func $0 (; 0 ;) (type $FUNCSIG$jiiij) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i64) (result i64) (local $4 i32) (local.set $3 (i64.const 2147483647) @@ -11,9 +11,9 @@ ) ) (module - (type $0 (func (param i32 i32 i32 i64) (result i64))) + (type $FUNCSIG$jiiij (func (param i32 i32 i32 i64) (result i64))) (export "func" (func $0)) - (func $0 (; 0 ;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i64) (result i64) + (func $0 (; 0 ;) (type $FUNCSIG$jiiij) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i64) (result i64) (local $4 i32) (local.set $3 (i64.const 2147483647) diff --git a/test/passes/O2_print-stack-ir.txt b/test/passes/O2_print-stack-ir.txt index 7a63d5cb1..04f4f144d 100644 --- a/test/passes/O2_print-stack-ir.txt +++ b/test/passes/O2_print-stack-ir.txt @@ -1,7 +1,7 @@ (module - (type $0 (func (param i32) (result i32))) + (type $FUNCSIG$ii (func (param i32) (result i32))) (export "stacky-help" (func $stacky-help)) - (func $stacky-help (; 0 ;) (type $0) (param $0 i32) (result i32) + (func $stacky-help (; 0 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32) i32.const 0 call $stacky-help i32.const 1 @@ -16,9 +16,9 @@ ) ) (module - (type $0 (func (param i32) (result i32))) + (type $FUNCSIG$ii (func (param i32) (result i32))) (export "stacky-help" (func $stacky-help)) - (func $stacky-help (; 0 ;) (; has Stack IR ;) (type $0) (param $0 i32) (result i32) + (func $stacky-help (; 0 ;) (; has Stack IR ;) (type $FUNCSIG$ii) (param $0 i32) (result i32) (i32.add (call $stacky-help (i32.const 0) diff --git a/test/passes/O3_inlining.txt b/test/passes/O3_inlining.txt index e4b5cdb39..0fdcd5331 100644 --- a/test/passes/O3_inlining.txt +++ b/test/passes/O3_inlining.txt @@ -1,9 +1,9 @@ (module - (type $1 (func (param i32))) + (type $FUNCSIG$vi (func (param i32))) (memory $0 1 1) (global $global$1 (mut i32) (i32.const 100)) (export "func_217" (func $1)) - (func $1 (; 0 ;) (type $1) (param $0 i32) + (func $1 (; 0 ;) (type $FUNCSIG$vi) (param $0 i32) (if (global.get $global$1) (unreachable) diff --git a/test/passes/O3_low-memory-unused_metrics.txt b/test/passes/O3_low-memory-unused_metrics.txt index f4b009765..91ddf6d87 100644 --- a/test/passes/O3_low-memory-unused_metrics.txt +++ b/test/passes/O3_low-memory-unused_metrics.txt @@ -24,10 +24,10 @@ total store : 160 unary : 28 (module - (type $FUNCSIG$viiii (func (param i32 i32 i32 i32))) - (type $FUNCSIG$iii (func (param i32 i32) (result i32))) - (type $FUNCSIG$iiii (func (param i32 i32 i32) (result i32))) - (type $FUNCSIG$vi (func (param i32))) + (type $0 (func (param i32 i32 i32) (result i32))) + (type $2 (func (param i32 i32) (result i32))) + (type $3 (func (param i32 i32 i32 i32))) + (type $10 (func (param i32))) (import "env" "memory" (memory $0 4096 4096)) (import "env" "table" (table $0 10 funcref)) (import "env" "crc32" (func $fimport$14 (param i32 i32 i32) (result i32))) @@ -39,7 +39,7 @@ total (import "env" "memset" (func $fimport$97 (param i32 i32 i32) (result i32))) (import "env" "memcpy" (func $fimport$98 (param i32 i32 i32) (result i32))) (export "deflate" (func $0)) - (func $0 (; 8 ;) (; has Stack IR ;) (type $FUNCSIG$iii) (param $0 i32) (param $1 i32) (result i32) + (func $0 (; 8 ;) (; has Stack IR ;) (type $2) (param $0 i32) (param $1 i32) (result i32) (local $2 i32) (local $3 i32) (local $4 i32) @@ -2444,7 +2444,7 @@ total ) ) ) - (call_indirect (type $FUNCSIG$iii) + (call_indirect (type $2) (local.get $2) (local.get $1) (i32.load diff --git a/test/passes/O3_print-stack-ir.txt b/test/passes/O3_print-stack-ir.txt index 0ec5a0c74..73bfa261d 100644 --- a/test/passes/O3_print-stack-ir.txt +++ b/test/passes/O3_print-stack-ir.txt @@ -1,7 +1,7 @@ (module - (type $0 (func (param i32) (result i32))) + (type $FUNCSIG$ii (func (param i32) (result i32))) (export "stacky-help" (func $stacky-help)) - (func $stacky-help (; 0 ;) (type $0) (param $0 i32) (result i32) + (func $stacky-help (; 0 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32) i32.const 0 call $stacky-help i32.const 1 @@ -14,9 +14,9 @@ ) ) (module - (type $0 (func (param i32) (result i32))) + (type $FUNCSIG$ii (func (param i32) (result i32))) (export "stacky-help" (func $stacky-help)) - (func $stacky-help (; 0 ;) (; has Stack IR ;) (type $0) (param $0 i32) (result i32) + (func $stacky-help (; 0 ;) (; has Stack IR ;) (type $FUNCSIG$ii) (param $0 i32) (result i32) (i32.add (call $stacky-help (i32.const 0) diff --git a/test/passes/Os_print-stack-ir.txt b/test/passes/Os_print-stack-ir.txt index 0ec5a0c74..73bfa261d 100644 --- a/test/passes/Os_print-stack-ir.txt +++ b/test/passes/Os_print-stack-ir.txt @@ -1,7 +1,7 @@ (module - (type $0 (func (param i32) (result i32))) + (type $FUNCSIG$ii (func (param i32) (result i32))) (export "stacky-help" (func $stacky-help)) - (func $stacky-help (; 0 ;) (type $0) (param $0 i32) (result i32) + (func $stacky-help (; 0 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32) i32.const 0 call $stacky-help i32.const 1 @@ -14,9 +14,9 @@ ) ) (module - (type $0 (func (param i32) (result i32))) + (type $FUNCSIG$ii (func (param i32) (result i32))) (export "stacky-help" (func $stacky-help)) - (func $stacky-help (; 0 ;) (; has Stack IR ;) (type $0) (param $0 i32) (result i32) + (func $stacky-help (; 0 ;) (; has Stack IR ;) (type $FUNCSIG$ii) (param $0 i32) (result i32) (i32.add (call $stacky-help (i32.const 0) diff --git a/test/passes/Oz.txt b/test/passes/Oz.txt index 47be5654f..49e570295 100644 --- a/test/passes/Oz.txt +++ b/test/passes/Oz.txt @@ -1,10 +1,10 @@ (module - (type $0 (func (param i32 i32) (result i32))) - (type $1 (func (param i32 i32 i32 i32) (result i32))) + (type $FUNCSIG$iii (func (param i32 i32) (result i32))) + (type $FUNCSIG$iiiii (func (param i32 i32 i32 i32) (result i32))) (memory $0 100 100) (export "localcse" (func $basics)) (export "localcse-2" (func $8)) - (func $basics (; 0 ;) (; has Stack IR ;) (type $0) (param $0 i32) (param $1 i32) (result i32) + (func $basics (; 0 ;) (; has Stack IR ;) (type $FUNCSIG$iii) (param $0 i32) (param $1 i32) (result i32) (i32.add (i32.add (local.get $0) @@ -16,7 +16,7 @@ ) ) ) - (func $8 (; 1 ;) (; has Stack IR ;) (type $1) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32) + (func $8 (; 1 ;) (; has Stack IR ;) (type $FUNCSIG$iiiii) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32) (i32.store (local.tee $0 (i32.add diff --git a/test/passes/alignment-lowering.txt b/test/passes/alignment-lowering.txt index fefb128f7..dd8d8ca9c 100644 --- a/test/passes/alignment-lowering.txt +++ b/test/passes/alignment-lowering.txt @@ -1,7 +1,7 @@ (module - (type $0 (func)) + (type $FUNCSIG$v (func)) (memory $0 1 1) - (func $func_4 (; 0 ;) (type $0) + (func $func_4 (; 0 ;) (type $FUNCSIG$v) (local $0 i32) (local $1 i32) (local $2 i32) @@ -278,7 +278,7 @@ ) ) ) - (func $func_2 (; 1 ;) (type $0) + (func $func_2 (; 1 ;) (type $FUNCSIG$v) (local $0 i32) (local $1 i32) (local $2 i32) @@ -415,7 +415,7 @@ ) ) ) - (func $func_1 (; 2 ;) (type $0) + (func $func_1 (; 2 ;) (type $FUNCSIG$v) (drop (i32.load8_u (i32.const 4) @@ -466,7 +466,7 @@ (unreachable) ) ) - (func $func_signed (; 3 ;) (type $0) + (func $func_signed (; 3 ;) (type $FUNCSIG$v) (local $0 i32) (local $1 i32) (drop diff --git a/test/passes/avoid-reinterprets.txt b/test/passes/avoid-reinterprets.txt index 294e1506f..33bd7e10e 100644 --- a/test/passes/avoid-reinterprets.txt +++ b/test/passes/avoid-reinterprets.txt @@ -1,8 +1,8 @@ (module - (type $0 (func)) - (type $1 (func (result f32))) + (type $FUNCSIG$v (func)) + (type $FUNCSIG$f (func (result f32))) (memory $0 1) - (func $simple (; 0 ;) (type $0) + (func $simple (; 0 ;) (type $FUNCSIG$v) (drop (f32.load (i32.const 1024) @@ -24,7 +24,7 @@ ) ) ) - (func $one (; 1 ;) (type $0) + (func $one (; 1 ;) (type $FUNCSIG$v) (local $x i32) (local $1 i32) (local $2 f32) @@ -47,7 +47,7 @@ (local.get $2) ) ) - (func $one-b (; 2 ;) (type $0) + (func $one-b (; 2 ;) (type $FUNCSIG$v) (local $x f32) (local $1 i32) (local $2 i32) @@ -70,7 +70,7 @@ (local.get $2) ) ) - (func $both (; 3 ;) (type $0) + (func $both (; 3 ;) (type $FUNCSIG$v) (local $x i32) (local $1 i32) (local $2 f32) @@ -96,7 +96,7 @@ (local.get $2) ) ) - (func $half (; 4 ;) (type $0) + (func $half (; 4 ;) (type $FUNCSIG$v) (local $x i32) (local $1 i32) (local $2 f32) @@ -122,7 +122,7 @@ (local.get $2) ) ) - (func $copy (; 5 ;) (type $0) + (func $copy (; 5 ;) (type $FUNCSIG$v) (local $x i32) (local $y i32) (local $2 i32) @@ -149,14 +149,14 @@ (local.get $3) ) ) - (func $partial1 (; 6 ;) (type $1) (result f32) + (func $partial1 (; 6 ;) (type $FUNCSIG$f) (result f32) (f32.reinterpret_i32 (i32.load16_u (i32.const 3) ) ) ) - (func $partial2 (; 7 ;) (type $1) (result f32) + (func $partial2 (; 7 ;) (type $FUNCSIG$f) (result f32) (f32.reinterpret_i32 (i32.load8_u (i32.const 3) diff --git a/test/passes/coalesce-locals.txt b/test/passes/coalesce-locals.txt index dddbf416c..cb0d58fa8 100644 --- a/test/passes/coalesce-locals.txt +++ b/test/passes/coalesce-locals.txt @@ -5,11 +5,10 @@ (type $3 (func (param i32 f32))) (type $4 (func (param i32))) (type $FUNCSIG$i (func (result i32))) - (type $FUNCSIG$vi (func (param i32))) - (type $7 (func (param i32) (result i32))) - (type $8 (func (param f64 i32) (result i64))) - (type $9 (func (param i32 i32))) - (type $10 (func (result f64))) + (type $FUNCSIG$ii (func (param i32) (result i32))) + (type $FUNCSIG$jdi (func (param f64 i32) (result i64))) + (type $FUNCSIG$vii (func (param i32 i32))) + (type $FUNCSIG$d (func (result f64))) (import "env" "_emscripten_autodebug_i32" (func $_emscripten_autodebug_i32 (param i32 i32) (result i32))) (import "env" "get" (func $get (result i32))) (import "env" "set" (func $set (param i32))) @@ -1108,7 +1107,7 @@ (br $top) ) ) - (func $tee_br (; 48 ;) (type $7) (param $0 i32) (result i32) + (func $tee_br (; 48 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32) (block $b (return (br $b) @@ -1126,7 +1125,7 @@ ) ) ) - (func $tee_if_with_unreachable_else (; 50 ;) (type $8) (param $0 f64) (param $1 i32) (result i64) + (func $tee_if_with_unreachable_else (; 50 ;) (type $FUNCSIG$jdi) (param $0 f64) (param $1 i32) (result i64) (call $tee_if_with_unreachable_else (local.tee $0 (if (result f64) @@ -1141,7 +1140,7 @@ ) ) ) - (func $tee_if_with_unreachable_true (; 51 ;) (type $8) (param $0 f64) (param $1 i32) (result i64) + (func $tee_if_with_unreachable_true (; 51 ;) (type $FUNCSIG$jdi) (param $0 f64) (param $1 i32) (result i64) (call $tee_if_with_unreachable_else (local.tee $0 (if (result f64) @@ -1220,7 +1219,7 @@ ) (nop) ) - (func $loop-copies (; 55 ;) (type $9) (param $0 i32) (param $1 i32) + (func $loop-copies (; 55 ;) (type $FUNCSIG$vii) (param $0 i32) (param $1 i32) (loop $loop (local.set $0 (local.get $1) @@ -1233,7 +1232,7 @@ ) ) ) - (func $proper-type (; 56 ;) (type $10) (result f64) + (func $proper-type (; 56 ;) (type $FUNCSIG$d) (result f64) (local $0 f64) (local $1 i32) (drop diff --git a/test/passes/code-folding_enable-threads.txt b/test/passes/code-folding_enable-threads.txt index 0fe3aa144..e006bbd8b 100644 --- a/test/passes/code-folding_enable-threads.txt +++ b/test/passes/code-folding_enable-threads.txt @@ -1,10 +1,10 @@ (module (type $13 (func (param f32))) - (type $1 (func)) - (type $2 (func (result f32))) + (type $FUNCSIG$v (func)) + (type $FUNCSIG$f (func (result f32))) (memory $0 1 1) (table $0 282 282 funcref) - (func $0 (; 0 ;) (type $1) + (func $0 (; 0 ;) (type $FUNCSIG$v) (block $label$1 (if (i32.const 1) @@ -22,7 +22,7 @@ ) ) ) - (func $negative-zero (; 1 ;) (type $2) (result f32) + (func $negative-zero (; 1 ;) (type $FUNCSIG$f) (result f32) (if (result f32) (i32.const 0) (block $label$0 (result f32) @@ -33,7 +33,7 @@ ) ) ) - (func $negative-zero-b (; 2 ;) (type $2) (result f32) + (func $negative-zero-b (; 2 ;) (type $FUNCSIG$f) (result f32) (drop (i32.const 0) ) @@ -41,7 +41,7 @@ (f32.const -0) ) ) - (func $negative-zero-c (; 3 ;) (type $2) (result f32) + (func $negative-zero-c (; 3 ;) (type $FUNCSIG$f) (result f32) (drop (i32.const 0) ) @@ -49,7 +49,7 @@ (f32.const 0) ) ) - (func $break-target-outside-of-return-merged-code (; 4 ;) (type $1) + (func $break-target-outside-of-return-merged-code (; 4 ;) (type $FUNCSIG$v) (block $label$A (if (unreachable) @@ -80,7 +80,7 @@ ) ) ) - (func $break-target-inside-all-good (; 5 ;) (type $1) + (func $break-target-inside-all-good (; 5 ;) (type $FUNCSIG$v) (block $folding-inner0 (block $label$A (if @@ -106,7 +106,7 @@ ) (return) ) - (func $leave-inner-block-type (; 6 ;) (type $1) + (func $leave-inner-block-type (; 6 ;) (type $FUNCSIG$v) (block $label$1 (drop (block $label$2 @@ -124,10 +124,10 @@ ) ) (module - (type $0 (func (result i32))) + (type $FUNCSIG$i (func (result i32))) (memory $0 (shared 1 1)) (export "func_2224" (func $0)) - (func $0 (; 0 ;) (type $0) (result i32) + (func $0 (; 0 ;) (type $FUNCSIG$i) (result i32) (local $var$0 i32) (if (result i32) (i32.const 0) @@ -142,7 +142,7 @@ ) (module (type $0 (func)) - (type $1 (func (param i32))) + (type $FUNCSIG$vi (func (param i32))) (global $global$0 (mut i32) (i32.const 10)) (func $determinism (; 0 ;) (type $0) (block $folding-inner0 @@ -182,7 +182,7 @@ ) (unreachable) ) - (func $careful-of-the-switch (; 1 ;) (type $1) (param $0 i32) + (func $careful-of-the-switch (; 1 ;) (type $FUNCSIG$vi) (param $0 i32) (block $label$1 (block $label$3 (block $label$5 diff --git a/test/passes/code-pushing_ignore-implicit-traps.txt b/test/passes/code-pushing_ignore-implicit-traps.txt index f21915829..966a4c0ed 100644 --- a/test/passes/code-pushing_ignore-implicit-traps.txt +++ b/test/passes/code-pushing_ignore-implicit-traps.txt @@ -1,8 +1,8 @@ (module - (type $0 (func)) - (type $1 (func (result i32))) + (type $FUNCSIG$v (func)) + (type $FUNCSIG$i (func (result i32))) (memory $0 1) - (func $push1 (; 0 ;) (type $0) + (func $push1 (; 0 ;) (type $FUNCSIG$v) (local $x i32) (block $out (br_if $out @@ -16,7 +16,7 @@ ) ) ) - (func $push2 (; 1 ;) (type $0) + (func $push2 (; 1 ;) (type $FUNCSIG$v) (local $x i32) (local $y i32) (block $out @@ -37,7 +37,7 @@ ) ) ) - (func $push1-twice (; 2 ;) (type $0) + (func $push1-twice (; 2 ;) (type $FUNCSIG$v) (local $x i32) (block $out (br_if $out @@ -54,7 +54,7 @@ ) ) ) - (func $push1-twiceb (; 3 ;) (type $0) + (func $push1-twiceb (; 3 ;) (type $FUNCSIG$v) (local $x i32) (block $out (br_if $out @@ -72,7 +72,7 @@ ) ) ) - (func $push2-twice (; 4 ;) (type $0) + (func $push2-twice (; 4 ;) (type $FUNCSIG$v) (local $x i32) (local $y i32) (block $out @@ -96,7 +96,7 @@ ) ) ) - (func $ignore-last (; 5 ;) (type $0) + (func $ignore-last (; 5 ;) (type $FUNCSIG$v) (local $x i32) (block $out (local.set $x @@ -107,7 +107,7 @@ ) ) ) - (func $ignore-last2 (; 6 ;) (type $0) + (func $ignore-last2 (; 6 ;) (type $FUNCSIG$v) (local $x i32) (block $out (local.set $x @@ -120,7 +120,7 @@ ) ) ) - (func $push-if (; 7 ;) (type $0) + (func $push-if (; 7 ;) (type $FUNCSIG$v) (local $x i32) (block $out (if @@ -135,7 +135,7 @@ ) ) ) - (func $push-dropped (; 8 ;) (type $1) (result i32) + (func $push-dropped (; 8 ;) (type $FUNCSIG$i) (result i32) (local $x i32) (block $out (result i32) (drop @@ -153,7 +153,7 @@ (i32.const 4) ) ) - (func $push-past-stuff (; 9 ;) (type $0) + (func $push-past-stuff (; 9 ;) (type $FUNCSIG$v) (local $x i32) (block $out (call $push-past-stuff) @@ -171,7 +171,7 @@ ) ) ) - (func $fail-then-push (; 10 ;) (type $0) + (func $fail-then-push (; 10 ;) (type $FUNCSIG$v) (local $x i32) (local $y i32) (block $out @@ -198,7 +198,7 @@ ) ) ) - (func $used (; 11 ;) (type $0) + (func $used (; 11 ;) (type $FUNCSIG$v) (local $x i32) (block $out (local.set $x @@ -212,7 +212,7 @@ ) ) ) - (func $not-sfa (; 12 ;) (type $0) + (func $not-sfa (; 12 ;) (type $FUNCSIG$v) (local $x i32) (local.set $x (i32.const 1) @@ -229,7 +229,7 @@ ) ) ) - (func $not-sfa2 (; 13 ;) (type $0) + (func $not-sfa2 (; 13 ;) (type $FUNCSIG$v) (local $x i32) (drop (local.get $x) @@ -246,7 +246,7 @@ ) ) ) - (func $used-out (; 14 ;) (type $0) + (func $used-out (; 14 ;) (type $FUNCSIG$v) (local $x i32) (block $out (local.set $x @@ -263,7 +263,7 @@ (local.get $x) ) ) - (func $value-might-interfere (; 15 ;) (type $0) + (func $value-might-interfere (; 15 ;) (type $FUNCSIG$v) (local $x i32) (block $out (br_if $out @@ -279,7 +279,7 @@ ) ) ) - (func $value-interferes (; 16 ;) (type $0) + (func $value-interferes (; 16 ;) (type $FUNCSIG$v) (local $x i32) (block $out (local.set $x @@ -299,7 +299,7 @@ ) ) ) - (func $value-interferes-accumulation (; 17 ;) (type $0) + (func $value-interferes-accumulation (; 17 ;) (type $FUNCSIG$v) (local $x i32) (block $out (local.set $x @@ -321,7 +321,7 @@ ) ) ) - (func $value-interferes-in-pushpoint (; 18 ;) (type $0) + (func $value-interferes-in-pushpoint (; 18 ;) (type $FUNCSIG$v) (local $x i32) (block $out (local.set $x @@ -338,7 +338,7 @@ ) ) ) - (func $values-might-interfere (; 19 ;) (type $0) + (func $values-might-interfere (; 19 ;) (type $FUNCSIG$v) (local $x i32) (local $y i32) (block $out @@ -359,7 +359,7 @@ ) ) ) - (func $unpushed-interferes (; 20 ;) (type $0) + (func $unpushed-interferes (; 20 ;) (type $FUNCSIG$v) (local $x i32) (local $y i32) (block $out @@ -383,7 +383,7 @@ (local.get $y) ) ) - (func $unpushed-ignorable (; 21 ;) (type $0) + (func $unpushed-ignorable (; 21 ;) (type $FUNCSIG$v) (local $x i32) (local $y i32) (block $out @@ -407,7 +407,7 @@ (local.get $x) ) ) - (func $unpushed-ignorable-side-effect (; 22 ;) (type $0) + (func $unpushed-ignorable-side-effect (; 22 ;) (type $FUNCSIG$v) (local $x i32) (local $y i32) (block $out @@ -428,7 +428,7 @@ ) ) ) - (func $unpushed-side-effect-into-drop (; 23 ;) (type $0) + (func $unpushed-side-effect-into-drop (; 23 ;) (type $FUNCSIG$v) (local $x i32) (block $out (local.set $x @@ -442,7 +442,7 @@ ) ) ) - (func $unpushed-side-effect-into-if (; 24 ;) (type $0) + (func $unpushed-side-effect-into-if (; 24 ;) (type $FUNCSIG$v) (local $x i32) (block $out (local.set $x diff --git a/test/passes/const-hoisting.txt b/test/passes/const-hoisting.txt index a03386014..e6318acf3 100644 --- a/test/passes/const-hoisting.txt +++ b/test/passes/const-hoisting.txt @@ -1,6 +1,6 @@ (module - (type $0 (func)) - (func $10-of-each (; 0 ;) (type $0) + (type $FUNCSIG$v (func)) + (func $10-of-each (; 0 ;) (type $FUNCSIG$v) (local $0 i32) (local $1 i32) (local $2 i32) @@ -420,7 +420,7 @@ ) ) ) - (func $floats-10-times (; 1 ;) (type $0) + (func $floats-10-times (; 1 ;) (type $FUNCSIG$v) (local $0 f32) (local $1 f64) (block @@ -494,7 +494,7 @@ ) ) ) - (func $too-few (; 2 ;) (type $0) + (func $too-few (; 2 ;) (type $FUNCSIG$v) (drop (i32.const 8192) ) @@ -511,7 +511,7 @@ (i32.const 8192) ) ) - (func $just-enough (; 3 ;) (type $0) + (func $just-enough (; 3 ;) (type $FUNCSIG$v) (local $0 i32) (block (local.set $0 @@ -539,7 +539,7 @@ ) ) ) - (func $too-few-b (; 4 ;) (type $0) + (func $too-few-b (; 4 ;) (type $FUNCSIG$v) (drop (i32.const 1048576) ) @@ -550,7 +550,7 @@ (i32.const 1048576) ) ) - (func $enough-b (; 5 ;) (type $0) + (func $enough-b (; 5 ;) (type $FUNCSIG$v) (local $0 i32) (block (local.set $0 @@ -572,7 +572,7 @@ ) ) ) - (func $too-few-c (; 6 ;) (type $0) + (func $too-few-c (; 6 ;) (type $FUNCSIG$v) (drop (f32.const 0) ) @@ -583,7 +583,7 @@ (f32.const 0) ) ) - (func $enough-c (; 7 ;) (type $0) + (func $enough-c (; 7 ;) (type $FUNCSIG$v) (local $0 f32) (block (local.set $0 @@ -605,12 +605,12 @@ ) ) ) - (func $too-few-d (; 8 ;) (type $0) + (func $too-few-d (; 8 ;) (type $FUNCSIG$v) (drop (f64.const 0) ) ) - (func $enough-d (; 9 ;) (type $0) + (func $enough-d (; 9 ;) (type $FUNCSIG$v) (local $0 f64) (block (local.set $0 diff --git a/test/passes/dae.txt b/test/passes/dae.txt index 4c483e888..2789d5206 100644 --- a/test/passes/dae.txt +++ b/test/passes/dae.txt @@ -1,9 +1,9 @@ (module - (type $0 (func (param i32))) - (type $1 (func)) - (type $2 (func (param i32 f64))) - (type $3 (func (result i32))) - (type $4 (func (param i32) (result i32))) + (type $FUNCSIG$vi (func (param i32))) + (type $FUNCSIG$v (func)) + (type $FUNCSIG$vid (func (param i32 f64))) + (type $FUNCSIG$i (func (result i32))) + (type $FUNCSIG$ii (func (param i32) (result i32))) (table $0 2 2 funcref) (elem (i32.const 0) $a9 $c8) (export "a8" (func $a8)) @@ -14,7 +14,7 @@ ) (nop) ) - (func $b (; 1 ;) (type $1) + (func $b (; 1 ;) (type $FUNCSIG$v) (call $a) ) (func $a1 (; 2 ;) @@ -24,23 +24,23 @@ ) (unreachable) ) - (func $b1 (; 3 ;) (type $1) + (func $b1 (; 3 ;) (type $FUNCSIG$v) (call $a1) ) - (func $b11 (; 4 ;) (type $1) + (func $b11 (; 4 ;) (type $FUNCSIG$v) (call $a1) ) - (func $a2 (; 5 ;) (type $0) (param $x i32) + (func $a2 (; 5 ;) (type $FUNCSIG$vi) (param $x i32) (drop (local.get $x) ) ) - (func $b2 (; 6 ;) (type $1) + (func $b2 (; 6 ;) (type $FUNCSIG$v) (call $a2 (i32.const 3) ) ) - (func $b22 (; 7 ;) (type $1) + (func $b22 (; 7 ;) (type $FUNCSIG$v) (call $a2 (i32.const 4) ) @@ -51,21 +51,21 @@ (i32.const -1) ) ) - (func $b3 (; 9 ;) (type $1) + (func $b3 (; 9 ;) (type $FUNCSIG$v) (call $a3) ) - (func $b33 (; 10 ;) (type $1) + (func $b33 (; 10 ;) (type $FUNCSIG$v) (call $a3) ) - (func $a4 (; 11 ;) (type $0) (param $x i32) + (func $a4 (; 11 ;) (type $FUNCSIG$vi) (param $x i32) (nop) ) - (func $b4 (; 12 ;) (type $1) + (func $b4 (; 12 ;) (type $FUNCSIG$v) (call $a4 (unreachable) ) ) - (func $b43 (; 13 ;) (type $1) + (func $b43 (; 13 ;) (type $FUNCSIG$v) (call $a4 (i32.const 4) ) @@ -90,7 +90,7 @@ ) ) ) - (func $b5 (; 15 ;) (type $1) + (func $b5 (; 15 ;) (type $FUNCSIG$v) (call $a5) ) (func $a6 (; 16 ;) (param $0 i32) @@ -107,7 +107,7 @@ ) ) ) - (func $b6 (; 17 ;) (type $1) + (func $b6 (; 17 ;) (type $FUNCSIG$v) (call $a6 (unreachable) ) @@ -126,23 +126,23 @@ ) ) ) - (func $b7 (; 19 ;) (type $1) + (func $b7 (; 19 ;) (type $FUNCSIG$v) (call $a7 (unreachable) ) ) - (func $a8 (; 20 ;) (type $0) (param $x i32) + (func $a8 (; 20 ;) (type $FUNCSIG$vi) (param $x i32) (nop) ) - (func $b8 (; 21 ;) (type $1) + (func $b8 (; 21 ;) (type $FUNCSIG$v) (call $a8 (i32.const 1) ) ) - (func $a9 (; 22 ;) (type $0) (param $x i32) + (func $a9 (; 22 ;) (type $FUNCSIG$vi) (param $x i32) (nop) ) - (func $b9 (; 23 ;) (type $1) + (func $b9 (; 23 ;) (type $FUNCSIG$v) (call $a9 (i32.const 1) ) @@ -162,7 +162,7 @@ (call $a11) (call $a11) ) - (func $a12 (; 26 ;) (type $0) (param $x i32) + (func $a12 (; 26 ;) (type $FUNCSIG$vi) (param $x i32) (drop (local.get $x) ) @@ -173,7 +173,7 @@ (i32.const 2) ) ) - (func $c1 (; 27 ;) (type $1) + (func $c1 (; 27 ;) (type $FUNCSIG$v) (local $x i32) (call $c2) (call $c3) @@ -203,7 +203,7 @@ (i32.const 2) ) ) - (func $c4 (; 30 ;) (type $3) (result i32) + (func $c4 (; 30 ;) (type $FUNCSIG$i) (result i32) (i32.const 3) ) (func $c5 (; 31 ;) (param $x i32) @@ -220,15 +220,15 @@ ) (return) ) - (func $c8 (; 34 ;) (type $3) (result i32) + (func $c8 (; 34 ;) (type $FUNCSIG$i) (result i32) (i32.const 5) ) ) (module - (type $0 (func)) - (type $1 (func (param i32) (result i32))) + (type $FUNCSIG$v (func)) + (type $FUNCSIG$ii (func (param i32) (result i32))) (export "a" (func $0)) - (func $0 (; 0 ;) (type $0) + (func $0 (; 0 ;) (type $FUNCSIG$v) (call $b) ) (func $b (; 1 ;) diff --git a/test/passes/dce.txt b/test/passes/dce.txt index aa4a355d4..6c7b6ca3a 100644 --- a/test/passes/dce.txt +++ b/test/passes/dce.txt @@ -1,11 +1,11 @@ (module (type $ii (func (param i32 i32))) (type $1 (func)) - (type $2 (func (result i32))) - (type $3 (func (param i32) (result i32))) - (type $4 (func (param i64 i64) (result i64))) - (type $5 (func (param f32 i64))) - (type $6 (func (param f32 i64) (result i32))) + (type $FUNCSIG$i (func (result i32))) + (type $FUNCSIG$ii (func (param i32) (result i32))) + (type $FUNCSIG$jjj (func (param i64 i64) (result i64))) + (type $FUNCSIG$vfj (func (param f32 i64))) + (type $FUNCSIG$ifj (func (param f32 i64) (result i32))) (memory $0 10) (table $0 1 1 funcref) (elem (i32.const 0) $call-me) @@ -272,12 +272,12 @@ (i32.const 2000) ) ) - (func $typed-block-none-then-unreachable (; 4 ;) (type $2) (result i32) + (func $typed-block-none-then-unreachable (; 4 ;) (type $FUNCSIG$i) (result i32) (return (i32.const 0) ) ) - (func $typed-block-remove-br-changes-type (; 5 ;) (type $3) (param $$$0 i32) (result i32) + (func $typed-block-remove-br-changes-type (; 5 ;) (type $FUNCSIG$ii) (param $$$0 i32) (result i32) (block $switch$7 (block $switch-default$10 (block $switch-case$9 @@ -299,43 +299,43 @@ (func $global (; 6 ;) (type $1) (unreachable) ) - (func $ret (; 7 ;) (type $2) (result i32) + (func $ret (; 7 ;) (type $FUNCSIG$i) (result i32) (return (i32.const 0) ) ) - (func $unreachable-br (; 8 ;) (type $2) (result i32) + (func $unreachable-br (; 8 ;) (type $FUNCSIG$i) (result i32) (block $out (result i32) (br $out (i32.const 0) ) ) ) - (func $unreachable-br-loop (; 9 ;) (type $2) (result i32) + (func $unreachable-br-loop (; 9 ;) (type $FUNCSIG$i) (result i32) (loop $out (br $out) ) ) - (func $unreachable-block-ends-switch (; 10 ;) (type $2) (result i32) + (func $unreachable-block-ends-switch (; 10 ;) (type $FUNCSIG$i) (result i32) (block $label$3 (nop) (unreachable) ) ) - (func $unreachable-block-ends-br_if (; 11 ;) (type $2) (result i32) + (func $unreachable-block-ends-br_if (; 11 ;) (type $FUNCSIG$i) (result i32) (block $label$2 (nop) (unreachable) ) ) - (func $unreachable-brs-3 (; 12 ;) (type $2) (result i32) + (func $unreachable-brs-3 (; 12 ;) (type $FUNCSIG$i) (result i32) (block $label$0 (result i32) (br $label$0 (i32.const 18) ) ) ) - (func $unreachable-brs-4 (; 13 ;) (type $3) (param $var$0 i32) (result i32) + (func $unreachable-brs-4 (; 13 ;) (type $FUNCSIG$ii) (param $var$0 i32) (result i32) (drop (i32.const 1) ) @@ -346,7 +346,7 @@ (unreachable) ) ) - (func $call-unreach (; 14 ;) (type $4) (param $var$0 i64) (param $var$1 i64) (result i64) + (func $call-unreach (; 14 ;) (type $FUNCSIG$jjj) (param $var$0 i64) (param $var$1 i64) (result i64) (local $2 i64) (if (result i64) (i64.eqz @@ -377,13 +377,13 @@ ) ) ) - (func $br-gone-means-block-type-changes-then-refinalize-at-end-is-too-late (; 15 ;) (type $3) (param $var$0 i32) (result i32) + (func $br-gone-means-block-type-changes-then-refinalize-at-end-is-too-late (; 15 ;) (type $FUNCSIG$ii) (param $var$0 i32) (result i32) (block $block (nop) (unreachable) ) ) - (func $br-with-unreachable-value-should-not-give-a-block-a-value (; 16 ;) (type $3) (param $var$0 i32) (result i32) + (func $br-with-unreachable-value-should-not-give-a-block-a-value (; 16 ;) (type $FUNCSIG$ii) (param $var$0 i32) (result i32) (block $label$0 (result i32) (block $block (drop @@ -396,7 +396,7 @@ ) ) ) - (func $replace-br-value-of-i32-with-unreachable (; 17 ;) (type $2) (result i32) + (func $replace-br-value-of-i32-with-unreachable (; 17 ;) (type $FUNCSIG$i) (result i32) (block $label$1 (nop) (unreachable) @@ -405,13 +405,13 @@ (func $shorten-block-requires-sync-refinalize (; 18 ;) (type $ii) (param $var$0 i32) (param $var$1 i32) (unreachable) ) - (func $block-with-type-but-is-unreachable (; 19 ;) (type $3) (param $var$0 i32) (result i32) + (func $block-with-type-but-is-unreachable (; 19 ;) (type $FUNCSIG$ii) (param $var$0 i32) (result i32) (block $block (nop) (unreachable) ) ) - (func $if-with-type-but-is-unreachable (; 20 ;) (type $3) (param $var$0 i32) (result i32) + (func $if-with-type-but-is-unreachable (; 20 ;) (type $FUNCSIG$ii) (param $var$0 i32) (result i32) (if (local.get $var$0) (unreachable) @@ -421,7 +421,7 @@ (func $unreachable-loop (; 21 ;) (type $1) (unreachable) ) - (func $br-block-from-unary (; 22 ;) (type $2) (result i32) + (func $br-block-from-unary (; 22 ;) (type $FUNCSIG$i) (result i32) (block $label$6 (result i32) (br $label$6 (i32.const 8) @@ -443,7 +443,7 @@ (unreachable) ) ) - (func $replace-with-unreachable-affects-parent (; 25 ;) (type $5) (param $var$0 f32) (param $var$1 i64) + (func $replace-with-unreachable-affects-parent (; 25 ;) (type $FUNCSIG$vfj) (param $var$0 f32) (param $var$1 i64) (drop (i64.const 0) ) @@ -475,14 +475,14 @@ ) ) ) - (func $helper (; 27 ;) (type $6) (param $var$0 f32) (param $var$1 i64) (result i32) + (func $helper (; 27 ;) (type $FUNCSIG$ifj) (param $var$0 f32) (param $var$1 i64) (result i32) (i32.const 0) ) ) (module - (type $0 (func)) + (type $FUNCSIG$v (func)) (global $global (mut f64) (f64.const 0)) - (func $0 (; 0 ;) (type $0) + (func $0 (; 0 ;) (type $FUNCSIG$v) (if (i32.const 0) (unreachable) @@ -491,8 +491,8 @@ ) ) (module - (type $0 (func)) - (func $0 (; 0 ;) (type $0) + (type $FUNCSIG$v (func)) + (func $0 (; 0 ;) (type $FUNCSIG$v) (local $local f64) (if (i32.const 0) diff --git a/test/passes/dce_vacuum.txt b/test/passes/dce_vacuum.txt index 2d400e730..43fca1d4f 100644 --- a/test/passes/dce_vacuum.txt +++ b/test/passes/dce_vacuum.txt @@ -1,16 +1,16 @@ (module - (type $0 (func (result i32))) - (type $1 (func (param f32 f32) (result f32))) - (type $2 (func (param i64) (result i64))) - (func $__Z12serveroptionPc (; 0 ;) (type $0) (result i32) + (type $FUNCSIG$i (func (result i32))) + (type $FUNCSIG$fff (func (param f32 f32) (result f32))) + (type $FUNCSIG$jj (func (param i64) (result i64))) + (func $__Z12serveroptionPc (; 0 ;) (type $FUNCSIG$i) (result i32) (return (i32.const 0) ) ) - (func $drop-unreachable (; 1 ;) (type $1) (param $var$0 f32) (param $var$1 f32) (result f32) + (func $drop-unreachable (; 1 ;) (type $FUNCSIG$fff) (param $var$0 f32) (param $var$1 f32) (result f32) (unreachable) ) - (func $set-unreachable (; 2 ;) (type $2) (param $var$0 i64) (result i64) + (func $set-unreachable (; 2 ;) (type $FUNCSIG$jj) (param $var$0 i64) (result i64) (local $var$1 i64) (local $var$2 i64) (if diff --git a/test/passes/directize.txt b/test/passes/directize.txt index fb6d94e4c..109140a8f 100644 --- a/test/passes/directize.txt +++ b/test/passes/directize.txt @@ -103,13 +103,13 @@ ) (module (type $ii (func (param i32 i32))) - (type $1 (func (param i32 i32 i32))) + (type $FUNCSIG$viii (func (param i32 i32 i32))) (table $0 5 5 funcref) (elem (i32.const 1) $foo) (func $foo (; 0 ;) (type $ii) (param $0 i32) (param $1 i32) (unreachable) ) - (func $bar (; 1 ;) (type $1) (param $x i32) (param $y i32) (param $z i32) + (func $bar (; 1 ;) (type $FUNCSIG$viii) (param $x i32) (param $y i32) (param $z i32) (call_indirect (type $ii) (local.get $x) (local.get $y) @@ -157,10 +157,10 @@ ) (module (type $ii (func (param i32 i32))) - (type $1 (func (param i32))) + (type $FUNCSIG$vi (func (param i32))) (table $0 5 5 funcref) (elem (i32.const 1) $foo) - (func $foo (; 0 ;) (type $1) (param $0 i32) + (func $foo (; 0 ;) (type $FUNCSIG$vi) (param $0 i32) (unreachable) ) (func $bar (; 1 ;) (type $ii) (param $x i32) (param $y i32) @@ -176,15 +176,15 @@ ) ) (module - (type $0 (func (param i32))) - (func $foo (; 0 ;) (type $0) (param $0 i32) + (type $FUNCSIG$vi (func (param i32))) + (func $foo (; 0 ;) (type $FUNCSIG$vi) (param $0 i32) (unreachable) ) ) (module - (type $0 (func)) + (type $FUNCSIG$v (func)) (table $0 8 8 funcref) - (func $0 (; 0 ;) (type $0) + (func $0 (; 0 ;) (type $FUNCSIG$v) (block $block (nop) (block diff --git a/test/passes/directize.wast b/test/passes/directize.wast index 7deb2572c..4385aa18a 100644 --- a/test/passes/directize.wast +++ b/test/passes/directize.wast @@ -185,7 +185,7 @@ (func $0 (block ;; the type of this block will change (nop) - (call_indirect (type $0) + (call_indirect (type 0) (i32.const 15) ) ) diff --git a/test/passes/emit-js-wrapper=a.js.txt b/test/passes/emit-js-wrapper=a.js.txt index 50a1c64c0..2044d0f48 100644 --- a/test/passes/emit-js-wrapper=a.js.txt +++ b/test/passes/emit-js-wrapper=a.js.txt @@ -1,10 +1,9 @@ (module - (type $0 (func (param i32 i32) (result i32))) - (type $1 (func (param i32))) - (type $2 (func (param i32 i64 f32 f64))) - (type $3 (func (param i32 f32 f64))) - (type $4 (func (param i32 f32 f64) (result i64))) + (type $FUNCSIG$iii (func (param i32 i32) (result i32))) (type $FUNCSIG$vi (func (param i32))) + (type $FUNCSIG$vijfd (func (param i32 i64 f32 f64))) + (type $FUNCSIG$vifd (func (param i32 f32 f64))) + (type $FUNCSIG$jifd (func (param i32 f32 f64) (result i64))) (import "env" "setTempRet0" (func $setTempRet0 (param i32))) (memory $0 256 256) (export "add" (func $add)) @@ -12,19 +11,19 @@ (export "types" (func $legalstub$types)) (export "types2" (func $types2)) (export "types3" (func $legalstub$types3)) - (func $add (; 1 ;) (type $0) (param $x i32) (param $y i32) (result i32) + (func $add (; 1 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (i32.add (local.get $x) (local.get $y) ) ) - (func $unexported (; 2 ;) (type $0) (param $x i32) (param $y i32) (result i32) + (func $unexported (; 2 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (i32.add (local.get $x) (local.get $y) ) ) - (func $no-return (; 3 ;) (type $1) (param $x i32) + (func $no-return (; 3 ;) (type $FUNCSIG$vi) (param $x i32) (drop (i32.add (local.get $x) @@ -32,13 +31,13 @@ ) ) ) - (func $types (; 4 ;) (type $2) (param $x i32) (param $y i64) (param $z f32) (param $w f64) + (func $types (; 4 ;) (type $FUNCSIG$vijfd) (param $x i32) (param $y i64) (param $z f32) (param $w f64) (nop) ) - (func $types2 (; 5 ;) (type $3) (param $x i32) (param $z f32) (param $w f64) + (func $types2 (; 5 ;) (type $FUNCSIG$vifd) (param $x i32) (param $z f32) (param $w f64) (nop) ) - (func $types3 (; 6 ;) (type $4) (param $x i32) (param $z f32) (param $w f64) (result i64) + (func $types3 (; 6 ;) (type $FUNCSIG$jifd) (param $x i32) (param $z f32) (param $w f64) (result i64) (i64.const 1) ) (func $legalstub$types (; 7 ;) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 f32) (param $4 f64) diff --git a/test/passes/emit-spec-wrapper=a.wat.txt b/test/passes/emit-spec-wrapper=a.wat.txt index dc427f022..a834c54b3 100644 --- a/test/passes/emit-spec-wrapper=a.wat.txt +++ b/test/passes/emit-spec-wrapper=a.wat.txt @@ -1,28 +1,28 @@ (module - (type $0 (func (param i32 i32) (result i32))) - (type $1 (func (param i32))) - (type $2 (func (param i32 i64 f32 f64))) - (type $3 (func (param i32 f32 f64))) - (type $4 (func (param i32 f32 f64) (result i64))) + (type $FUNCSIG$iii (func (param i32 i32) (result i32))) + (type $FUNCSIG$vi (func (param i32))) + (type $FUNCSIG$vijfd (func (param i32 i64 f32 f64))) + (type $FUNCSIG$vifd (func (param i32 f32 f64))) + (type $FUNCSIG$jifd (func (param i32 f32 f64) (result i64))) (memory $0 256 256) (export "add" (func $add)) (export "no_return" (func $no-return)) (export "types" (func $types)) (export "types2" (func $types2)) (export "types3" (func $types3)) - (func $add (; 0 ;) (type $0) (param $x i32) (param $y i32) (result i32) + (func $add (; 0 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (i32.add (local.get $x) (local.get $y) ) ) - (func $unexported (; 1 ;) (type $0) (param $x i32) (param $y i32) (result i32) + (func $unexported (; 1 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (i32.add (local.get $x) (local.get $y) ) ) - (func $no-return (; 2 ;) (type $1) (param $x i32) + (func $no-return (; 2 ;) (type $FUNCSIG$vi) (param $x i32) (drop (i32.add (local.get $x) @@ -30,13 +30,13 @@ ) ) ) - (func $types (; 3 ;) (type $2) (param $x i32) (param $y i64) (param $z f32) (param $w f64) + (func $types (; 3 ;) (type $FUNCSIG$vijfd) (param $x i32) (param $y i64) (param $z f32) (param $w f64) (nop) ) - (func $types2 (; 4 ;) (type $3) (param $x i32) (param $z f32) (param $w f64) + (func $types2 (; 4 ;) (type $FUNCSIG$vifd) (param $x i32) (param $z f32) (param $w f64) (nop) ) - (func $types3 (; 5 ;) (type $4) (param $x i32) (param $z f32) (param $w f64) (result i64) + (func $types3 (; 5 ;) (type $FUNCSIG$jifd) (param $x i32) (param $z f32) (param $w f64) (result i64) (i64.const 1) ) ) diff --git a/test/passes/extract-function_pass-arg=extract@foo.txt b/test/passes/extract-function_pass-arg=extract@foo.txt index bb923f470..3962d3449 100644 --- a/test/passes/extract-function_pass-arg=extract@foo.txt +++ b/test/passes/extract-function_pass-arg=extract@foo.txt @@ -1,9 +1,9 @@ (module - (type $0 (func)) + (type $FUNCSIG$v (func)) (import "env" "bar" (func $bar)) (import "env" "other" (func $other)) (export "foo" (func $foo)) - (func $foo (; 2 ;) (type $0) + (func $foo (; 2 ;) (type $FUNCSIG$v) (call $bar) ) ) diff --git a/test/passes/flatten.txt b/test/passes/flatten.txt index 560e5762b..7cfd1e6a7 100644 --- a/test/passes/flatten.txt +++ b/test/passes/flatten.txt @@ -4,7 +4,7 @@ (type $2 (func (result i32))) (type $3 (func (param i32) (result i32))) (type $4 (func (param i64 i64) (result i64))) - (type $5 (func (result f32))) + (type $FUNCSIG$f (func (result f32))) (memory $0 10) (table $0 1 1 funcref) (elem (i32.const 0) $call-me) @@ -628,7 +628,7 @@ (local.get $7) ) ) - (func $a17 (; 16 ;) (type $5) (result f32) + (func $a17 (; 16 ;) (type $FUNCSIG$f) (result f32) (local $var$0 f32) (local $1 f32) (local $2 f32) @@ -691,7 +691,7 @@ (local.get $1) ) ) - (func $a19 (; 18 ;) (type $5) (result f32) + (func $a19 (; 18 ;) (type $FUNCSIG$f) (result f32) (block $label$0 (block $label$1 (unreachable) diff --git a/test/passes/flatten_dfo_O3_enable-threads.txt b/test/passes/flatten_dfo_O3_enable-threads.txt index 74ddb5e2e..16e12cc6e 100644 --- a/test/passes/flatten_dfo_O3_enable-threads.txt +++ b/test/passes/flatten_dfo_O3_enable-threads.txt @@ -1,9 +1,9 @@ (module - (type $0 (func)) - (type $1 (func (param i32 i32) (result i32))) - (type $2 (func (param i64 i32) (result f64))) - (type $3 (func (param f64) (result f64))) - (type $4 (func (result i32))) + (type $FUNCSIG$v (func)) + (type $FUNCSIG$iii (func (param i32 i32) (result i32))) + (type $FUNCSIG$dji (func (param i64 i32) (result f64))) + (type $FUNCSIG$dd (func (param f64) (result f64))) + (type $FUNCSIG$i (func (result i32))) (memory $0 (shared 1 1)) (export "one" (func $0)) (export "two" (func $1)) @@ -11,7 +11,7 @@ (export "bad1" (func $3)) (export "only-dfo" (func $4)) (export "dfo-tee-get" (func $5)) - (func $0 (; 0 ;) (; has Stack IR ;) (type $0) + (func $0 (; 0 ;) (; has Stack IR ;) (type $FUNCSIG$v) (block $label$3 (br_if $label$3 (i32.load @@ -21,10 +21,10 @@ ) (unreachable) ) - (func $1 (; 1 ;) (; has Stack IR ;) (type $1) (param $0 i32) (param $1 i32) (result i32) + (func $1 (; 1 ;) (; has Stack IR ;) (type $FUNCSIG$iii) (param $0 i32) (param $1 i32) (result i32) (i32.const 0) ) - (func $2 (; 2 ;) (; has Stack IR ;) (type $2) (param $0 i64) (param $1 i32) (result f64) + (func $2 (; 2 ;) (; has Stack IR ;) (type $FUNCSIG$dji) (param $0 i64) (param $1 i32) (result f64) (loop $label$8 (br_if $label$8 (local.get $1) @@ -32,19 +32,19 @@ ) (unreachable) ) - (func $3 (; 3 ;) (; has Stack IR ;) (type $0) + (func $3 (; 3 ;) (; has Stack IR ;) (type $FUNCSIG$v) (i32.store (i32.const 1) (i32.const -16384) ) ) - (func $4 (; 4 ;) (; has Stack IR ;) (type $3) (param $0 f64) (result f64) + (func $4 (; 4 ;) (; has Stack IR ;) (type $FUNCSIG$dd) (param $0 f64) (result f64) (local $1 i32) (loop $label$1 (br $label$1) ) ) - (func $5 (; 5 ;) (; has Stack IR ;) (type $4) (result i32) + (func $5 (; 5 ;) (; has Stack IR ;) (type $FUNCSIG$i) (result i32) (i32.const 1) ) ) diff --git a/test/passes/flatten_i64-to-i32-lowering.txt b/test/passes/flatten_i64-to-i32-lowering.txt index 967610194..809982880 100644 --- a/test/passes/flatten_i64-to-i32-lowering.txt +++ b/test/passes/flatten_i64-to-i32-lowering.txt @@ -1,6 +1,6 @@ (module (type $FUNCSIG$j (func (result i32))) - (type $1 (func)) + (type $FUNCSIG$v (func)) (import "env" "func" (func $import (result i32))) (memory $0 1 1) (global $i64toi32_i32$HIGH_BITS (mut i32) (i32.const 0)) @@ -143,7 +143,7 @@ ) (unreachable) ) - (func $mem (; 5 ;) (type $1) + (func $mem (; 5 ;) (type $FUNCSIG$v) (local $0 i32) (local $0$hi i32) (local $1 i32) @@ -418,8 +418,8 @@ ) ) (module - (type $0 (func (param i32 i32))) - (type $1 (func)) + (type $FUNCSIG$vj (func (param i32 i32))) + (type $FUNCSIG$v (func)) (global $f (mut i32) (i32.const -1412567121)) (global $g (mut i32) (global.get $f)) (global $f$hi (mut i32) (i32.const 305419896)) @@ -427,10 +427,10 @@ (global $i64toi32_i32$HIGH_BITS (mut i32) (i32.const 0)) (export "exp" (func $1)) (export "unreach" (func $2)) - (func $call (; 0 ;) (type $0) (param $0 i32) (param $0$hi i32) + (func $call (; 0 ;) (type $FUNCSIG$vj) (param $0 i32) (param $0$hi i32) (nop) ) - (func $1 (; 1 ;) (type $1) + (func $1 (; 1 ;) (type $FUNCSIG$v) (local $0 i32) (local $0$hi i32) (local $i64toi32_i32$0 i32) @@ -475,7 +475,7 @@ ) (nop) ) - (func $2 (; 2 ;) (type $1) + (func $2 (; 2 ;) (type $FUNCSIG$v) (local $0 i32) (local $0$hi i32) (local $1 i32) @@ -515,18 +515,18 @@ ) ) (module - (type $0 (func (param i32 i32))) - (type $1 (func)) + (type $FUNCSIG$vj (func (param i32 i32))) + (type $FUNCSIG$v (func)) (global $f (mut i32) (i32.const -1412567121)) (global $g (mut i32) (global.get $f)) (global $f$hi (mut i32) (i32.const 305419896)) (global $g$hi (mut i32) (global.get $f$hi)) (global $i64toi32_i32$HIGH_BITS (mut i32) (i32.const 0)) (export "exp" (func $1)) - (func $call (; 0 ;) (type $0) (param $0 i32) (param $0$hi i32) + (func $call (; 0 ;) (type $FUNCSIG$vj) (param $0 i32) (param $0$hi i32) (nop) ) - (func $1 (; 1 ;) (type $1) + (func $1 (; 1 ;) (type $FUNCSIG$v) (local $0 i32) (local $0$hi i32) (local $i64toi32_i32$0 i32) diff --git a/test/passes/flatten_local-cse.txt b/test/passes/flatten_local-cse.txt index dde07a89f..aae715bb0 100644 --- a/test/passes/flatten_local-cse.txt +++ b/test/passes/flatten_local-cse.txt @@ -1,11 +1,11 @@ (module - (type $0 (func)) - (type $1 (func (param i32) (result i32))) - (type $2 (func (param i32 i32) (result i32))) - (type $3 (func (param i32 i32 i32) (result i32))) - (type $4 (func (param f64 f64 i32) (result f32))) + (type $FUNCSIG$v (func)) + (type $FUNCSIG$ii (func (param i32) (result i32))) + (type $FUNCSIG$iii (func (param i32 i32) (result i32))) + (type $FUNCSIG$iiii (func (param i32 i32 i32) (result i32))) + (type $FUNCSIG$fddi (func (param f64 f64 i32) (result f32))) (memory $0 100 100) - (func $basics (; 0 ;) (type $0) + (func $basics (; 0 ;) (type $FUNCSIG$v) (local $x i32) (local $y i32) (local $2 i32) @@ -139,7 +139,7 @@ ) (nop) ) - (func $recursive1 (; 1 ;) (type $0) + (func $recursive1 (; 1 ;) (type $FUNCSIG$v) (local $x i32) (local $y i32) (local $2 i32) @@ -184,7 +184,7 @@ ) (nop) ) - (func $recursive2 (; 2 ;) (type $0) + (func $recursive2 (; 2 ;) (type $FUNCSIG$v) (local $x i32) (local $y i32) (local $2 i32) @@ -229,7 +229,7 @@ ) (nop) ) - (func $self (; 3 ;) (type $0) + (func $self (; 3 ;) (type $FUNCSIG$v) (local $x i32) (local $y i32) (local $2 i32) @@ -266,7 +266,7 @@ ) (nop) ) - (func $loads (; 4 ;) (type $0) + (func $loads (; 4 ;) (type $FUNCSIG$v) (local $0 i32) (local $1 i32) (block @@ -291,7 +291,7 @@ ) (nop) ) - (func $8 (; 5 ;) (type $1) (param $var$0 i32) (result i32) + (func $8 (; 5 ;) (type $FUNCSIG$ii) (param $var$0 i32) (result i32) (local $var$1 i32) (local $var$2 i32) (local $var$3 i32) @@ -411,7 +411,7 @@ (local.get $20) ) ) - (func $loop1 (; 6 ;) (type $2) (param $x i32) (param $y i32) (result i32) + (func $loop1 (; 6 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (local $2 i32) (local $3 i32) (local $4 i32) @@ -463,7 +463,7 @@ (local.get $7) ) ) - (func $loop2 (; 7 ;) (type $3) (param $x i32) (param $y i32) (param $z i32) (result i32) + (func $loop2 (; 7 ;) (type $FUNCSIG$iiii) (param $x i32) (param $y i32) (param $z i32) (result i32) (local $3 i32) (local $4 i32) (local $5 i32) @@ -531,7 +531,7 @@ (local.get $10) ) ) - (func $loop3 (; 8 ;) (type $3) (param $x i32) (param $y i32) (param $z i32) (result i32) + (func $loop3 (; 8 ;) (type $FUNCSIG$iiii) (param $x i32) (param $y i32) (param $z i32) (result i32) (local $3 i32) (local $4 i32) (local $5 i32) @@ -591,7 +591,7 @@ (local.get $9) ) ) - (func $handle-removing (; 9 ;) (type $4) (param $var$0 f64) (param $var$1 f64) (param $var$2 i32) (result f32) + (func $handle-removing (; 9 ;) (type $FUNCSIG$fddi) (param $var$0 f64) (param $var$1 f64) (param $var$2 i32) (result f32) (local $3 i32) (local $4 i32) (local $5 i32) @@ -763,10 +763,10 @@ ) ) (module - (type $0 (func (result i64))) - (type $1 (func)) + (type $FUNCSIG$j (func (result i64))) + (type $FUNCSIG$v (func)) (global $glob (mut i32) (i32.const 1)) - (func $i64-shifts (; 0 ;) (type $0) (result i64) + (func $i64-shifts (; 0 ;) (type $FUNCSIG$j) (result i64) (local $temp i64) (local $1 i64) (local $2 i64) @@ -809,7 +809,7 @@ (local.get $temp) ) ) - (func $global (; 1 ;) (type $1) + (func $global (; 1 ;) (type $FUNCSIG$v) (local $x i32) (local $y i32) (local $2 i32) diff --git a/test/passes/flatten_local-cse_Os.txt b/test/passes/flatten_local-cse_Os.txt index ec612f52f..c45e7945f 100644 --- a/test/passes/flatten_local-cse_Os.txt +++ b/test/passes/flatten_local-cse_Os.txt @@ -1,7 +1,7 @@ (module - (type $0 (func (param i32 i32) (result i32))) + (type $FUNCSIG$iii (func (param i32 i32) (result i32))) (export "div16_internal" (func $0)) - (func $0 (; 0 ;) (; has Stack IR ;) (type $0) (param $0 i32) (param $1 i32) (result i32) + (func $0 (; 0 ;) (; has Stack IR ;) (type $FUNCSIG$iii) (param $0 i32) (param $1 i32) (result i32) (i32.add (local.tee $0 (i32.xor diff --git a/test/passes/flatten_rereloop.txt b/test/passes/flatten_rereloop.txt index de2b3bbea..cdf242fd9 100644 --- a/test/passes/flatten_rereloop.txt +++ b/test/passes/flatten_rereloop.txt @@ -1,13 +1,13 @@ (module - (type $0 (func (result f64))) - (type $1 (func (result i32))) - (type $2 (func)) - (type $3 (func (param i32))) - (type $4 (func (param i32) (result f32))) - (type $5 (func (result f32))) + (type $FUNCSIG$d (func (result f64))) + (type $FUNCSIG$i (func (result i32))) + (type $FUNCSIG$v (func)) + (type $FUNCSIG$vi (func (param i32))) + (type $FUNCSIG$fi (func (param i32) (result f32))) + (type $FUNCSIG$f (func (result f32))) (memory $0 1) (global $global (mut i32) (i32.const 0)) - (func $0 (; 0 ;) (type $0) (result f64) + (func $0 (; 0 ;) (type $FUNCSIG$d) (result f64) (local $0 f64) (local $1 f64) (local $2 i32) @@ -33,7 +33,7 @@ ) ) ) - (func $1 (; 1 ;) (type $1) (result i32) + (func $1 (; 1 ;) (type $FUNCSIG$i) (result i32) (local $0 i32) (local $1 i32) (local $2 i32) @@ -95,7 +95,7 @@ ) (unreachable) ) - (func $skip-empty (; 2 ;) (type $2) + (func $skip-empty (; 2 ;) (type $FUNCSIG$v) (local $0 i32) (block $block$2$break (block @@ -108,7 +108,7 @@ (return) ) ) - (func $skip-empty-2 (; 3 ;) (type $2) + (func $skip-empty-2 (; 3 ;) (type $FUNCSIG$v) (local $0 i32) (block $block$5$break (block @@ -137,7 +137,7 @@ ) ) ) - (func $skip-empty-3 (; 4 ;) (type $2) + (func $skip-empty-3 (; 4 ;) (type $FUNCSIG$v) (local $0 i32) (block $block$5$break (block @@ -166,7 +166,7 @@ ) ) ) - (func $skip-empty-4 (; 5 ;) (type $3) (param $x i32) + (func $skip-empty-4 (; 5 ;) (type $FUNCSIG$vi) (param $x i32) (local $1 i32) (local $2 i32) (block $block$2$break @@ -181,7 +181,7 @@ (return) ) ) - (func $skipping (; 6 ;) (type $4) (param $0 i32) (result f32) + (func $skipping (; 6 ;) (type $FUNCSIG$fi) (param $0 i32) (result f32) (local $1 f32) (local $2 f32) (local $3 f32) @@ -215,7 +215,7 @@ ) ) ) - (func $merging (; 7 ;) (type $2) + (func $merging (; 7 ;) (type $FUNCSIG$v) (local $0 i32) (block (block @@ -223,7 +223,7 @@ (return) ) ) - (func $unswitch (; 8 ;) (type $2) + (func $unswitch (; 8 ;) (type $FUNCSIG$v) (local $0 i32) (block $block$2$break (block @@ -236,7 +236,7 @@ (return) ) ) - (func $skip-only-empty (; 9 ;) (type $2) + (func $skip-only-empty (; 9 ;) (type $FUNCSIG$v) (local $0 i32) (block $block$3$break (block @@ -258,7 +258,7 @@ (return) ) ) - (func $skip-only-one-branch-out (; 10 ;) (type $1) (result i32) + (func $skip-only-one-branch-out (; 10 ;) (type $FUNCSIG$i) (result i32) (local $0 i32) (local $1 i32) (local $2 i32) @@ -288,7 +288,7 @@ ) ) ) - (func $multipass-for-skips (; 11 ;) (type $5) (result f32) + (func $multipass-for-skips (; 11 ;) (type $FUNCSIG$f) (result f32) (local $0 f32) (local $1 f32) (local $2 f32) @@ -338,7 +338,7 @@ ) ) ) - (func $branch-merge-vs-replace (; 12 ;) (type $2) + (func $branch-merge-vs-replace (; 12 ;) (type $FUNCSIG$v) (local $0 i32) (block ) @@ -352,7 +352,7 @@ ) ) ) - (func $unswitch-amount (; 13 ;) (type $2) + (func $unswitch-amount (; 13 ;) (type $FUNCSIG$v) (local $0 i32) (block $block$2$break (block diff --git a/test/passes/flatten_simplify-locals-nonesting_dfo_O3.txt b/test/passes/flatten_simplify-locals-nonesting_dfo_O3.txt index 772db47d3..24e5c6011 100644 --- a/test/passes/flatten_simplify-locals-nonesting_dfo_O3.txt +++ b/test/passes/flatten_simplify-locals-nonesting_dfo_O3.txt @@ -1,27 +1,27 @@ (module - (type $0 (func)) - (type $1 (func (result f64))) - (type $2 (func (param i32 f64 f64) (result i32))) - (type $3 (func (param i64))) - (type $4 (func (param f64) (result i32))) + (type $FUNCSIG$v (func)) + (type $FUNCSIG$d (func (result f64))) + (type $FUNCSIG$iidd (func (param i32 f64 f64) (result i32))) + (type $FUNCSIG$vj (func (param i64))) + (type $FUNCSIG$id (func (param f64) (result i32))) (export "if-select" (func $0)) (export "unreachable-body-update-zext" (func $1)) (export "ssa-const" (func $2)) (export "if-nothing" (func $3)) (export "only-dfo" (func $4)) - (func $0 (; 0 ;) (; has Stack IR ;) (type $0) + (func $0 (; 0 ;) (; has Stack IR ;) (type $FUNCSIG$v) (nop) ) - (func $1 (; 1 ;) (; has Stack IR ;) (type $1) (result f64) + (func $1 (; 1 ;) (; has Stack IR ;) (type $FUNCSIG$d) (result f64) (unreachable) ) - (func $2 (; 2 ;) (; has Stack IR ;) (type $2) (param $0 i32) (param $1 f64) (param $2 f64) (result i32) + (func $2 (; 2 ;) (; has Stack IR ;) (type $FUNCSIG$iidd) (param $0 i32) (param $1 f64) (param $2 f64) (result i32) (unreachable) ) - (func $3 (; 3 ;) (; has Stack IR ;) (type $3) (param $0 i64) + (func $3 (; 3 ;) (; has Stack IR ;) (type $FUNCSIG$vj) (param $0 i64) (unreachable) ) - (func $4 (; 4 ;) (; has Stack IR ;) (type $4) (param $0 f64) (result i32) + (func $4 (; 4 ;) (; has Stack IR ;) (type $FUNCSIG$id) (param $0 f64) (result i32) (local $1 i32) (loop $label$1 (if diff --git a/test/passes/flatten_simplify-locals-nonesting_souperify-single-use_enable-threads.txt b/test/passes/flatten_simplify-locals-nonesting_souperify-single-use_enable-threads.txt index af2ba0f59..1cd9d255d 100644 --- a/test/passes/flatten_simplify-locals-nonesting_souperify-single-use_enable-threads.txt +++ b/test/passes/flatten_simplify-locals-nonesting_souperify-single-use_enable-threads.txt @@ -1432,22 +1432,22 @@ blockpc %0 1 %10 1:i1 infer %4 (module - (type $0 (func (param i64 i64 i64) (result i32))) - (type $1 (func (param i32) (result i32))) - (type $2 (func)) - (type $3 (func (param i32))) - (type $4 (func (param i32 i32))) - (type $5 (func (result i32))) - (type $6 (func (param i32 i32) (result i32))) - (type $7 (func (result f64))) - (type $8 (func (param i32 i32 i32 i32))) - (type $9 (func (param i64 i64 i64) (result i64))) - (type $10 (func (param i32 i32 i32) (result i32))) - (type $11 (func (param i64 i64 i32 f32))) - (type $12 (func (param i32 i32 i32 i32 i32) (result i32))) + (type $FUNCSIG$ijjj (func (param i64 i64 i64) (result i32))) + (type $FUNCSIG$ii (func (param i32) (result i32))) + (type $FUNCSIG$v (func)) + (type $FUNCSIG$vi (func (param i32))) + (type $FUNCSIG$vii (func (param i32 i32))) + (type $FUNCSIG$i (func (result i32))) + (type $FUNCSIG$iii (func (param i32 i32) (result i32))) + (type $FUNCSIG$d (func (result f64))) + (type $FUNCSIG$viiii (func (param i32 i32 i32 i32))) + (type $FUNCSIG$jjjj (func (param i64 i64 i64) (result i64))) + (type $FUNCSIG$iiii (func (param i32 i32 i32) (result i32))) + (type $FUNCSIG$vjjif (func (param i64 i64 i32 f32))) + (type $FUNCSIG$iiiiii (func (param i32 i32 i32 i32 i32) (result i32))) (memory $0 (shared 1 1)) (export "replaced-print-internal" (func $55)) - (func $figure-1a (; 0 ;) (type $0) (param $a i64) (param $x i64) (param $y i64) (result i32) + (func $figure-1a (; 0 ;) (type $FUNCSIG$ijjj) (param $a i64) (param $x i64) (param $y i64) (result i32) (local $i i32) (local $j i32) (local $r i32) @@ -1505,7 +1505,7 @@ infer %4 (local.get $16) ) ) - (func $figure-1b (; 1 ;) (type $0) (param $a i64) (param $x i64) (param $y i64) (result i32) + (func $figure-1b (; 1 ;) (type $FUNCSIG$ijjj) (param $a i64) (param $x i64) (param $y i64) (result i32) (local $i i32) (local $j i32) (local $r i32) @@ -1581,7 +1581,7 @@ infer %4 ) (unreachable) ) - (func $figure-3-if (; 2 ;) (type $1) (param $x i32) (result i32) + (func $figure-3-if (; 2 ;) (type $FUNCSIG$ii) (param $x i32) (result i32) (local $1 i32) (local $2 i32) (local $3 i32) @@ -1645,7 +1645,7 @@ infer %4 (local.get $9) ) ) - (func $flips (; 3 ;) (type $2) + (func $flips (; 3 ;) (type $FUNCSIG$v) (local $x i32) (local $y i32) (local $2 i32) @@ -1704,7 +1704,7 @@ infer %4 ) (nop) ) - (func $various-conditions-1 (; 4 ;) (type $3) (param $x i32) + (func $various-conditions-1 (; 4 ;) (type $FUNCSIG$vi) (param $x i32) (local $1 i32) (local $2 i32) (local $3 i32) @@ -1727,7 +1727,7 @@ infer %4 ) (nop) ) - (func $various-conditions-2 (; 5 ;) (type $3) (param $x i32) + (func $various-conditions-2 (; 5 ;) (type $FUNCSIG$vi) (param $x i32) (local $1 i32) (local $2 i32) (local $3 i32) @@ -1757,7 +1757,7 @@ infer %4 ) (nop) ) - (func $various-conditions-3 (; 6 ;) (type $3) (param $x i32) + (func $various-conditions-3 (; 6 ;) (type $FUNCSIG$vi) (param $x i32) (local $1 i32) (local $2 i32) (local $3 i32) @@ -1784,7 +1784,7 @@ infer %4 ) (nop) ) - (func $various-conditions-4 (; 7 ;) (type $3) (param $x i32) + (func $various-conditions-4 (; 7 ;) (type $FUNCSIG$vi) (param $x i32) (local $1 i32) (local $2 i32) (block @@ -1806,7 +1806,7 @@ infer %4 ) (unreachable) ) - (func $unaries (; 8 ;) (type $4) (param $x i32) (param $y i32) + (func $unaries (; 8 ;) (type $FUNCSIG$vii) (param $x i32) (param $y i32) (local $2 i32) (local $3 i32) (local $4 i32) @@ -1864,7 +1864,7 @@ infer %4 ) (nop) ) - (func $unary-condition (; 9 ;) (type $3) (param $x i32) + (func $unary-condition (; 9 ;) (type $FUNCSIG$vi) (param $x i32) (local $1 i32) (local $2 i32) (local $3 i32) @@ -1900,7 +1900,7 @@ infer %4 ) (nop) ) - (func $unary-condition-2 (; 10 ;) (type $3) (param $x i32) + (func $unary-condition-2 (; 10 ;) (type $FUNCSIG$vi) (param $x i32) (local $1 i32) (local $2 i32) (local $3 i32) @@ -1936,7 +1936,7 @@ infer %4 ) (nop) ) - (func $if-else-cond (; 11 ;) (type $1) (param $x i32) (result i32) + (func $if-else-cond (; 11 ;) (type $FUNCSIG$ii) (param $x i32) (result i32) (local $1 i32) (local $2 i32) (local $3 i32) @@ -2000,7 +2000,7 @@ infer %4 (local.get $9) ) ) - (func $trivial-ret (; 12 ;) (type $5) (result i32) + (func $trivial-ret (; 12 ;) (type $FUNCSIG$i) (result i32) (local $0 i32) (local.set $0 (i32.add @@ -2012,12 +2012,12 @@ infer %4 (local.get $0) ) ) - (func $trivial-const (; 13 ;) (type $5) (result i32) + (func $trivial-const (; 13 ;) (type $FUNCSIG$i) (result i32) (return (i32.const 0) ) ) - (func $trivial-const-block (; 14 ;) (type $5) (result i32) + (func $trivial-const-block (; 14 ;) (type $FUNCSIG$i) (result i32) (local $0 i32) (local $1 i32) (block @@ -2031,7 +2031,7 @@ infer %4 (local.get $1) ) ) - (func $bad-phi-value (; 15 ;) (type $5) (result i32) + (func $bad-phi-value (; 15 ;) (type $FUNCSIG$i) (result i32) (local $0 i32) (local $1 i32) (local $2 i32) @@ -2068,7 +2068,7 @@ infer %4 (local.get $3) ) ) - (func $bad-phi-value-2 (; 16 ;) (type $1) (param $x i32) (result i32) + (func $bad-phi-value-2 (; 16 ;) (type $FUNCSIG$ii) (param $x i32) (result i32) (local $1 i32) (local $2 i32) (local $3 i32) @@ -2117,7 +2117,7 @@ infer %4 (local.get $x) ) ) - (func $select (; 17 ;) (type $1) (param $x i32) (result i32) + (func $select (; 17 ;) (type $FUNCSIG$ii) (param $x i32) (result i32) (local $1 i32) (local.set $1 (select @@ -2131,7 +2131,7 @@ infer %4 ) (unreachable) ) - (func $select-2 (; 18 ;) (type $6) (param $x i32) (param $y i32) (result i32) + (func $select-2 (; 18 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (local $2 i32) (local $3 i32) (local $4 i32) @@ -2174,7 +2174,7 @@ infer %4 ) (unreachable) ) - (func $block-phi-1 (; 19 ;) (type $6) (param $x i32) (param $y i32) (result i32) + (func $block-phi-1 (; 19 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (local $2 i32) (local $3 i32) (local $4 i32) @@ -2225,7 +2225,7 @@ infer %4 (local.get $10) ) ) - (func $block-phi-2 (; 20 ;) (type $6) (param $x i32) (param $y i32) (result i32) + (func $block-phi-2 (; 20 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (local $2 i32) (local $3 i32) (local $4 i32) @@ -2262,7 +2262,7 @@ infer %4 (local.get $6) ) ) - (func $zero_init-phi-bad_type (; 21 ;) (type $7) (result f64) + (func $zero_init-phi-bad_type (; 21 ;) (type $FUNCSIG$d) (result f64) (local $x f64) (local $1 f64) (local $2 f64) @@ -2286,7 +2286,7 @@ infer %4 (local.get $x) ) ) - (func $phi-bad-type (; 22 ;) (type $7) (result f64) + (func $phi-bad-type (; 22 ;) (type $FUNCSIG$d) (result f64) (local $0 f64) (local $1 f64) (local $2 f64) @@ -2309,7 +2309,7 @@ infer %4 (local.get $0) ) ) - (func $phi-one-side-i1 (; 23 ;) (type $6) (param $x i32) (param $y i32) (result i32) + (func $phi-one-side-i1 (; 23 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (local $i i32) (local $3 i32) (local $4 i32) @@ -2370,7 +2370,7 @@ infer %4 (local.get $i) ) ) - (func $call (; 24 ;) (type $5) (result i32) + (func $call (; 24 ;) (type $FUNCSIG$i) (result i32) (local $0 i32) (local $1 i32) (local $2 i32) @@ -2409,7 +2409,7 @@ infer %4 ) (unreachable) ) - (func $in-unreachable-1 (; 25 ;) (type $6) (param $x i32) (param $y i32) (result i32) + (func $in-unreachable-1 (; 25 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (local $2 i32) (local $3 i32) (local $4 i32) @@ -2454,7 +2454,7 @@ infer %4 (local.get $5) ) ) - (func $in-unreachable-2 (; 26 ;) (type $6) (param $x i32) (param $y i32) (result i32) + (func $in-unreachable-2 (; 26 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (local $2 i32) (local $3 i32) (local $4 i32) @@ -2495,7 +2495,7 @@ infer %4 (local.get $4) ) ) - (func $in-unreachable-3 (; 27 ;) (type $6) (param $x i32) (param $y i32) (result i32) + (func $in-unreachable-3 (; 27 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (local $2 i32) (local $3 i32) (local $4 i32) @@ -2545,7 +2545,7 @@ infer %4 (local.get $5) ) ) - (func $in-unreachable-4 (; 28 ;) (type $6) (param $x i32) (param $y i32) (result i32) + (func $in-unreachable-4 (; 28 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (local $2 i32) (local $3 i32) (local $4 i32) @@ -2597,7 +2597,7 @@ infer %4 (local.get $5) ) ) - (func $in-unreachable-br_if (; 29 ;) (type $6) (param $x i32) (param $y i32) (result i32) + (func $in-unreachable-br_if (; 29 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (local $2 i32) (local $3 i32) (local $4 i32) @@ -2651,7 +2651,7 @@ infer %4 (local.get $6) ) ) - (func $in-unreachable-big (; 30 ;) (type $8) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) + (func $in-unreachable-big (; 30 ;) (type $FUNCSIG$viiii) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (local $4 i32) (local $5 i32) (local $6 i32) @@ -2733,7 +2733,7 @@ infer %4 ) (nop) ) - (func $in-unreachable-operations (; 31 ;) (type $6) (param $x i32) (param $y i32) (result i32) + (func $in-unreachable-operations (; 31 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (local $2 i32) (local $3 i32) (block $block @@ -2766,7 +2766,7 @@ infer %4 ) (unreachable) ) - (func $merge-with-one-less (; 32 ;) (type $1) (param $var$0 i32) (result i32) + (func $merge-with-one-less (; 32 ;) (type $FUNCSIG$ii) (param $var$0 i32) (result i32) (local $1 i32) (local $2 i32) (local $3 i32) @@ -2835,7 +2835,7 @@ infer %4 (local.get $6) ) ) - (func $deep (; 33 ;) (type $1) (param $x i32) (result i32) + (func $deep (; 33 ;) (type $FUNCSIG$ii) (param $x i32) (result i32) (local $1 i32) (local $2 i32) (local $3 i32) @@ -3134,7 +3134,7 @@ infer %4 (local.get $x) ) ) - (func $two-pcs (; 34 ;) (type $9) (param $x i64) (param $y i64) (param $t i64) (result i64) + (func $two-pcs (; 34 ;) (type $FUNCSIG$jjjj) (param $x i64) (param $y i64) (param $t i64) (result i64) (local $3 i64) (local $4 i64) (local $5 i32) @@ -3259,7 +3259,7 @@ infer %4 (local.get $23) ) ) - (func $loop-1 (; 35 ;) (type $6) (param $x i32) (param $y i32) (result i32) + (func $loop-1 (; 35 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (local $2 i32) (local $3 i32) (local $4 i32) @@ -3296,7 +3296,7 @@ infer %4 (local.get $5) ) ) - (func $loop-2 (; 36 ;) (type $6) (param $x i32) (param $y i32) (result i32) + (func $loop-2 (; 36 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (local $2 i32) (local $3 i32) (local $4 i32) @@ -3357,7 +3357,7 @@ infer %4 (local.get $9) ) ) - (func $loop-3 (; 37 ;) (type $6) (param $x i32) (param $y i32) (result i32) + (func $loop-3 (; 37 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (local $2 i32) (local $3 i32) (local $4 i32) @@ -3424,7 +3424,7 @@ infer %4 (local.get $10) ) ) - (func $loop-4 (; 38 ;) (type $6) (param $x i32) (param $y i32) (result i32) + (func $loop-4 (; 38 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (local $2 i32) (local $3 i32) (local $4 i32) @@ -3480,7 +3480,7 @@ infer %4 (local.get $8) ) ) - (func $loop-5 (; 39 ;) (type $6) (param $x i32) (param $y i32) (result i32) + (func $loop-5 (; 39 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (local $2 i32) (local $3 i32) (local $4 i32) @@ -3540,7 +3540,7 @@ infer %4 (local.get $8) ) ) - (func $loop-6 (; 40 ;) (type $6) (param $x i32) (param $y i32) (result i32) + (func $loop-6 (; 40 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (local $2 i32) (local $3 i32) (local $4 i32) @@ -3600,7 +3600,7 @@ infer %4 (local.get $9) ) ) - (func $loop-7 (; 41 ;) (type $6) (param $x i32) (param $y i32) (result i32) + (func $loop-7 (; 41 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (local $2 i32) (local $3 i32) (local $4 i32) @@ -3660,7 +3660,7 @@ infer %4 (local.get $8) ) ) - (func $loop-8 (; 42 ;) (type $6) (param $x i32) (param $y i32) (result i32) + (func $loop-8 (; 42 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (local $z i32) (local $w i32) (local $4 i32) @@ -3745,7 +3745,7 @@ infer %4 (local.get $14) ) ) - (func $loop-9 (; 43 ;) (type $6) (param $x i32) (param $y i32) (result i32) + (func $loop-9 (; 43 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (local $t i32) (local $3 i32) (local $4 i32) @@ -3809,7 +3809,7 @@ infer %4 (local.get $10) ) ) - (func $loop-10 (; 44 ;) (type $6) (param $x i32) (param $y i32) (result i32) + (func $loop-10 (; 44 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (local $t i32) (local $3 i32) (local $4 i32) @@ -3873,7 +3873,7 @@ infer %4 (local.get $10) ) ) - (func $loop-multicond-1 (; 45 ;) (type $10) (param $x i32) (param $y i32) (param $z i32) (result i32) + (func $loop-multicond-1 (; 45 ;) (type $FUNCSIG$iiii) (param $x i32) (param $y i32) (param $z i32) (result i32) (local $t i32) (local $4 i32) (local $5 i32) @@ -3944,7 +3944,7 @@ infer %4 (local.get $10) ) ) - (func $loop-multicond-2 (; 46 ;) (type $10) (param $x i32) (param $y i32) (param $z i32) (result i32) + (func $loop-multicond-2 (; 46 ;) (type $FUNCSIG$iiii) (param $x i32) (param $y i32) (param $z i32) (result i32) (local $t i32) (local $4 i32) (local $5 i32) @@ -4036,7 +4036,7 @@ infer %4 (local.get $16) ) ) - (func $loop-block-1 (; 47 ;) (type $10) (param $x i32) (param $y i32) (param $z i32) (result i32) + (func $loop-block-1 (; 47 ;) (type $FUNCSIG$iiii) (param $x i32) (param $y i32) (param $z i32) (result i32) (local $t i32) (local $4 i32) (local $5 i32) @@ -4130,7 +4130,7 @@ infer %4 (local.get $16) ) ) - (func $loop-block-2 (; 48 ;) (type $10) (param $x i32) (param $y i32) (param $z i32) (result i32) + (func $loop-block-2 (; 48 ;) (type $FUNCSIG$iiii) (param $x i32) (param $y i32) (param $z i32) (result i32) (local $t i32) (local $4 i32) (local $5 i32) @@ -4227,7 +4227,7 @@ infer %4 (local.get $16) ) ) - (func $bad-phi-type (; 49 ;) (type $11) (param $var$0 i64) (param $var$1 i64) (param $var$2 i32) (param $var$3 f32) + (func $bad-phi-type (; 49 ;) (type $FUNCSIG$vjjif) (param $var$0 i64) (param $var$1 i64) (param $var$2 i32) (param $var$3 f32) (local $4 i32) (local $5 i32) (local $6 i32) @@ -4290,7 +4290,7 @@ infer %4 ) (nop) ) - (func $loop-unreachable (; 50 ;) (type $2) + (func $loop-unreachable (; 50 ;) (type $FUNCSIG$v) (local $var$0 i32) (local $var$1 f64) (local $2 i32) @@ -4375,7 +4375,7 @@ infer %4 ) (unreachable) ) - (func $phi-value-turns-bad (; 51 ;) (type $7) (result f64) + (func $phi-value-turns-bad (; 51 ;) (type $FUNCSIG$d) (result f64) (local $var$0 i32) (local $var$1 i32) (local $var$2 f32) @@ -4460,7 +4460,7 @@ infer %4 (local.get $16) ) ) - (func $multi-use (; 52 ;) (type $1) (param $x i32) (result i32) + (func $multi-use (; 52 ;) (type $FUNCSIG$ii) (param $x i32) (result i32) (local $temp i32) (local $2 i32) (local $3 i32) @@ -4494,7 +4494,7 @@ infer %4 (local.get $8) ) ) - (func $multi-use-2 (; 53 ;) (type $1) (param $x i32) (result i32) + (func $multi-use-2 (; 53 ;) (type $FUNCSIG$ii) (param $x i32) (result i32) (local $temp i32) (local $2 i32) (local $3 i32) @@ -4539,7 +4539,7 @@ infer %4 (local.get $10) ) ) - (func $many-single-uses-with-param (; 54 ;) (type $1) (param $x i32) (result i32) + (func $many-single-uses-with-param (; 54 ;) (type $FUNCSIG$ii) (param $x i32) (result i32) (local $1 i32) (local $2 i32) (local $3 i32) @@ -4582,7 +4582,7 @@ infer %4 ) (unreachable) ) - (func $55 (; 55 ;) (type $3) (param $var$0 i32) + (func $55 (; 55 ;) (type $FUNCSIG$vi) (param $var$0 i32) (local $var$1 i32) (local $var$2 i32) (local $var$3 i32) @@ -4669,7 +4669,7 @@ infer %4 ) (nop) ) - (func $multiple-uses-to-non-expression (; 56 ;) (type $3) (param $x i32) + (func $multiple-uses-to-non-expression (; 56 ;) (type $FUNCSIG$vi) (param $x i32) (local $temp i32) (local $2 i32) (local $3 i32) @@ -4707,7 +4707,7 @@ infer %4 ) (nop) ) - (func $nested-phi-forwarding (; 57 ;) (type $1) (param $var$0 i32) (result i32) + (func $nested-phi-forwarding (; 57 ;) (type $FUNCSIG$ii) (param $var$0 i32) (result i32) (local $var$1 i32) (local $var$2 i32) (local $3 i32) @@ -4799,7 +4799,7 @@ infer %4 (local.get $9) ) ) - (func $zext-numGets (; 58 ;) (type $4) (param $var$0 i32) (param $var$1 i32) + (func $zext-numGets (; 58 ;) (type $FUNCSIG$vii) (param $var$0 i32) (param $var$1 i32) (local $2 i32) (local $3 i32) (local $4 i32) @@ -4853,7 +4853,7 @@ infer %4 ) (nop) ) - (func $zext-numGets-hasAnotherUse (; 59 ;) (type $4) (param $var$0 i32) (param $var$1 i32) + (func $zext-numGets-hasAnotherUse (; 59 ;) (type $FUNCSIG$vii) (param $var$0 i32) (param $var$1 i32) (local $temp i32) (local $3 i32) (local $4 i32) @@ -4920,7 +4920,7 @@ infer %4 ) (nop) ) - (func $flipped-needs-right-origin (; 60 ;) (type $1) (param $var$0 i32) (result i32) + (func $flipped-needs-right-origin (; 60 ;) (type $FUNCSIG$ii) (param $var$0 i32) (result i32) (local $var$1 i32) (local $2 i32) (local $3 i32) @@ -4977,7 +4977,7 @@ infer %4 (local.get $7) ) ) - (func $non-expr-nodes-may-have-multiple-uses-too-its-the-ORIGIN (; 61 ;) (type $10) (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (result i32) + (func $non-expr-nodes-may-have-multiple-uses-too-its-the-ORIGIN (; 61 ;) (type $FUNCSIG$iiii) (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (result i32) (local $3 i32) (local $4 i32) (local $5 i32) @@ -5020,7 +5020,7 @@ infer %4 (local.get $8) ) ) - (func $loop-of-set-connections (; 62 ;) (type $12) (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (param $var$3 i32) (param $var$4 i32) (result i32) + (func $loop-of-set-connections (; 62 ;) (type $FUNCSIG$iiiiii) (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (param $var$3 i32) (param $var$4 i32) (result i32) (local $5 i32) (local $6 i32) (local $7 i32) @@ -5058,7 +5058,7 @@ infer %4 ) (unreachable) ) - (func $conditions-in-conditions (; 63 ;) (type $10) (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (result i32) + (func $conditions-in-conditions (; 63 ;) (type $FUNCSIG$iiii) (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (result i32) (local $var$3 i32) (local $var$4 i32) (local $var$5 i32) diff --git a/test/passes/flatten_simplify-locals-nonesting_souperify-single-use_enable-threads.wast b/test/passes/flatten_simplify-locals-nonesting_souperify-single-use_enable-threads.wast index cfb94aa5c..709a3645a 100644 --- a/test/passes/flatten_simplify-locals-nonesting_souperify-single-use_enable-threads.wast +++ b/test/passes/flatten_simplify-locals-nonesting_souperify-single-use_enable-threads.wast @@ -609,8 +609,7 @@ (local.set $x (i32.mul (local.get $x) (i32.const 1234))) (local.get $x) ) - (func $two-pcs (param $x i64) (param $y i64) (result i64) - (param $t i64) + (func $two-pcs (param $x i64) (param $y i64) (param $t i64) (result i64) (if (i64.lt_s (local.get $x) diff --git a/test/passes/flatten_simplify-locals-nonesting_souperify_enable-threads.txt b/test/passes/flatten_simplify-locals-nonesting_souperify_enable-threads.txt index 6d70acdcd..9be4da146 100644 --- a/test/passes/flatten_simplify-locals-nonesting_souperify_enable-threads.txt +++ b/test/passes/flatten_simplify-locals-nonesting_souperify_enable-threads.txt @@ -1473,22 +1473,22 @@ blockpc %0 1 %10 1:i1 infer %4 (module - (type $0 (func (param i64 i64 i64) (result i32))) - (type $1 (func (param i32) (result i32))) - (type $2 (func (param i32))) - (type $3 (func)) - (type $4 (func (param i32 i32))) - (type $5 (func (result i32))) - (type $6 (func (param i32 i32) (result i32))) - (type $7 (func (result f64))) - (type $8 (func (param i32 i32 i32 i32))) - (type $9 (func (param i64 i64 i64) (result i64))) - (type $10 (func (param i32 i32 i32) (result i32))) - (type $11 (func (param i64 i64 i32 f32))) - (type $12 (func (param i32 i32 i32 i32 i32) (result i32))) + (type $FUNCSIG$ijjj (func (param i64 i64 i64) (result i32))) + (type $FUNCSIG$ii (func (param i32) (result i32))) + (type $FUNCSIG$vi (func (param i32))) + (type $FUNCSIG$v (func)) + (type $FUNCSIG$vii (func (param i32 i32))) + (type $FUNCSIG$i (func (result i32))) + (type $FUNCSIG$iii (func (param i32 i32) (result i32))) + (type $FUNCSIG$d (func (result f64))) + (type $FUNCSIG$viiii (func (param i32 i32 i32 i32))) + (type $FUNCSIG$jjjj (func (param i64 i64 i64) (result i64))) + (type $FUNCSIG$iiii (func (param i32 i32 i32) (result i32))) + (type $FUNCSIG$vjjif (func (param i64 i64 i32 f32))) + (type $FUNCSIG$iiiiii (func (param i32 i32 i32 i32 i32) (result i32))) (memory $0 (shared 1 1)) (export "replaced-print-internal" (func $56)) - (func $figure-1a (; 0 ;) (type $0) (param $a i64) (param $x i64) (param $y i64) (result i32) + (func $figure-1a (; 0 ;) (type $FUNCSIG$ijjj) (param $a i64) (param $x i64) (param $y i64) (result i32) (local $i i32) (local $j i32) (local $r i32) @@ -1546,7 +1546,7 @@ infer %4 (local.get $16) ) ) - (func $figure-1b (; 1 ;) (type $0) (param $a i64) (param $x i64) (param $y i64) (result i32) + (func $figure-1b (; 1 ;) (type $FUNCSIG$ijjj) (param $a i64) (param $x i64) (param $y i64) (result i32) (local $i i32) (local $j i32) (local $r i32) @@ -1622,7 +1622,7 @@ infer %4 ) (unreachable) ) - (func $figure-3-if (; 2 ;) (type $1) (param $x i32) (result i32) + (func $figure-3-if (; 2 ;) (type $FUNCSIG$ii) (param $x i32) (result i32) (local $1 i32) (local $2 i32) (local $3 i32) @@ -1686,10 +1686,10 @@ infer %4 (local.get $9) ) ) - (func $send-i32 (; 3 ;) (type $2) (param $0 i32) + (func $send-i32 (; 3 ;) (type $FUNCSIG$vi) (param $0 i32) (nop) ) - (func $flips (; 4 ;) (type $3) + (func $flips (; 4 ;) (type $FUNCSIG$v) (local $x i32) (local $y i32) (local $z i64) @@ -1810,7 +1810,7 @@ infer %4 ) (nop) ) - (func $various-conditions-1 (; 5 ;) (type $2) (param $x i32) + (func $various-conditions-1 (; 5 ;) (type $FUNCSIG$vi) (param $x i32) (local $1 i32) (local $2 i32) (local $3 i32) @@ -1833,7 +1833,7 @@ infer %4 ) (nop) ) - (func $various-conditions-2 (; 6 ;) (type $2) (param $x i32) + (func $various-conditions-2 (; 6 ;) (type $FUNCSIG$vi) (param $x i32) (local $1 i32) (local $2 i32) (local $3 i32) @@ -1863,7 +1863,7 @@ infer %4 ) (nop) ) - (func $various-conditions-3 (; 7 ;) (type $2) (param $x i32) + (func $various-conditions-3 (; 7 ;) (type $FUNCSIG$vi) (param $x i32) (local $1 i32) (local $2 i32) (local $3 i32) @@ -1890,7 +1890,7 @@ infer %4 ) (nop) ) - (func $various-conditions-4 (; 8 ;) (type $2) (param $x i32) + (func $various-conditions-4 (; 8 ;) (type $FUNCSIG$vi) (param $x i32) (local $1 i32) (local $2 i32) (block @@ -1912,7 +1912,7 @@ infer %4 ) (unreachable) ) - (func $unaries (; 9 ;) (type $4) (param $x i32) (param $y i32) + (func $unaries (; 9 ;) (type $FUNCSIG$vii) (param $x i32) (param $y i32) (local $2 i32) (local $3 i32) (local $4 i32) @@ -1970,7 +1970,7 @@ infer %4 ) (nop) ) - (func $unary-condition (; 10 ;) (type $2) (param $x i32) + (func $unary-condition (; 10 ;) (type $FUNCSIG$vi) (param $x i32) (local $1 i32) (local $2 i32) (local $3 i32) @@ -2006,7 +2006,7 @@ infer %4 ) (nop) ) - (func $unary-condition-2 (; 11 ;) (type $2) (param $x i32) + (func $unary-condition-2 (; 11 ;) (type $FUNCSIG$vi) (param $x i32) (local $1 i32) (local $2 i32) (local $3 i32) @@ -2042,7 +2042,7 @@ infer %4 ) (nop) ) - (func $if-else-cond (; 12 ;) (type $1) (param $x i32) (result i32) + (func $if-else-cond (; 12 ;) (type $FUNCSIG$ii) (param $x i32) (result i32) (local $1 i32) (local $2 i32) (local $3 i32) @@ -2106,7 +2106,7 @@ infer %4 (local.get $9) ) ) - (func $trivial-ret (; 13 ;) (type $5) (result i32) + (func $trivial-ret (; 13 ;) (type $FUNCSIG$i) (result i32) (local $0 i32) (local.set $0 (i32.add @@ -2118,12 +2118,12 @@ infer %4 (local.get $0) ) ) - (func $trivial-const (; 14 ;) (type $5) (result i32) + (func $trivial-const (; 14 ;) (type $FUNCSIG$i) (result i32) (return (i32.const 0) ) ) - (func $trivial-const-block (; 15 ;) (type $5) (result i32) + (func $trivial-const-block (; 15 ;) (type $FUNCSIG$i) (result i32) (local $0 i32) (local $1 i32) (block @@ -2137,7 +2137,7 @@ infer %4 (local.get $1) ) ) - (func $bad-phi-value (; 16 ;) (type $5) (result i32) + (func $bad-phi-value (; 16 ;) (type $FUNCSIG$i) (result i32) (local $0 i32) (local $1 i32) (local $2 i32) @@ -2174,7 +2174,7 @@ infer %4 (local.get $3) ) ) - (func $bad-phi-value-2 (; 17 ;) (type $1) (param $x i32) (result i32) + (func $bad-phi-value-2 (; 17 ;) (type $FUNCSIG$ii) (param $x i32) (result i32) (local $1 i32) (local $2 i32) (local $3 i32) @@ -2223,7 +2223,7 @@ infer %4 (local.get $x) ) ) - (func $select (; 18 ;) (type $1) (param $x i32) (result i32) + (func $select (; 18 ;) (type $FUNCSIG$ii) (param $x i32) (result i32) (local $1 i32) (local.set $1 (select @@ -2237,7 +2237,7 @@ infer %4 ) (unreachable) ) - (func $select-2 (; 19 ;) (type $6) (param $x i32) (param $y i32) (result i32) + (func $select-2 (; 19 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (local $2 i32) (local $3 i32) (local $4 i32) @@ -2280,7 +2280,7 @@ infer %4 ) (unreachable) ) - (func $block-phi-1 (; 20 ;) (type $6) (param $x i32) (param $y i32) (result i32) + (func $block-phi-1 (; 20 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (local $2 i32) (local $3 i32) (local $4 i32) @@ -2331,7 +2331,7 @@ infer %4 (local.get $10) ) ) - (func $block-phi-2 (; 21 ;) (type $6) (param $x i32) (param $y i32) (result i32) + (func $block-phi-2 (; 21 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (local $2 i32) (local $3 i32) (local $4 i32) @@ -2368,7 +2368,7 @@ infer %4 (local.get $6) ) ) - (func $zero_init-phi-bad_type (; 22 ;) (type $7) (result f64) + (func $zero_init-phi-bad_type (; 22 ;) (type $FUNCSIG$d) (result f64) (local $x f64) (local $1 f64) (local $2 f64) @@ -2392,7 +2392,7 @@ infer %4 (local.get $x) ) ) - (func $phi-bad-type (; 23 ;) (type $7) (result f64) + (func $phi-bad-type (; 23 ;) (type $FUNCSIG$d) (result f64) (local $0 f64) (local $1 f64) (local $2 f64) @@ -2415,7 +2415,7 @@ infer %4 (local.get $0) ) ) - (func $phi-one-side-i1 (; 24 ;) (type $6) (param $x i32) (param $y i32) (result i32) + (func $phi-one-side-i1 (; 24 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (local $i i32) (local $3 i32) (local $4 i32) @@ -2476,7 +2476,7 @@ infer %4 (local.get $i) ) ) - (func $call (; 25 ;) (type $5) (result i32) + (func $call (; 25 ;) (type $FUNCSIG$i) (result i32) (local $0 i32) (local $1 i32) (local $2 i32) @@ -2515,7 +2515,7 @@ infer %4 ) (unreachable) ) - (func $in-unreachable-1 (; 26 ;) (type $6) (param $x i32) (param $y i32) (result i32) + (func $in-unreachable-1 (; 26 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (local $2 i32) (local $3 i32) (local $4 i32) @@ -2560,7 +2560,7 @@ infer %4 (local.get $5) ) ) - (func $in-unreachable-2 (; 27 ;) (type $6) (param $x i32) (param $y i32) (result i32) + (func $in-unreachable-2 (; 27 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (local $2 i32) (local $3 i32) (local $4 i32) @@ -2601,7 +2601,7 @@ infer %4 (local.get $4) ) ) - (func $in-unreachable-3 (; 28 ;) (type $6) (param $x i32) (param $y i32) (result i32) + (func $in-unreachable-3 (; 28 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (local $2 i32) (local $3 i32) (local $4 i32) @@ -2651,7 +2651,7 @@ infer %4 (local.get $5) ) ) - (func $in-unreachable-4 (; 29 ;) (type $6) (param $x i32) (param $y i32) (result i32) + (func $in-unreachable-4 (; 29 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (local $2 i32) (local $3 i32) (local $4 i32) @@ -2703,7 +2703,7 @@ infer %4 (local.get $5) ) ) - (func $in-unreachable-br_if (; 30 ;) (type $6) (param $x i32) (param $y i32) (result i32) + (func $in-unreachable-br_if (; 30 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (local $2 i32) (local $3 i32) (local $4 i32) @@ -2757,7 +2757,7 @@ infer %4 (local.get $6) ) ) - (func $in-unreachable-big (; 31 ;) (type $8) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) + (func $in-unreachable-big (; 31 ;) (type $FUNCSIG$viiii) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (local $4 i32) (local $5 i32) (local $6 i32) @@ -2839,7 +2839,7 @@ infer %4 ) (nop) ) - (func $in-unreachable-operations (; 32 ;) (type $6) (param $x i32) (param $y i32) (result i32) + (func $in-unreachable-operations (; 32 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (local $2 i32) (local $3 i32) (block $block @@ -2872,7 +2872,7 @@ infer %4 ) (unreachable) ) - (func $merge-with-one-less (; 33 ;) (type $1) (param $var$0 i32) (result i32) + (func $merge-with-one-less (; 33 ;) (type $FUNCSIG$ii) (param $var$0 i32) (result i32) (local $1 i32) (local $2 i32) (local $3 i32) @@ -2941,7 +2941,7 @@ infer %4 (local.get $6) ) ) - (func $deep (; 34 ;) (type $1) (param $x i32) (result i32) + (func $deep (; 34 ;) (type $FUNCSIG$ii) (param $x i32) (result i32) (local $1 i32) (local $2 i32) (local $3 i32) @@ -3240,7 +3240,7 @@ infer %4 (local.get $x) ) ) - (func $two-pcs (; 35 ;) (type $9) (param $x i64) (param $y i64) (param $t i64) (result i64) + (func $two-pcs (; 35 ;) (type $FUNCSIG$jjjj) (param $x i64) (param $y i64) (param $t i64) (result i64) (local $3 i64) (local $4 i64) (local $5 i32) @@ -3365,7 +3365,7 @@ infer %4 (local.get $23) ) ) - (func $loop-1 (; 36 ;) (type $6) (param $x i32) (param $y i32) (result i32) + (func $loop-1 (; 36 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (local $2 i32) (local $3 i32) (local $4 i32) @@ -3402,7 +3402,7 @@ infer %4 (local.get $5) ) ) - (func $loop-2 (; 37 ;) (type $6) (param $x i32) (param $y i32) (result i32) + (func $loop-2 (; 37 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (local $2 i32) (local $3 i32) (local $4 i32) @@ -3463,7 +3463,7 @@ infer %4 (local.get $9) ) ) - (func $loop-3 (; 38 ;) (type $6) (param $x i32) (param $y i32) (result i32) + (func $loop-3 (; 38 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (local $2 i32) (local $3 i32) (local $4 i32) @@ -3530,7 +3530,7 @@ infer %4 (local.get $10) ) ) - (func $loop-4 (; 39 ;) (type $6) (param $x i32) (param $y i32) (result i32) + (func $loop-4 (; 39 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (local $2 i32) (local $3 i32) (local $4 i32) @@ -3586,7 +3586,7 @@ infer %4 (local.get $8) ) ) - (func $loop-5 (; 40 ;) (type $6) (param $x i32) (param $y i32) (result i32) + (func $loop-5 (; 40 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (local $2 i32) (local $3 i32) (local $4 i32) @@ -3646,7 +3646,7 @@ infer %4 (local.get $8) ) ) - (func $loop-6 (; 41 ;) (type $6) (param $x i32) (param $y i32) (result i32) + (func $loop-6 (; 41 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (local $2 i32) (local $3 i32) (local $4 i32) @@ -3706,7 +3706,7 @@ infer %4 (local.get $9) ) ) - (func $loop-7 (; 42 ;) (type $6) (param $x i32) (param $y i32) (result i32) + (func $loop-7 (; 42 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (local $2 i32) (local $3 i32) (local $4 i32) @@ -3766,7 +3766,7 @@ infer %4 (local.get $8) ) ) - (func $loop-8 (; 43 ;) (type $6) (param $x i32) (param $y i32) (result i32) + (func $loop-8 (; 43 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (local $z i32) (local $w i32) (local $4 i32) @@ -3851,7 +3851,7 @@ infer %4 (local.get $14) ) ) - (func $loop-9 (; 44 ;) (type $6) (param $x i32) (param $y i32) (result i32) + (func $loop-9 (; 44 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (local $t i32) (local $3 i32) (local $4 i32) @@ -3915,7 +3915,7 @@ infer %4 (local.get $10) ) ) - (func $loop-10 (; 45 ;) (type $6) (param $x i32) (param $y i32) (result i32) + (func $loop-10 (; 45 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (local $t i32) (local $3 i32) (local $4 i32) @@ -3979,7 +3979,7 @@ infer %4 (local.get $10) ) ) - (func $loop-multicond-1 (; 46 ;) (type $10) (param $x i32) (param $y i32) (param $z i32) (result i32) + (func $loop-multicond-1 (; 46 ;) (type $FUNCSIG$iiii) (param $x i32) (param $y i32) (param $z i32) (result i32) (local $t i32) (local $4 i32) (local $5 i32) @@ -4050,7 +4050,7 @@ infer %4 (local.get $10) ) ) - (func $loop-multicond-2 (; 47 ;) (type $10) (param $x i32) (param $y i32) (param $z i32) (result i32) + (func $loop-multicond-2 (; 47 ;) (type $FUNCSIG$iiii) (param $x i32) (param $y i32) (param $z i32) (result i32) (local $t i32) (local $4 i32) (local $5 i32) @@ -4142,7 +4142,7 @@ infer %4 (local.get $16) ) ) - (func $loop-block-1 (; 48 ;) (type $10) (param $x i32) (param $y i32) (param $z i32) (result i32) + (func $loop-block-1 (; 48 ;) (type $FUNCSIG$iiii) (param $x i32) (param $y i32) (param $z i32) (result i32) (local $t i32) (local $4 i32) (local $5 i32) @@ -4236,7 +4236,7 @@ infer %4 (local.get $16) ) ) - (func $loop-block-2 (; 49 ;) (type $10) (param $x i32) (param $y i32) (param $z i32) (result i32) + (func $loop-block-2 (; 49 ;) (type $FUNCSIG$iiii) (param $x i32) (param $y i32) (param $z i32) (result i32) (local $t i32) (local $4 i32) (local $5 i32) @@ -4333,7 +4333,7 @@ infer %4 (local.get $16) ) ) - (func $bad-phi-type (; 50 ;) (type $11) (param $var$0 i64) (param $var$1 i64) (param $var$2 i32) (param $var$3 f32) + (func $bad-phi-type (; 50 ;) (type $FUNCSIG$vjjif) (param $var$0 i64) (param $var$1 i64) (param $var$2 i32) (param $var$3 f32) (local $4 i32) (local $5 i32) (local $6 i32) @@ -4396,7 +4396,7 @@ infer %4 ) (nop) ) - (func $loop-unreachable (; 51 ;) (type $3) + (func $loop-unreachable (; 51 ;) (type $FUNCSIG$v) (local $var$0 i32) (local $var$1 f64) (local $2 i32) @@ -4481,7 +4481,7 @@ infer %4 ) (unreachable) ) - (func $phi-value-turns-bad (; 52 ;) (type $7) (result f64) + (func $phi-value-turns-bad (; 52 ;) (type $FUNCSIG$d) (result f64) (local $var$0 i32) (local $var$1 i32) (local $var$2 f32) @@ -4566,7 +4566,7 @@ infer %4 (local.get $16) ) ) - (func $multi-use (; 53 ;) (type $1) (param $x i32) (result i32) + (func $multi-use (; 53 ;) (type $FUNCSIG$ii) (param $x i32) (result i32) (local $temp i32) (local $2 i32) (local $3 i32) @@ -4600,7 +4600,7 @@ infer %4 (local.get $8) ) ) - (func $multi-use-2 (; 54 ;) (type $1) (param $x i32) (result i32) + (func $multi-use-2 (; 54 ;) (type $FUNCSIG$ii) (param $x i32) (result i32) (local $temp i32) (local $2 i32) (local $3 i32) @@ -4645,7 +4645,7 @@ infer %4 (local.get $10) ) ) - (func $many-single-uses-with-param (; 55 ;) (type $1) (param $x i32) (result i32) + (func $many-single-uses-with-param (; 55 ;) (type $FUNCSIG$ii) (param $x i32) (result i32) (local $1 i32) (local $2 i32) (local $3 i32) @@ -4688,7 +4688,7 @@ infer %4 ) (unreachable) ) - (func $56 (; 56 ;) (type $2) (param $var$0 i32) + (func $56 (; 56 ;) (type $FUNCSIG$vi) (param $var$0 i32) (local $var$1 i32) (local $var$2 i32) (local $var$3 i32) @@ -4775,7 +4775,7 @@ infer %4 ) (nop) ) - (func $multiple-uses-to-non-expression (; 57 ;) (type $2) (param $x i32) + (func $multiple-uses-to-non-expression (; 57 ;) (type $FUNCSIG$vi) (param $x i32) (local $temp i32) (local $2 i32) (local $3 i32) @@ -4813,7 +4813,7 @@ infer %4 ) (nop) ) - (func $nested-phi-forwarding (; 58 ;) (type $1) (param $var$0 i32) (result i32) + (func $nested-phi-forwarding (; 58 ;) (type $FUNCSIG$ii) (param $var$0 i32) (result i32) (local $var$1 i32) (local $var$2 i32) (local $3 i32) @@ -4905,7 +4905,7 @@ infer %4 (local.get $9) ) ) - (func $zext-numGets (; 59 ;) (type $4) (param $var$0 i32) (param $var$1 i32) + (func $zext-numGets (; 59 ;) (type $FUNCSIG$vii) (param $var$0 i32) (param $var$1 i32) (local $2 i32) (local $3 i32) (local $4 i32) @@ -4959,7 +4959,7 @@ infer %4 ) (nop) ) - (func $zext-numGets-hasAnotherUse (; 60 ;) (type $4) (param $var$0 i32) (param $var$1 i32) + (func $zext-numGets-hasAnotherUse (; 60 ;) (type $FUNCSIG$vii) (param $var$0 i32) (param $var$1 i32) (local $temp i32) (local $3 i32) (local $4 i32) @@ -5026,7 +5026,7 @@ infer %4 ) (nop) ) - (func $flipped-needs-right-origin (; 61 ;) (type $1) (param $var$0 i32) (result i32) + (func $flipped-needs-right-origin (; 61 ;) (type $FUNCSIG$ii) (param $var$0 i32) (result i32) (local $var$1 i32) (local $2 i32) (local $3 i32) @@ -5083,7 +5083,7 @@ infer %4 (local.get $7) ) ) - (func $non-expr-nodes-may-have-multiple-uses-too-its-the-ORIGIN (; 62 ;) (type $10) (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (result i32) + (func $non-expr-nodes-may-have-multiple-uses-too-its-the-ORIGIN (; 62 ;) (type $FUNCSIG$iiii) (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (result i32) (local $3 i32) (local $4 i32) (local $5 i32) @@ -5126,7 +5126,7 @@ infer %4 (local.get $8) ) ) - (func $loop-of-set-connections (; 63 ;) (type $12) (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (param $var$3 i32) (param $var$4 i32) (result i32) + (func $loop-of-set-connections (; 63 ;) (type $FUNCSIG$iiiiii) (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (param $var$3 i32) (param $var$4 i32) (result i32) (local $5 i32) (local $6 i32) (local $7 i32) @@ -5164,7 +5164,7 @@ infer %4 ) (unreachable) ) - (func $conditions-in-conditions (; 64 ;) (type $10) (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (result i32) + (func $conditions-in-conditions (; 64 ;) (type $FUNCSIG$iiii) (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (result i32) (local $var$3 i32) (local $var$4 i32) (local $var$5 i32) diff --git a/test/passes/flatten_simplify-locals-nonesting_souperify_enable-threads.wast b/test/passes/flatten_simplify-locals-nonesting_souperify_enable-threads.wast index bd1b825b6..a40f81322 100644 --- a/test/passes/flatten_simplify-locals-nonesting_souperify_enable-threads.wast +++ b/test/passes/flatten_simplify-locals-nonesting_souperify_enable-threads.wast @@ -616,8 +616,7 @@ (local.set $x (i32.mul (local.get $x) (i32.const 1234))) (local.get $x) ) - (func $two-pcs (param $x i64) (param $y i64) (result i64) - (param $t i64) + (func $two-pcs (param $x i64) (param $y i64) (param $t i64) (result i64) (if (i64.lt_s (local.get $x) diff --git a/test/passes/fpcast-emu.txt b/test/passes/fpcast-emu.txt index bb0c4950b..012b58708 100644 --- a/test/passes/fpcast-emu.txt +++ b/test/passes/fpcast-emu.txt @@ -456,25 +456,23 @@ ) ) (module - (type $0 (func (param f32))) - (type $1 (func (param f64))) - (type $FUNCSIG$jjjjjjjjjjjjjjjjj (func (param i64 i64 i64 i64 i64 i64 i64 i64 i64 i64 i64 i64 i64 i64 i64 i64) (result i64))) (type $FUNCSIG$vf (func (param f32))) (type $FUNCSIG$vd (func (param f64))) + (type $FUNCSIG$jjjjjjjjjjjjjjjjj (func (param i64 i64 i64 i64 i64 i64 i64 i64 i64 i64 i64 i64 i64 i64 i64 i64) (result i64))) (table $0 42 42 funcref) (elem (i32.const 0) $byn$fpcast-emu$a $byn$fpcast-emu$b) (export "dynCall_vf" (func $dynCall_vf)) (export "dynCall_vd" (func $min_vd)) - (func $a (; 0 ;) (type $0) (param $0 f32) + (func $a (; 0 ;) (type $FUNCSIG$vf) (param $0 f32) (nop) ) - (func $b (; 1 ;) (type $1) (param $0 f64) + (func $b (; 1 ;) (type $FUNCSIG$vd) (param $0 f64) (nop) ) - (func $dynCall_vf (; 2 ;) (type $0) (param $0 f32) + (func $dynCall_vf (; 2 ;) (type $FUNCSIG$vf) (param $0 f32) (nop) ) - (func $min_vd (; 3 ;) (type $0) (param $0 f32) + (func $min_vd (; 3 ;) (type $FUNCSIG$vf) (param $0 f32) (nop) ) (func $byn$fpcast-emu$a (; 4 ;) (type $FUNCSIG$jjjjjjjjjjjjjjjjj) (param $0 i64) (param $1 i64) (param $2 i64) (param $3 i64) (param $4 i64) (param $5 i64) (param $6 i64) (param $7 i64) (param $8 i64) (param $9 i64) (param $10 i64) (param $11 i64) (param $12 i64) (param $13 i64) (param $14 i64) (param $15 i64) (result i64) diff --git a/test/passes/func-metrics.txt b/test/passes/func-metrics.txt index 1ca1c66f5..83aabc2fe 100644 --- a/test/passes/func-metrics.txt +++ b/test/passes/func-metrics.txt @@ -32,16 +32,16 @@ func: ifs if : 4 (module (type $0 (func (param i32))) - (type $1 (func)) + (type $FUNCSIG$v (func)) (memory $0 256 256) (data (i32.const 0) "\ff\ef\0f\1f 0@P\99") (table $0 256 256 funcref) (elem (i32.const 0) $ifs $ifs $ifs) (global $glob i32 (i32.const 1337)) - (func $empty (; 0 ;) (type $1) + (func $empty (; 0 ;) (type $FUNCSIG$v) (nop) ) - (func $small (; 1 ;) (type $1) + (func $small (; 1 ;) (type $FUNCSIG$v) (nop) (drop (i32.const 100421) diff --git a/test/passes/fuzz-exec_O.txt b/test/passes/fuzz-exec_O.txt index 6f6e50674..d25d81dc3 100644 --- a/test/passes/fuzz-exec_O.txt +++ b/test/passes/fuzz-exec_O.txt @@ -3,12 +3,12 @@ [fuzz-exec] calling $func_1 [trap final > memory: 18446744073709551615 > 65514] (module - (type $0 (func (result i64))) - (type $1 (func (result i32))) + (type $FUNCSIG$j (func (result i64))) + (type $FUNCSIG$i (func (result i32))) (memory $0 1 1) (export "func_0" (func $func_0)) (export "func_1" (func $func_1)) - (func $func_0 (; 0 ;) (; has Stack IR ;) (type $0) (result i64) + (func $func_0 (; 0 ;) (; has Stack IR ;) (type $FUNCSIG$j) (result i64) (block $label$0 (result i64) (br_if $label$0 (i64.const 1234) @@ -18,7 +18,7 @@ ) ) ) - (func $func_1 (; 1 ;) (; has Stack IR ;) (type $1) (result i32) + (func $func_1 (; 1 ;) (; has Stack IR ;) (type $FUNCSIG$i) (result i32) (i32.load16_s offset=22 align=1 (i32.const -1) ) diff --git a/test/passes/fuzz-exec_enable-sign-ext.txt b/test/passes/fuzz-exec_enable-sign-ext.txt index 409f93181..d499f208f 100644 --- a/test/passes/fuzz-exec_enable-sign-ext.txt +++ b/test/passes/fuzz-exec_enable-sign-ext.txt @@ -9,34 +9,34 @@ [fuzz-exec] calling $e [fuzz-exec] note result: $e => i64.const -2146649112 (module - (type $0 (func (result i32))) - (type $1 (func (result i64))) + (type $FUNCSIG$i (func (result i32))) + (type $FUNCSIG$j (func (result i64))) (export "a" (func $a)) (export "b" (func $b)) (export "c" (func $c)) (export "d" (func $d)) (export "e" (func $e)) - (func $a (; 0 ;) (type $0) (result i32) + (func $a (; 0 ;) (type $FUNCSIG$i) (result i32) (i32.extend8_s (i32.const 187) ) ) - (func $b (; 1 ;) (type $0) (result i32) + (func $b (; 1 ;) (type $FUNCSIG$i) (result i32) (i32.extend16_s (i32.const 33768) ) ) - (func $c (; 2 ;) (type $1) (result i64) + (func $c (; 2 ;) (type $FUNCSIG$j) (result i64) (i64.extend8_s (i64.const 187) ) ) - (func $d (; 3 ;) (type $1) (result i64) + (func $d (; 3 ;) (type $FUNCSIG$j) (result i64) (i64.extend16_s (i64.const 33768) ) ) - (func $e (; 4 ;) (type $1) (result i64) + (func $e (; 4 ;) (type $FUNCSIG$j) (result i64) (i64.extend32_s (i64.const 2148318184) ) diff --git a/test/passes/inlining-optimizing_enable-threads.txt b/test/passes/inlining-optimizing_enable-threads.txt index 437870065..4aca378e6 100644 --- a/test/passes/inlining-optimizing_enable-threads.txt +++ b/test/passes/inlining-optimizing_enable-threads.txt @@ -1,53 +1,53 @@ (module - (type $0 (func)) - (type $1 (func (result i32))) - (type $2 (func (result f64))) - (type $3 (func (param f32 i64))) + (type $FUNCSIG$v (func)) + (type $FUNCSIG$i (func (result i32))) + (type $FUNCSIG$d (func (result f64))) + (type $FUNCSIG$vfj (func (param f32 i64))) (table $0 1 1 funcref) (elem (i32.const 0) $tabled) (export "user" (func $user)) (export "exported" (func $exported)) (export "exported_small" (func $exported_small)) - (func $user (; 0 ;) (type $0) + (func $user (; 0 ;) (type $FUNCSIG$v) (call $exported) (call $tabled) (call $multi) (call $multi) ) - (func $exported (; 1 ;) (type $0) + (func $exported (; 1 ;) (type $FUNCSIG$v) (nop) (nop) ) - (func $exported_small (; 2 ;) (type $0) + (func $exported_small (; 2 ;) (type $FUNCSIG$v) (nop) ) - (func $recursive (; 3 ;) (type $0) + (func $recursive (; 3 ;) (type $FUNCSIG$v) (call $recursive) ) - (func $tabled (; 4 ;) (type $0) + (func $tabled (; 4 ;) (type $FUNCSIG$v) (nop) (nop) ) - (func $cycle1 (; 5 ;) (type $0) + (func $cycle1 (; 5 ;) (type $FUNCSIG$v) (call $cycle1) ) - (func $multi (; 6 ;) (type $0) + (func $multi (; 6 ;) (type $FUNCSIG$v) (nop) (nop) ) ) (module - (type $0 (func (result i32))) - (type $1 (func)) - (func $main (; 0 ;) (type $0) (result i32) + (type $FUNCSIG$i (func (result i32))) + (type $FUNCSIG$v (func)) + (func $main (; 0 ;) (type $FUNCSIG$i) (result i32) (unreachable) ) ) (module - (type $0 (func (result i32))) - (type $1 (func (result i64))) + (type $FUNCSIG$i (func (result i32))) + (type $FUNCSIG$j (func (result i64))) (memory $0 (shared 1 1)) - (func $1 (; 0 ;) (type $1) (result i64) + (func $1 (; 0 ;) (type $FUNCSIG$j) (result i64) (i32.atomic.store16 (i32.const 0) (i32.const 0) @@ -56,22 +56,22 @@ ) ) (module - (type $0 (func)) - (func $main (; 0 ;) (type $0) + (type $FUNCSIG$v (func)) + (func $main (; 0 ;) (type $FUNCSIG$v) (call $one) (call $one) ) - (func $one (; 1 ;) (type $0) + (func $one (; 1 ;) (type $FUNCSIG$v) (call $one) ) ) (module - (type $0 (func)) - (func $main (; 0 ;) (type $0) + (type $FUNCSIG$v (func)) + (func $main (; 0 ;) (type $FUNCSIG$v) (call $two) (call $two) ) - (func $two (; 1 ;) (type $0) + (func $two (; 1 ;) (type $FUNCSIG$v) (call $two) ) ) diff --git a/test/passes/inlining-optimizing_optimize-level=3.txt b/test/passes/inlining-optimizing_optimize-level=3.txt index 131f438c2..b2c9657e2 100644 --- a/test/passes/inlining-optimizing_optimize-level=3.txt +++ b/test/passes/inlining-optimizing_optimize-level=3.txt @@ -6,12 +6,12 @@ (type $FUNCSIG$i (func (result i32))) (type $FUNCSIG$iii (func (param i32 i32) (result i32))) (type $FUNCSIG$vii (func (param i32 i32))) - (type $7 (func (param f64 i32) (result f64))) - (type $8 (func (param f64) (result i32))) - (type $9 (func (param i32 i32 i32 i32 i32) (result i32))) - (type $10 (func (param i32 i32 i32))) - (type $11 (func (param i32 i32 i32 i32 i32))) - (type $12 (func (param i32 i32 i32 i32) (result i32))) + (type $FUNCSIG$ddi (func (param f64 i32) (result f64))) + (type $FUNCSIG$id (func (param f64) (result i32))) + (type $FUNCSIG$iiiiii (func (param i32 i32 i32 i32 i32) (result i32))) + (type $FUNCSIG$viii (func (param i32 i32 i32))) + (type $FUNCSIG$viiiii (func (param i32 i32 i32 i32 i32))) + (type $FUNCSIG$iiiii (func (param i32 i32 i32 i32) (result i32))) (import "env" "memory" (memory $0 256 256)) (data (i32.const 1024) "emcc_hello_world.asm.js") (import "env" "table" (table $0 18 18 funcref)) @@ -165,7 +165,7 @@ ) (i32.const 0) ) - (func $_frexp (; 26 ;) (type $7) (param $0 f64) (param $1 i32) (result f64) + (func $_frexp (; 26 ;) (type $FUNCSIG$ddi) (param $0 f64) (param $1 i32) (result f64) (local $2 i32) (local $3 i32) (local $4 i32) @@ -2125,7 +2125,7 @@ ) ) ) - (func $_printf_core (; 44 ;) (type $9) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32) (result i32) + (func $_printf_core (; 44 ;) (type $FUNCSIG$iiiiii) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32) (result i32) (local $5 i32) (local $6 i32) (local $7 i32) @@ -6947,7 +6947,7 @@ ) (local.get $18) ) - (func $_pop_arg_336 (; 45 ;) (type $10) (param $0 i32) (param $1 i32) (param $2 i32) + (func $_pop_arg_336 (; 45 ;) (type $FUNCSIG$viii) (param $0 i32) (param $1 i32) (param $2 i32) (local $3 i32) (local $4 f64) (local $5 i32) @@ -7465,7 +7465,7 @@ ) (local.get $2) ) - (func $_pad (; 47 ;) (type $11) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32) + (func $_pad (; 47 ;) (type $FUNCSIG$viiiii) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (param $4 i32) (local $5 i32) (local $6 i32) (local $7 i32) @@ -14885,7 +14885,7 @@ (func $runPostSets (; 50 ;) (type $FUNCSIG$v) (nop) ) - (func $_i64Subtract (; 51 ;) (type $12) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32) + (func $_i64Subtract (; 51 ;) (type $FUNCSIG$iiiii) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32) (global.set $tempRet0 (i32.sub (i32.sub @@ -14903,7 +14903,7 @@ (local.get $2) ) ) - (func $_i64Add (; 52 ;) (type $12) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32) + (func $_i64Add (; 52 ;) (type $FUNCSIG$iiiii) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32) (local $4 i32) (global.set $tempRet0 (i32.add @@ -15315,7 +15315,7 @@ ) (local.get $3) ) - (func $___udivdi3 (; 57 ;) (type $12) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32) + (func $___udivdi3 (; 57 ;) (type $FUNCSIG$iiiii) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32) (call $___udivmoddi4 (local.get $0) (local.get $1) @@ -15324,7 +15324,7 @@ (i32.const 0) ) ) - (func $___uremdi3 (; 58 ;) (type $12) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32) + (func $___uremdi3 (; 58 ;) (type $FUNCSIG$iiiii) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32) (local $4 i32) (local.set $4 (global.get $STACKTOP) @@ -15358,7 +15358,7 @@ (local.get $0) ) ) - (func $___udivmoddi4 (; 59 ;) (type $9) (param $xl i32) (param $xh i32) (param $yl i32) (param $yh i32) (param $r i32) (result i32) + (func $___udivmoddi4 (; 59 ;) (type $FUNCSIG$iiiiii) (param $xl i32) (param $xh i32) (param $yl i32) (param $yh i32) (param $r i32) (result i32) (local $x64 i64) (local $y64 i64) (local.set $x64 @@ -15424,7 +15424,7 @@ ) ) ) - (func $dynCall_iiii (; 61 ;) (type $12) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32) + (func $dynCall_iiii (; 61 ;) (type $FUNCSIG$iiiii) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32) (call_indirect (type $FUNCSIG$iiii) (local.get $1) (local.get $2) diff --git a/test/passes/inlining.txt b/test/passes/inlining.txt index f60b5cd23..738b580de 100644 --- a/test/passes/inlining.txt +++ b/test/passes/inlining.txt @@ -1,13 +1,13 @@ (module - (type $0 (func)) - (type $1 (func (result i32))) - (type $2 (func (result f64))) - (type $3 (func (param f32 i64))) + (type $FUNCSIG$v (func)) + (type $FUNCSIG$i (func (result i32))) + (type $FUNCSIG$d (func (result f64))) + (type $FUNCSIG$vfj (func (param f32 i64))) (table $0 1 1 funcref) (elem (i32.const 0) $tabled) (export "user" (func $user)) (export "exported" (func $exported)) - (func $user (; 0 ;) (type $0) + (func $user (; 0 ;) (type $FUNCSIG$v) (local $x i32) (local $y f64) (local $2 f32) @@ -137,16 +137,16 @@ ) ) ) - (func $exported (; 1 ;) (type $0) + (func $exported (; 1 ;) (type $FUNCSIG$v) (nop) ) - (func $recursive (; 2 ;) (type $0) + (func $recursive (; 2 ;) (type $FUNCSIG$v) (call $recursive) ) - (func $tabled (; 3 ;) (type $0) + (func $tabled (; 3 ;) (type $FUNCSIG$v) (nop) ) - (func $cycle1 (; 4 ;) (type $0) + (func $cycle1 (; 4 ;) (type $FUNCSIG$v) (block $__inlined_func$cycle2 (block (call $cycle1) @@ -155,25 +155,25 @@ ) ) (module - (type $0 (func (param i32) (result i32))) - (type $1 (func (result i32))) - (func $child (; 0 ;) (type $0) (param $0 i32) (result i32) + (type $FUNCSIG$ii (func (param i32) (result i32))) + (type $FUNCSIG$i (func (result i32))) + (func $child (; 0 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32) (i32.const 1234) ) - (func $parent (; 1 ;) (type $1) (result i32) + (func $parent (; 1 ;) (type $FUNCSIG$i) (result i32) (call $child (unreachable) ) ) ) (module - (type $0 (func (result i32))) - (type $1 (func (param f32 i32) (result i32))) - (type $2 (func)) + (type $FUNCSIG$i (func (result i32))) + (type $FUNCSIG$ifi (func (param f32 i32) (result i32))) + (type $FUNCSIG$v (func)) (memory $0 1 1) (global $hangLimit (mut i32) (i32.const 25)) (export "hangLimitInitializer" (func $hangLimitInitializer)) - (func $func_4 (; 0 ;) (type $1) (param $0 f32) (param $1 i32) (result i32) + (func $func_4 (; 0 ;) (type $FUNCSIG$ifi) (param $0 f32) (param $1 i32) (result i32) (local $2 i64) (local $3 f64) (local $4 f32) @@ -226,7 +226,7 @@ ) ) ) - (func $hangLimitInitializer (; 1 ;) (type $2) + (func $hangLimitInitializer (; 1 ;) (type $FUNCSIG$v) (global.set $hangLimit (i32.const 25) ) @@ -234,9 +234,9 @@ ) (module (type $T (func (param i32))) - (type $1 (func)) + (type $FUNCSIG$v (func)) (table $0 10 funcref) - (func $0 (; 0 ;) (type $1) + (func $0 (; 0 ;) (type $FUNCSIG$v) (block $__inlined_func$1 (call_indirect (type $T) (if (result i32) @@ -250,8 +250,8 @@ ) ) (module - (type $0 (func)) - (func $1 (; 0 ;) (type $0) + (type $FUNCSIG$v (func)) + (func $1 (; 0 ;) (type $FUNCSIG$v) (block $__inlined_func$0 (block $label$1 (br_table $label$1 $label$1 diff --git a/test/passes/inlining_optimize-level=3.txt b/test/passes/inlining_optimize-level=3.txt index d5e1e7212..de6700e29 100644 --- a/test/passes/inlining_optimize-level=3.txt +++ b/test/passes/inlining_optimize-level=3.txt @@ -1,14 +1,14 @@ (module - (type $0 (func (result i32))) - (type $1 (func)) + (type $FUNCSIG$i (func (result i32))) + (type $FUNCSIG$v (func)) (table $0 1 1 funcref) (elem (i32.const 0) $no-loops-but-one-use-but-tabled) (export "yes" (func $yes)) (export "no-loops-but-one-use-but-exported" (func $no-loops-but-one-use-but-exported)) - (func $yes (; 0 ;) (type $0) (result i32) + (func $yes (; 0 ;) (type $FUNCSIG$i) (result i32) (i32.const 1) ) - (func $no-tooBig (; 1 ;) (type $0) (result i32) + (func $no-tooBig (; 1 ;) (type $FUNCSIG$i) (result i32) (nop) (nop) (nop) @@ -47,17 +47,17 @@ (nop) (i32.const 1) ) - (func $no-loops-but-one-use-but-exported (; 2 ;) (type $0) (result i32) + (func $no-loops-but-one-use-but-exported (; 2 ;) (type $FUNCSIG$i) (result i32) (loop $loop-in (result i32) (i32.const 1) ) ) - (func $no-loops-but-one-use-but-tabled (; 3 ;) (type $0) (result i32) + (func $no-loops-but-one-use-but-tabled (; 3 ;) (type $FUNCSIG$i) (result i32) (loop $loop-in (result i32) (i32.const 1) ) ) - (func $intoHere (; 4 ;) (type $1) + (func $intoHere (; 4 ;) (type $FUNCSIG$v) (drop (block (result i32) (block $__inlined_func$yes (result i32) diff --git a/test/passes/instrument-locals.txt b/test/passes/instrument-locals.txt index 2637a69aa..b57fbb9a1 100644 --- a/test/passes/instrument-locals.txt +++ b/test/passes/instrument-locals.txt @@ -1,5 +1,5 @@ (module - (type $0 (func)) + (type $FUNCSIG$v (func)) (type $FUNCSIG$iiii (func (param i32 i32 i32) (result i32))) (type $FUNCSIG$jiij (func (param i32 i32 i64) (result i64))) (type $FUNCSIG$fiif (func (param i32 i32 f32) (result f32))) @@ -12,7 +12,7 @@ (import "env" "set_i64" (func $set_i64 (param i32 i32 i64) (result i64))) (import "env" "set_f32" (func $set_f32 (param i32 i32 f32) (result f32))) (import "env" "set_f64" (func $set_f64 (param i32 i32 f64) (result f64))) - (func $A (; 8 ;) (type $0) + (func $A (; 8 ;) (type $FUNCSIG$v) (local $x i32) (local $y i64) (local $z f32) diff --git a/test/passes/licm.txt b/test/passes/licm.txt index 2db8aac32..78d82807b 100644 --- a/test/passes/licm.txt +++ b/test/passes/licm.txt @@ -1,12 +1,12 @@ (module - (type $0 (func)) - (type $1 (func (result i32))) - (type $2 (func (result i64))) - (type $3 (func (param i32))) - (type $4 (func (param i32) (result i32))) + (type $FUNCSIG$v (func)) + (type $FUNCSIG$i (func (result i32))) + (type $FUNCSIG$j (func (result i64))) + (type $FUNCSIG$vi (func (param i32))) + (type $FUNCSIG$ii (func (param i32) (result i32))) (memory $0 1) (global $glob (mut i32) (i32.const 1)) - (func $loop1 (; 0 ;) (type $0) + (func $loop1 (; 0 ;) (type $FUNCSIG$v) (drop (i32.const 10) ) @@ -17,7 +17,7 @@ ) ) ) - (func $loop2 (; 1 ;) (type $0) + (func $loop2 (; 1 ;) (type $FUNCSIG$v) (drop (i32.const 10) ) @@ -32,7 +32,7 @@ ) ) ) - (func $loop3 (; 2 ;) (type $0) + (func $loop3 (; 2 ;) (type $FUNCSIG$v) (drop (i32.const 10) ) @@ -48,7 +48,7 @@ ) ) ) - (func $loop4 (; 3 ;) (type $0) + (func $loop4 (; 3 ;) (type $FUNCSIG$v) (drop (i32.load (i32.const 1) @@ -61,7 +61,7 @@ ) ) ) - (func $loop3-4 (; 4 ;) (type $0) + (func $loop3-4 (; 4 ;) (type $FUNCSIG$v) (loop $loop (drop (i32.load @@ -79,7 +79,7 @@ ) ) ) - (func $loop3-4-b (; 5 ;) (type $0) + (func $loop3-4-b (; 5 ;) (type $FUNCSIG$v) (drop (i32.load (i32.const 10) @@ -98,7 +98,7 @@ ) ) ) - (func $loop5 (; 6 ;) (type $0) + (func $loop5 (; 6 ;) (type $FUNCSIG$v) (loop $loop (i32.store (i32.const 1) @@ -109,7 +109,7 @@ ) ) ) - (func $loop6 (; 7 ;) (type $0) + (func $loop6 (; 7 ;) (type $FUNCSIG$v) (loop $loop (i32.store (i32.const 1) @@ -121,7 +121,7 @@ ) ) ) - (func $loop7 (; 8 ;) (type $0) + (func $loop7 (; 8 ;) (type $FUNCSIG$v) (loop $loop (i32.store (i32.const 1) @@ -136,7 +136,7 @@ ) ) ) - (func $loop8 (; 9 ;) (type $0) + (func $loop8 (; 9 ;) (type $FUNCSIG$v) (loop $loop (i32.store (i32.const 1) @@ -147,7 +147,7 @@ ) ) ) - (func $loop9 (; 10 ;) (type $0) + (func $loop9 (; 10 ;) (type $FUNCSIG$v) (loop $loop (drop (i32.load @@ -163,7 +163,7 @@ ) ) ) - (func $loop10 (; 11 ;) (type $0) + (func $loop10 (; 11 ;) (type $FUNCSIG$v) (drop (i32.load (i32.const 1) @@ -182,7 +182,7 @@ ) ) ) - (func $loop11 (; 12 ;) (type $0) + (func $loop11 (; 12 ;) (type $FUNCSIG$v) (local $x i32) (local $y i32) (loop $loop @@ -196,7 +196,7 @@ ) ) ) - (func $loop12 (; 13 ;) (type $0) + (func $loop12 (; 13 ;) (type $FUNCSIG$v) (local $x i32) (local $y i32) (drop @@ -211,7 +211,7 @@ ) ) ) - (func $loop13 (; 14 ;) (type $0) + (func $loop13 (; 14 ;) (type $FUNCSIG$v) (local $x i32) (local $y i32) (local.set $x @@ -227,7 +227,7 @@ ) ) ) - (func $loop14 (; 15 ;) (type $0) + (func $loop14 (; 15 ;) (type $FUNCSIG$v) (local $x i32) (local $y i32) (local.set $x @@ -246,7 +246,7 @@ ) ) ) - (func $loop14-1 (; 16 ;) (type $0) + (func $loop14-1 (; 16 ;) (type $FUNCSIG$v) (local $x i32) (local $y i32) (loop $loop @@ -264,7 +264,7 @@ ) ) ) - (func $loop15 (; 17 ;) (type $0) + (func $loop15 (; 17 ;) (type $FUNCSIG$v) (local $x i32) (local $y i32) (local.set $x @@ -283,7 +283,7 @@ ) ) ) - (func $loop15-1 (; 18 ;) (type $0) + (func $loop15-1 (; 18 ;) (type $FUNCSIG$v) (local $x i32) (local $y i32) (local.set $x @@ -303,7 +303,7 @@ ) ) ) - (func $loop16 (; 19 ;) (type $0) + (func $loop16 (; 19 ;) (type $FUNCSIG$v) (local $x i32) (local $y i32) (local.set $x @@ -322,7 +322,7 @@ ) ) ) - (func $loop16-1 (; 20 ;) (type $0) + (func $loop16-1 (; 20 ;) (type $FUNCSIG$v) (local $x i32) (local $y i32) (local.set $x @@ -342,7 +342,7 @@ ) ) ) - (func $loop16-2 (; 21 ;) (type $0) + (func $loop16-2 (; 21 ;) (type $FUNCSIG$v) (local $x i32) (local $y i32) (local.set $x @@ -367,7 +367,7 @@ ) ) ) - (func $loop16-3 (; 22 ;) (type $0) + (func $loop16-3 (; 22 ;) (type $FUNCSIG$v) (local $x i32) (local $y i32) (local.set $y @@ -392,7 +392,7 @@ ) ) ) - (func $nop (; 23 ;) (type $0) + (func $nop (; 23 ;) (type $FUNCSIG$v) (loop $loop (nop) (br_if $loop @@ -400,7 +400,7 @@ ) ) ) - (func $nested-blocks (; 24 ;) (type $0) + (func $nested-blocks (; 24 ;) (type $FUNCSIG$v) (loop $loop (block $block (nop) @@ -420,7 +420,7 @@ ) ) ) - (func $nested-unhoistable-blocks (; 25 ;) (type $0) + (func $nested-unhoistable-blocks (; 25 ;) (type $FUNCSIG$v) (loop $loop (block $block (call $nested-unhoistable-blocks) @@ -440,7 +440,7 @@ ) ) ) - (func $conditional (; 26 ;) (type $0) + (func $conditional (; 26 ;) (type $FUNCSIG$v) (if (i32.const 0) (drop @@ -454,7 +454,7 @@ ) ) ) - (func $conditional1 (; 27 ;) (type $1) (result i32) + (func $conditional1 (; 27 ;) (type $FUNCSIG$i) (result i32) (loop $loop (if (call $conditional1) @@ -468,7 +468,7 @@ ) (unreachable) ) - (func $conditional2 (; 28 ;) (type $0) + (func $conditional2 (; 28 ;) (type $FUNCSIG$v) (block $out (loop $loop (br_if $out @@ -483,7 +483,7 @@ ) ) ) - (func $conditional3 (; 29 ;) (type $0) + (func $conditional3 (; 29 ;) (type $FUNCSIG$v) (block $out (block (drop @@ -501,7 +501,7 @@ ) ) ) - (func $after (; 30 ;) (type $0) + (func $after (; 30 ;) (type $FUNCSIG$v) (loop $loop (nop) ) @@ -509,7 +509,7 @@ (i32.const 10) ) ) - (func $loops (; 31 ;) (type $0) + (func $loops (; 31 ;) (type $FUNCSIG$v) (drop (i32.const 10) ) @@ -523,7 +523,7 @@ ) ) ) - (func $loops2 (; 32 ;) (type $0) + (func $loops2 (; 32 ;) (type $FUNCSIG$v) (drop (i32.const 10) ) @@ -537,7 +537,7 @@ ) ) ) - (func $fuzz1 (; 33 ;) (type $2) (result i64) + (func $fuzz1 (; 33 ;) (type $FUNCSIG$j) (result i64) (local $var$1 i64) (drop (block (result i32) @@ -566,7 +566,7 @@ (local.get $var$1) ) ) - (func $self (; 34 ;) (type $1) (result i32) + (func $self (; 34 ;) (type $FUNCSIG$i) (result i32) (local $x i32) (loop $loop (local.set $x @@ -581,7 +581,7 @@ ) (local.get $x) ) - (func $nested-set (; 35 ;) (type $0) + (func $nested-set (; 35 ;) (type $FUNCSIG$v) (local $var$0 i32) (local $var$1 i64) (loop $label$1 @@ -601,7 +601,7 @@ ) ) ) - (func $load-store (; 36 ;) (type $3) (param $x i32) + (func $load-store (; 36 ;) (type $FUNCSIG$vi) (param $x i32) (loop $loop (drop (i32.load @@ -617,7 +617,7 @@ ) ) ) - (func $set-set (; 37 ;) (type $4) (param $x i32) (result i32) + (func $set-set (; 37 ;) (type $FUNCSIG$ii) (param $x i32) (result i32) (loop $loop (local.set $x (i32.const 1) @@ -634,7 +634,7 @@ ) (local.get $x) ) - (func $copies-no (; 38 ;) (type $0) + (func $copies-no (; 38 ;) (type $FUNCSIG$v) (local $x i32) (local $y i32) (local $z i32) @@ -658,7 +658,7 @@ ) ) ) - (func $consts-no (; 39 ;) (type $0) + (func $consts-no (; 39 ;) (type $FUNCSIG$v) (local $x i32) (local $a i32) (local $b i32) @@ -676,7 +676,7 @@ ) ) ) - (func $global (; 40 ;) (type $0) + (func $global (; 40 ;) (type $FUNCSIG$v) (local $x i32) (local.set $x (global.get $glob) diff --git a/test/passes/licm.wast b/test/passes/licm.wast index 14d97afd9..d012bc41e 100644 --- a/test/passes/licm.wast +++ b/test/passes/licm.wast @@ -36,7 +36,7 @@ (br_if $loop (i32.const 1)) ) ) - (func $loop3-4-b (; 4 ;) (type $0) + (func $loop3-4-b (; 4 ;) (type 0) (loop $loop (drop (i32.load diff --git a/test/passes/log-execution.txt b/test/passes/log-execution.txt index a7e83f1e8..e6b9c8fd8 100644 --- a/test/passes/log-execution.txt +++ b/test/passes/log-execution.txt @@ -1,6 +1,6 @@ (module (type $FUNCSIG$v (func)) - (type $1 (func (result i32))) + (type $FUNCSIG$i (func (result i32))) (type $FUNCSIG$vi (func (param i32))) (import "env" "func" (func $import)) (import "env" "log_execution" (func $log_execution (param i32))) @@ -10,7 +10,7 @@ ) (nop) ) - (func $intt (; 3 ;) (type $1) (result i32) + (func $intt (; 3 ;) (type $FUNCSIG$i) (result i32) (call $log_execution (i32.const 1) ) diff --git a/test/passes/merge-blocks.txt b/test/passes/merge-blocks.txt index 24f5217e7..c7b054b74 100644 --- a/test/passes/merge-blocks.txt +++ b/test/passes/merge-blocks.txt @@ -1,17 +1,17 @@ (module - (type $0 (func)) - (type $1 (func (param i32))) - (type $2 (func (result i32))) - (type $3 (func (result f32))) + (type $FUNCSIG$v (func)) + (type $FUNCSIG$vi (func (param i32))) + (type $FUNCSIG$i (func (result i32))) + (type $FUNCSIG$f (func (result f32))) (global $global$0 (mut i32) (i32.const 10)) - (func $drop-block (; 0 ;) (type $0) + (func $drop-block (; 0 ;) (type $FUNCSIG$v) (block $block (drop (i32.const 0) ) ) ) - (func $drop-block-br (; 1 ;) (type $0) + (func $drop-block-br (; 1 ;) (type $FUNCSIG$v) (block $block (drop (block $x (result i32) @@ -23,7 +23,7 @@ ) ) ) - (func $drop-block-br-if (; 2 ;) (type $0) + (func $drop-block-br-if (; 2 ;) (type $FUNCSIG$v) (block $block (drop (i32.const 1) @@ -38,7 +38,7 @@ ) ) ) - (func $undroppable-block-br-if (; 3 ;) (type $1) (param $0 i32) + (func $undroppable-block-br-if (; 3 ;) (type $FUNCSIG$vi) (param $0 i32) (block $block (drop (block $x (result i32) @@ -53,7 +53,7 @@ ) ) ) - (func $drop-block-nested-br-if (; 4 ;) (type $0) + (func $drop-block-nested-br-if (; 4 ;) (type $FUNCSIG$v) (block $block (block $x (if @@ -74,7 +74,7 @@ ) ) ) - (func $drop-unreachable-br_if (; 5 ;) (type $2) (result i32) + (func $drop-unreachable-br_if (; 5 ;) (type $FUNCSIG$i) (result i32) (block $label$0 (result i32) (block $label$2 (result i32) (br_if $label$2 @@ -86,7 +86,7 @@ ) ) ) - (func $drop-block-squared-iloop (; 6 ;) (type $0) + (func $drop-block-squared-iloop (; 6 ;) (type $FUNCSIG$v) (drop (block $label$0 (result i32) (drop @@ -99,7 +99,7 @@ ) ) ) - (func $br-goes-away-label2-becomes-unreachable (; 7 ;) (type $0) + (func $br-goes-away-label2-becomes-unreachable (; 7 ;) (type $FUNCSIG$v) (block $block (drop (block $label$1 (result i32) @@ -118,7 +118,7 @@ ) ) ) - (func $loop-block-drop-block-return (; 8 ;) (type $0) + (func $loop-block-drop-block-return (; 8 ;) (type $FUNCSIG$v) (loop $label$4 (block $label$5 (drop @@ -129,7 +129,7 @@ ) ) ) - (func $if-block (; 9 ;) (type $0) + (func $if-block (; 9 ;) (type $FUNCSIG$v) (block $label (if (i32.const 1) @@ -144,7 +144,7 @@ ) ) ) - (func $if-block-bad (; 10 ;) (type $0) + (func $if-block-bad (; 10 ;) (type $FUNCSIG$v) (block $label (if (br $label) @@ -159,7 +159,7 @@ ) ) ) - (func $if-block-br (; 11 ;) (type $0) + (func $if-block-br (; 11 ;) (type $FUNCSIG$v) (block $label (if (i32.const 1) @@ -167,7 +167,7 @@ ) ) ) - (func $if-block-br-1 (; 12 ;) (type $0) + (func $if-block-br-1 (; 12 ;) (type $FUNCSIG$v) (block $label (if (i32.const 1) @@ -178,7 +178,7 @@ ) ) ) - (func $if-block-br-2 (; 13 ;) (type $0) + (func $if-block-br-2 (; 13 ;) (type $FUNCSIG$v) (block $label (if (i32.const 1) @@ -189,7 +189,7 @@ ) ) ) - (func $if-block-br-3 (; 14 ;) (type $0) + (func $if-block-br-3 (; 14 ;) (type $FUNCSIG$v) (block $label (if (i32.const 1) @@ -198,7 +198,7 @@ ) ) ) - (func $if-block-br-4-eithre (; 15 ;) (type $0) + (func $if-block-br-4-eithre (; 15 ;) (type $FUNCSIG$v) (block $label (if (i32.const 1) @@ -211,7 +211,7 @@ ) ) ) - (func $if-block-br-5-value (; 16 ;) (type $2) (result i32) + (func $if-block-br-5-value (; 16 ;) (type $FUNCSIG$i) (result i32) (block $label (result i32) (if (result i32) (i32.const 1) @@ -220,7 +220,7 @@ ) ) ) - (func $restructure-if-outerType-change (; 17 ;) (type $0) + (func $restructure-if-outerType-change (; 17 ;) (type $FUNCSIG$v) (loop $label$1 (br_if $label$1 (block $label$2 @@ -237,7 +237,7 @@ ) ) ) - (func $if-arm-unreachable (; 18 ;) (type $0) + (func $if-arm-unreachable (; 18 ;) (type $FUNCSIG$v) (block $label$1 (if (unreachable) @@ -246,7 +246,7 @@ ) ) ) - (func $propagate-type-if-we-optimize (; 19 ;) (type $0) + (func $propagate-type-if-we-optimize (; 19 ;) (type $FUNCSIG$v) (if (i32.const 1) (nop) @@ -269,7 +269,7 @@ ) ) ) - (func $br-value-blocktypechange (; 20 ;) (type $3) (result f32) + (func $br-value-blocktypechange (; 20 ;) (type $FUNCSIG$f) (result f32) (global.set $global$0 (i32.const 0) ) diff --git a/test/passes/merge-blocks_remove-unused-brs.txt b/test/passes/merge-blocks_remove-unused-brs.txt index db2ca1b14..86464ac25 100644 --- a/test/passes/merge-blocks_remove-unused-brs.txt +++ b/test/passes/merge-blocks_remove-unused-brs.txt @@ -1,6 +1,6 @@ (module - (type $0 (func (param i32))) - (func $func (; 0 ;) (type $0) (param $x i32) + (type $FUNCSIG$vi (func (param i32))) + (func $func (; 0 ;) (type $FUNCSIG$vi) (param $x i32) (loop $loop (block $out (block diff --git a/test/passes/merge-locals.txt b/test/passes/merge-locals.txt index 8d61041e6..c027984fb 100644 --- a/test/passes/merge-locals.txt +++ b/test/passes/merge-locals.txt @@ -1,10 +1,10 @@ (module - (type $0 (func (param i32 i32) (result i32))) - (type $1 (func (param i32 i32))) - (type $2 (func (param i32 f32 f32) (result i64))) - (type $3 (func (param i32 i32 i32))) + (type $FUNCSIG$iii (func (param i32 i32) (result i32))) + (type $FUNCSIG$vii (func (param i32 i32))) + (type $FUNCSIG$jiff (func (param i32 f32 f32) (result i64))) + (type $FUNCSIG$viii (func (param i32 i32 i32))) (global $global$0 (mut i32) (i32.const 10)) - (func $test (; 0 ;) (type $0) (param $x i32) (param $y i32) (result i32) + (func $test (; 0 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (drop (if (result i32) (local.tee $x @@ -16,7 +16,7 @@ ) (local.get $x) ) - (func $test2 (; 1 ;) (type $0) (param $x i32) (param $y i32) (result i32) + (func $test2 (; 1 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (drop (if (result i32) (local.tee $x @@ -28,7 +28,7 @@ ) (local.get $x) ) - (func $test-multiple (; 2 ;) (type $0) (param $x i32) (param $y i32) (result i32) + (func $test-multiple (; 2 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (drop (if (result i32) (local.tee $x @@ -43,7 +43,7 @@ ) (local.get $x) ) - (func $test-just-some (; 3 ;) (type $0) (param $x i32) (param $y i32) (result i32) + (func $test-just-some (; 3 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (drop (if (result i32) (local.tee $x @@ -61,7 +61,7 @@ ) (local.get $y) ) - (func $test-just-some2 (; 4 ;) (type $0) (param $x i32) (param $y i32) (result i32) + (func $test-just-some2 (; 4 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (drop (if (result i32) (local.tee $x @@ -82,7 +82,7 @@ ) (i32.const 500) ) - (func $test-just-some3 (; 5 ;) (type $0) (param $x i32) (param $y i32) (result i32) + (func $test-just-some3 (; 5 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (drop (if (result i32) (local.tee $x @@ -103,7 +103,7 @@ ) (local.get $y) ) - (func $silly-self (; 6 ;) (type $0) (param $x i32) (param $y i32) (result i32) + (func $silly-self (; 6 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (drop (if (result i32) (local.tee $x @@ -115,7 +115,7 @@ ) (local.get $y) ) - (func $silly-multi (; 7 ;) (type $0) (param $x i32) (param $y i32) (result i32) + (func $silly-multi (; 7 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (drop (if (result i32) (local.tee $x @@ -129,7 +129,7 @@ ) (local.get $y) ) - (func $undo-1 (; 8 ;) (type $1) (param $var$1 i32) (param $var$2 i32) + (func $undo-1 (; 8 ;) (type $FUNCSIG$vii) (param $var$1 i32) (param $var$2 i32) (local $var$5 i32) (local.set $var$2 (local.get $var$1) @@ -141,7 +141,7 @@ (local.get $var$1) ) ) - (func $undo-2 (; 9 ;) (type $1) (param $var$1 i32) (param $var$2 i32) + (func $undo-2 (; 9 ;) (type $FUNCSIG$vii) (param $var$1 i32) (param $var$2 i32) (local $var$5 i32) (local.set $var$2 (local.get $var$1) @@ -156,7 +156,7 @@ (local.get $var$1) ) ) - (func $reverse (; 10 ;) (type $1) (param $x i32) (param $y i32) + (func $reverse (; 10 ;) (type $FUNCSIG$vii) (param $x i32) (param $y i32) (drop (if (result i32) (local.tee $x @@ -179,7 +179,7 @@ (local.get $y) ) ) - (func $reverse-end (; 11 ;) (type $1) (param $x i32) (param $y i32) + (func $reverse-end (; 11 ;) (type $FUNCSIG$vii) (param $x i32) (param $y i32) (drop (if (result i32) (local.tee $x @@ -190,7 +190,7 @@ ) ) ) - (func $reverse-lone-end-2 (; 12 ;) (type $1) (param $x i32) (param $y i32) + (func $reverse-lone-end-2 (; 12 ;) (type $FUNCSIG$vii) (param $x i32) (param $y i32) (drop (if (result i32) (local.tee $x @@ -207,7 +207,7 @@ (local.get $y) ) ) - (func $reverse-undo (; 13 ;) (type $1) (param $x i32) (param $y i32) + (func $reverse-undo (; 13 ;) (type $FUNCSIG$vii) (param $x i32) (param $y i32) (drop (if (result i32) (local.tee $x @@ -233,7 +233,7 @@ (local.get $y) ) ) - (func $reverse-undo2 (; 14 ;) (type $1) (param $x i32) (param $y i32) + (func $reverse-undo2 (; 14 ;) (type $FUNCSIG$vii) (param $x i32) (param $y i32) (drop (if (result i32) (local.tee $x @@ -259,7 +259,7 @@ (local.get $y) ) ) - (func $reverse-undo3-conditional (; 15 ;) (type $1) (param $x i32) (param $y i32) + (func $reverse-undo3-conditional (; 15 ;) (type $FUNCSIG$vii) (param $x i32) (param $y i32) (drop (if (result i32) (local.tee $x @@ -288,7 +288,7 @@ (local.get $y) ) ) - (func $reverse-undo3-conditional-b (; 16 ;) (type $1) (param $x i32) (param $y i32) + (func $reverse-undo3-conditional-b (; 16 ;) (type $FUNCSIG$vii) (param $x i32) (param $y i32) (drop (if (result i32) (local.tee $x @@ -317,7 +317,7 @@ (local.get $y) ) ) - (func $reverse-undo3-conditional-c (; 17 ;) (type $1) (param $x i32) (param $y i32) + (func $reverse-undo3-conditional-c (; 17 ;) (type $FUNCSIG$vii) (param $x i32) (param $y i32) (drop (if (result i32) (local.tee $x @@ -354,7 +354,7 @@ (local.get $y) ) ) - (func $fuzz (; 18 ;) (type $2) (param $var$0 i32) (param $var$1 f32) (param $var$2 f32) (result i64) + (func $fuzz (; 18 ;) (type $FUNCSIG$jiff) (param $var$0 i32) (param $var$1 f32) (param $var$2 f32) (result i64) (local $var$3 i32) (global.set $global$0 (i32.sub @@ -438,7 +438,7 @@ (i64.const -36028797018963968) ) ) - (func $trivial-confusion (; 19 ;) (type $3) (param $unused i32) (param $param i32) (param $result i32) + (func $trivial-confusion (; 19 ;) (type $FUNCSIG$viii) (param $unused i32) (param $param i32) (param $result i32) (loop $label$1 (if (i32.const 1) diff --git a/test/passes/no-exit-runtime.txt b/test/passes/no-exit-runtime.txt index c8913d32a..7059eca3e 100644 --- a/test/passes/no-exit-runtime.txt +++ b/test/passes/no-exit-runtime.txt @@ -1,12 +1,12 @@ (module (type $FUNCSIG$iii (func (param i32 i32) (result i32))) - (type $1 (func)) + (type $FUNCSIG$v (func)) (import "env" "atexit" (func $fimport$0 (param i32 i32) (result i32))) (import "env" "__cxa_atexit" (func $fimport$1 (param i32 i32) (result i32))) (import "env" "_atexit" (func $fimport$2 (param i32 i32) (result i32))) (import "env" "___cxa_atexit" (func $fimport$3 (param i32 i32) (result i32))) (import "env" "other" (func $fimport$4 (param i32 i32) (result i32))) - (func $caller (; 5 ;) (type $1) + (func $caller (; 5 ;) (type $FUNCSIG$v) (drop (i32.const 0) ) diff --git a/test/passes/optimize-added-constants-propagate_low-memory-unused.txt b/test/passes/optimize-added-constants-propagate_low-memory-unused.txt index 3d6a644e9..4d1a1e31c 100644 --- a/test/passes/optimize-added-constants-propagate_low-memory-unused.txt +++ b/test/passes/optimize-added-constants-propagate_low-memory-unused.txt @@ -1,9 +1,9 @@ (module - (type $0 (func)) - (type $1 (func (param i32))) - (type $2 (func (param i32) (result i32))) + (type $FUNCSIG$v (func)) + (type $FUNCSIG$vi (func (param i32))) + (type $FUNCSIG$ii (func (param i32) (result i32))) (memory $0 1 1) - (func $consts (; 0 ;) (type $0) + (func $consts (; 0 ;) (type $FUNCSIG$v) (drop (i32.load (i32.const 0) @@ -59,7 +59,7 @@ (i32.const 1) ) ) - (func $offsets (; 1 ;) (type $1) (param $x i32) + (func $offsets (; 1 ;) (type $FUNCSIG$vi) (param $x i32) (drop (i32.load offset=1 (local.get $x) @@ -97,7 +97,7 @@ ) ) ) - (func $load-off-2 (; 2 ;) (type $2) (param $0 i32) (result i32) + (func $load-off-2 (; 2 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32) (i32.store (i32.const 6) (local.get $0) @@ -168,7 +168,7 @@ (local.get $0) ) ) - (func $offset-constant (; 3 ;) (type $0) + (func $offset-constant (; 3 ;) (type $FUNCSIG$v) (drop (i32.load (i32.const 10) @@ -205,7 +205,7 @@ ) ) ) - (func $offset-propagate-param (; 4 ;) (type $1) (param $x i32) + (func $offset-propagate-param (; 4 ;) (type $FUNCSIG$vi) (param $x i32) (local $y i32) (nop) (drop @@ -214,7 +214,7 @@ ) ) ) - (func $offset-propagate (; 5 ;) (type $0) + (func $offset-propagate (; 5 ;) (type $FUNCSIG$v) (local $x i32) (local $y i32) (nop) @@ -224,7 +224,7 @@ ) ) ) - (func $offset-propagate2 (; 6 ;) (type $0) + (func $offset-propagate2 (; 6 ;) (type $FUNCSIG$v) (local $x i32) (local $y i32) (local.set $x @@ -242,7 +242,7 @@ ) ) ) - (func $offset-propagate3 (; 7 ;) (type $0) + (func $offset-propagate3 (; 7 ;) (type $FUNCSIG$v) (local $x i32) (local $y i32) (nop) @@ -252,7 +252,7 @@ ) ) ) - (func $offset-propagate4 (; 8 ;) (type $0) + (func $offset-propagate4 (; 8 ;) (type $FUNCSIG$v) (local $x i32) (local $y i32) (local.set $y @@ -265,7 +265,7 @@ ) ) ) - (func $offset-propagate5 (; 9 ;) (type $1) (param $z i32) + (func $offset-propagate5 (; 9 ;) (type $FUNCSIG$vi) (param $z i32) (local $x i32) (local $y i32) (local $3 i32) @@ -287,7 +287,7 @@ ) ) ) - (func $offset-propagate6 (; 10 ;) (type $1) (param $z i32) + (func $offset-propagate6 (; 10 ;) (type $FUNCSIG$vi) (param $z i32) (local $x i32) (local $y i32) (local $3 i32) @@ -309,7 +309,7 @@ ) ) ) - (func $offset-propagate7 (; 11 ;) (type $1) (param $z i32) + (func $offset-propagate7 (; 11 ;) (type $FUNCSIG$vi) (param $z i32) (local $x i32) (local $y i32) (local.set $y @@ -336,7 +336,7 @@ ) ) ) - (func $offset-realistic (; 12 ;) (type $1) (param $ptr i32) + (func $offset-realistic (; 12 ;) (type $FUNCSIG$vi) (param $ptr i32) (local $x i32) (local $y i32) (local $z i32) @@ -375,7 +375,7 @@ ) ) ) - (func $multiadd (; 13 ;) (type $1) (param $sp i32) + (func $multiadd (; 13 ;) (type $FUNCSIG$vi) (param $sp i32) (local $$vararg_buffer i32) (local $$vararg_ptr1 i32) (nop) @@ -385,7 +385,7 @@ (i32.const 1) ) ) - (func $multiadd-extraUse (; 14 ;) (type $1) (param $sp i32) + (func $multiadd-extraUse (; 14 ;) (type $FUNCSIG$vi) (param $sp i32) (local $$vararg_buffer i32) (local $$vararg_ptr1 i32) (local.set $$vararg_buffer diff --git a/test/passes/optimize-added-constants_low-memory-unused.txt b/test/passes/optimize-added-constants_low-memory-unused.txt index 174897946..4150c4da1 100644 --- a/test/passes/optimize-added-constants_low-memory-unused.txt +++ b/test/passes/optimize-added-constants_low-memory-unused.txt @@ -1,9 +1,9 @@ (module - (type $0 (func)) - (type $1 (func (param i32))) - (type $2 (func (param i32) (result i32))) + (type $FUNCSIG$v (func)) + (type $FUNCSIG$vi (func (param i32))) + (type $FUNCSIG$ii (func (param i32) (result i32))) (memory $0 1 1) - (func $consts (; 0 ;) (type $0) + (func $consts (; 0 ;) (type $FUNCSIG$v) (drop (i32.load (i32.const 0) @@ -59,7 +59,7 @@ (i32.const 1) ) ) - (func $offsets (; 1 ;) (type $1) (param $x i32) + (func $offsets (; 1 ;) (type $FUNCSIG$vi) (param $x i32) (drop (i32.load offset=1 (local.get $x) @@ -97,7 +97,7 @@ ) ) ) - (func $load-off-2 (; 2 ;) (type $2) (param $0 i32) (result i32) + (func $load-off-2 (; 2 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32) (i32.store (i32.const 6) (local.get $0) @@ -168,7 +168,7 @@ (local.get $0) ) ) - (func $offset-constant (; 3 ;) (type $0) + (func $offset-constant (; 3 ;) (type $FUNCSIG$v) (drop (i32.load (i32.const 10) @@ -205,7 +205,7 @@ ) ) ) - (func $offset-propagate-param (; 4 ;) (type $1) (param $x i32) + (func $offset-propagate-param (; 4 ;) (type $FUNCSIG$vi) (param $x i32) (local $y i32) (local.set $x (i32.add @@ -219,7 +219,7 @@ ) ) ) - (func $offset-propagate (; 5 ;) (type $0) + (func $offset-propagate (; 5 ;) (type $FUNCSIG$v) (local $x i32) (local $y i32) (local.set $x @@ -234,7 +234,7 @@ ) ) ) - (func $offset-propagate2 (; 6 ;) (type $0) + (func $offset-propagate2 (; 6 ;) (type $FUNCSIG$v) (local $x i32) (local $y i32) (local.set $x @@ -252,7 +252,7 @@ ) ) ) - (func $offset-propagate3 (; 7 ;) (type $0) + (func $offset-propagate3 (; 7 ;) (type $FUNCSIG$v) (local $x i32) (local $y i32) (local.set $x @@ -267,7 +267,7 @@ ) ) ) - (func $offset-propagate4 (; 8 ;) (type $0) + (func $offset-propagate4 (; 8 ;) (type $FUNCSIG$v) (local $x i32) (local $y i32) (local.set $y @@ -285,7 +285,7 @@ ) ) ) - (func $offset-propagate5 (; 9 ;) (type $1) (param $z i32) + (func $offset-propagate5 (; 9 ;) (type $FUNCSIG$vi) (param $z i32) (local $x i32) (local $y i32) (if @@ -306,7 +306,7 @@ ) ) ) - (func $offset-propagate6 (; 10 ;) (type $1) (param $z i32) + (func $offset-propagate6 (; 10 ;) (type $FUNCSIG$vi) (param $z i32) (local $x i32) (local $y i32) (local.set $y @@ -327,7 +327,7 @@ ) ) ) - (func $offset-realistic (; 11 ;) (type $1) (param $ptr i32) + (func $offset-realistic (; 11 ;) (type $FUNCSIG$vi) (param $ptr i32) (local $x i32) (local $y i32) (local $z i32) diff --git a/test/passes/optimize-instructions_enable-threads.txt b/test/passes/optimize-instructions_enable-threads.txt index 67f0516fb..393d49112 100644 --- a/test/passes/optimize-instructions_enable-threads.txt +++ b/test/passes/optimize-instructions_enable-threads.txt @@ -1,18 +1,18 @@ (module (type $0 (func (param i32 i64))) - (type $1 (func)) - (type $2 (func (param i32 i32 f64 f64))) - (type $3 (func (result i32))) - (type $4 (func (param i32) (result i32))) - (type $5 (func (param i32 i32))) - (type $6 (func (param i32))) - (type $7 (func (param i32 i32) (result i32))) - (type $8 (func (param i64) (result i64))) - (type $9 (func (result i64))) - (type $10 (func (param i32 i64 f32 f64))) - (type $11 (func (param i32 i64 f32))) - (type $12 (func (param i32 i64 f64 i32))) - (type $13 (func (result f64))) + (type $FUNCSIG$v (func)) + (type $FUNCSIG$viidd (func (param i32 i32 f64 f64))) + (type $FUNCSIG$i (func (result i32))) + (type $FUNCSIG$ii (func (param i32) (result i32))) + (type $FUNCSIG$vii (func (param i32 i32))) + (type $FUNCSIG$vi (func (param i32))) + (type $FUNCSIG$iii (func (param i32 i32) (result i32))) + (type $FUNCSIG$jj (func (param i64) (result i64))) + (type $FUNCSIG$j (func (result i64))) + (type $FUNCSIG$vijfd (func (param i32 i64 f32 f64))) + (type $FUNCSIG$vijf (func (param i32 i64 f32))) + (type $FUNCSIG$vijdi (func (param i32 i64 f64 i32))) + (type $FUNCSIG$d (func (result f64))) (memory $0 0) (export "load-off-2" (func $load-off-2)) (func $f (; 0 ;) (type $0) (param $i1 i32) (param $i2 i64) @@ -224,7 +224,7 @@ (i32.const 0) ) ) - (func $load-store (; 1 ;) (type $1) + (func $load-store (; 1 ;) (type $FUNCSIG$v) (drop (i32.load8_u (i32.const 0) @@ -312,7 +312,7 @@ (i64.const 3) ) ) - (func $and-neg1 (; 2 ;) (type $1) + (func $and-neg1 (; 2 ;) (type $FUNCSIG$v) (drop (i32.const 100) ) @@ -323,7 +323,7 @@ ) ) ) - (func $and-pos1 (; 3 ;) (type $1) + (func $and-pos1 (; 3 ;) (type $FUNCSIG$v) (drop (i32.eqz (i32.const 1000) @@ -347,7 +347,7 @@ ) ) ) - (func $canonicalize (; 4 ;) (type $2) (param $x i32) (param $y i32) (param $fx f64) (param $fy f64) + (func $canonicalize (; 4 ;) (type $FUNCSIG$viidd) (param $x i32) (param $y i32) (param $fx f64) (param $fy f64) (drop (i32.and (unreachable) @@ -573,7 +573,7 @@ ) ) ) - (func $ne0 (; 5 ;) (type $3) (result i32) + (func $ne0 (; 5 ;) (type $FUNCSIG$i) (result i32) (if (call $ne0) (nop) @@ -604,7 +604,7 @@ ) (i32.const 1) ) - (func $recurse-bool (; 6 ;) (type $1) + (func $recurse-bool (; 6 ;) (type $FUNCSIG$v) (if (if (result i32) (i32.const 1) @@ -621,10 +621,10 @@ (nop) ) ) - (func $ne1 (; 7 ;) (type $3) (result i32) + (func $ne1 (; 7 ;) (type $FUNCSIG$i) (result i32) (unreachable) ) - (func $load-off-2 (; 8 ;) (type $4) (param $0 i32) (result i32) + (func $load-off-2 (; 8 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32) (i32.store (i32.const 6) (local.get $0) @@ -707,7 +707,7 @@ ) ) ) - (func $sign-ext (; 9 ;) (type $5) (param $0 i32) (param $1 i32) + (func $sign-ext (; 9 ;) (type $FUNCSIG$vii) (param $0 i32) (param $1 i32) (drop (i32.eqz (i32.and @@ -818,7 +818,7 @@ ) ) ) - (func $sign-ext-input (; 10 ;) (type $5) (param $0 i32) (param $1 i32) + (func $sign-ext-input (; 10 ;) (type $FUNCSIG$vii) (param $0 i32) (param $1 i32) (drop (i32.const 100) ) @@ -1149,7 +1149,7 @@ ) ) ) - (func $linear-sums (; 11 ;) (type $5) (param $0 i32) (param $1 i32) + (func $linear-sums (; 11 ;) (type $FUNCSIG$vii) (param $0 i32) (param $1 i32) (drop (i32.add (i32.shl @@ -1241,7 +1241,7 @@ (local.get $0) ) ) - (func $almost-sign-ext (; 12 ;) (type $6) (param $0 i32) + (func $almost-sign-ext (; 12 ;) (type $FUNCSIG$vi) (param $0 i32) (drop (i32.shr_s (i32.shl @@ -1258,7 +1258,7 @@ ) ) ) - (func $squaring (; 13 ;) (type $5) (param $0 i32) (param $1 i32) + (func $squaring (; 13 ;) (type $FUNCSIG$vii) (param $0 i32) (param $1 i32) (drop (i32.and (local.get $0) @@ -1314,7 +1314,7 @@ ) ) ) - (func $sign-ext-ne (; 14 ;) (type $5) (param $0 i32) (param $1 i32) + (func $sign-ext-ne (; 14 ;) (type $FUNCSIG$vii) (param $0 i32) (param $1 i32) (drop (i32.ne (i32.and @@ -1364,7 +1364,7 @@ ) ) ) - (func $sign-ext-eqz (; 15 ;) (type $5) (param $0 i32) (param $1 i32) + (func $sign-ext-eqz (; 15 ;) (type $FUNCSIG$vii) (param $0 i32) (param $1 i32) (drop (i32.eqz (i32.and @@ -1374,7 +1374,7 @@ ) ) ) - (func $sign-ext-boolean (; 16 ;) (type $5) (param $0 i32) (param $1 i32) + (func $sign-ext-boolean (; 16 ;) (type $FUNCSIG$vii) (param $0 i32) (param $1 i32) (drop (if (result i32) (i32.and @@ -1386,7 +1386,7 @@ ) ) ) - (func $add-sub-zero (; 17 ;) (type $5) (param $0 i32) (param $1 i32) + (func $add-sub-zero (; 17 ;) (type $FUNCSIG$vii) (param $0 i32) (param $1 i32) (drop (local.get $0) ) @@ -1394,7 +1394,7 @@ (local.get $0) ) ) - (func $store-signext (; 18 ;) (type $6) (param $0 i32) + (func $store-signext (; 18 ;) (type $FUNCSIG$vi) (param $0 i32) (i32.store8 (i32.const 8) (local.get $0) @@ -1452,7 +1452,7 @@ ) ) ) - (func $sign-ext-tee (; 19 ;) (type $5) (param $0 i32) (param $1 i32) + (func $sign-ext-tee (; 19 ;) (type $FUNCSIG$vii) (param $0 i32) (param $1 i32) (drop (i32.shr_s (i32.shl @@ -1470,7 +1470,7 @@ ) ) ) - (func $sign-ext-load (; 20 ;) (type $5) (param $0 i32) (param $1 i32) + (func $sign-ext-load (; 20 ;) (type $FUNCSIG$vii) (param $0 i32) (param $1 i32) (drop (i32.load8_s (i32.const 256) @@ -1541,7 +1541,7 @@ ) ) ) - (func $mask-bits (; 21 ;) (type $5) (param $0 i32) (param $1 i32) + (func $mask-bits (; 21 ;) (type $FUNCSIG$vii) (param $0 i32) (param $1 i32) (drop (local.tee $0 (i32.const 127) @@ -1595,7 +1595,7 @@ ) ) ) - (func $local-info-zero-ext (; 22 ;) (type $5) (param $0 i32) (param $1 i32) + (func $local-info-zero-ext (; 22 ;) (type $FUNCSIG$vii) (param $0 i32) (param $1 i32) (local $x i32) (local $y i32) (local $z i32) @@ -1646,7 +1646,7 @@ ) ) ) - (func $local-info-sign-ext-bitsize (; 23 ;) (type $5) (param $0 i32) (param $1 i32) + (func $local-info-sign-ext-bitsize (; 23 ;) (type $FUNCSIG$vii) (param $0 i32) (param $1 i32) (local $x i32) (local $y i32) (local $z i32) @@ -1706,7 +1706,7 @@ ) ) ) - (func $local-info-sign-ext-already-exted (; 24 ;) (type $5) (param $0 i32) (param $1 i32) + (func $local-info-sign-ext-already-exted (; 24 ;) (type $FUNCSIG$vii) (param $0 i32) (param $1 i32) (local $x i32) (local $y i32) (local $z i32) @@ -1817,7 +1817,7 @@ ) ) ) - (func $signed-loads-fill-the-bits (; 25 ;) (type $4) (param $$e i32) (result i32) + (func $signed-loads-fill-the-bits (; 25 ;) (type $FUNCSIG$ii) (param $$e i32) (result i32) (local $$0 i32) (local $$conv i32) (local.set $$0 @@ -1838,7 +1838,7 @@ ) ) ) - (func $local-info-sign-ext-already-exted-by-load (; 26 ;) (type $5) (param $0 i32) (param $1 i32) + (func $local-info-sign-ext-already-exted-by-load (; 26 ;) (type $FUNCSIG$vii) (param $0 i32) (param $1 i32) (local $x i32) (local $y i32) (local $z i32) @@ -1880,7 +1880,7 @@ ) ) ) - (func $compare-load-s-sign-extend (; 27 ;) (type $5) (param $0 i32) (param $1 i32) + (func $compare-load-s-sign-extend (; 27 ;) (type $FUNCSIG$vii) (param $0 i32) (param $1 i32) (drop (i32.eq (i32.load8_u @@ -1960,7 +1960,7 @@ ) ) ) - (func $unsign-diff-sizes (; 28 ;) (type $7) (param $x i32) (param $y i32) (result i32) + (func $unsign-diff-sizes (; 28 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (i32.ne (i32.shr_s (i32.shl @@ -1984,7 +1984,7 @@ ) ) ) - (func $unsign-same-sizes (; 29 ;) (type $7) (param $x i32) (param $y i32) (result i32) + (func $unsign-same-sizes (; 29 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (i32.ne (i32.and (call $unsign-same-sizes @@ -2002,7 +2002,7 @@ ) ) ) - (func $fuzz-almost-sign-ext (; 30 ;) (type $1) + (func $fuzz-almost-sign-ext (; 30 ;) (type $FUNCSIG$v) (drop (i32.shr_s (i32.shl @@ -2026,7 +2026,7 @@ ) ) ) - (func $fuzz-comp-impossible (; 31 ;) (type $6) (param $x i32) + (func $fuzz-comp-impossible (; 31 ;) (type $FUNCSIG$vi) (param $x i32) (drop (i32.eq (i32.and @@ -2091,7 +2091,7 @@ ) ) ) - (func $if-parallel (; 32 ;) (type $5) (param $0 i32) (param $1 i32) + (func $if-parallel (; 32 ;) (type $FUNCSIG$vii) (param $0 i32) (param $1 i32) (drop (i32.add (local.get $1) @@ -2146,7 +2146,7 @@ ) ) ) - (func $select-parallel (; 33 ;) (type $5) (param $0 i32) (param $1 i32) + (func $select-parallel (; 33 ;) (type $FUNCSIG$vii) (param $0 i32) (param $1 i32) (drop (i32.add (local.get $1) @@ -2202,7 +2202,7 @@ ) ) ) - (func $zero-shifts-is-not-sign-ext (; 34 ;) (type $1) + (func $zero-shifts-is-not-sign-ext (; 34 ;) (type $FUNCSIG$v) (drop (i32.eq (i32.load16_s align=1 @@ -2223,7 +2223,7 @@ ) ) ) - (func $zero-ops (; 35 ;) (type $3) (result i32) + (func $zero-ops (; 35 ;) (type $FUNCSIG$i) (result i32) (return (i32.eq (i32.load16_s align=1 @@ -2233,7 +2233,7 @@ ) ) ) - (func $sign-ext-1-and-ne (; 36 ;) (type $3) (result i32) + (func $sign-ext-1-and-ne (; 36 ;) (type $FUNCSIG$i) (result i32) (i32.ne (i32.and (call $sign-ext-1-and-ne) @@ -2242,7 +2242,7 @@ (i32.const -2147483648) ) ) - (func $neg-shifts-and-255 (; 37 ;) (type $3) (result i32) + (func $neg-shifts-and-255 (; 37 ;) (type $FUNCSIG$i) (result i32) (i32.and (i32.shr_u (i32.const -99) @@ -2251,7 +2251,7 @@ (i32.const 255) ) ) - (func $neg-shifts-and-255-b (; 38 ;) (type $3) (result i32) + (func $neg-shifts-and-255-b (; 38 ;) (type $FUNCSIG$i) (result i32) (i32.and (i32.shl (i32.const -2349025) @@ -2260,7 +2260,7 @@ (i32.const 255) ) ) - (func $shifts-square-overflow (; 39 ;) (type $4) (param $x i32) (result i32) + (func $shifts-square-overflow (; 39 ;) (type $FUNCSIG$ii) (param $x i32) (result i32) (i32.shr_u (i32.shr_u (local.get $x) @@ -2269,13 +2269,13 @@ (i32.const 32767) ) ) - (func $shifts-square-no-overflow-small (; 40 ;) (type $4) (param $x i32) (result i32) + (func $shifts-square-no-overflow-small (; 40 ;) (type $FUNCSIG$ii) (param $x i32) (result i32) (i32.shr_u (local.get $x) (i32.const 9) ) ) - (func $shifts-square-overflow-64 (; 41 ;) (type $8) (param $x i64) (result i64) + (func $shifts-square-overflow-64 (; 41 ;) (type $FUNCSIG$jj) (param $x i64) (result i64) (i64.shr_u (i64.shr_u (local.get $x) @@ -2284,13 +2284,13 @@ (i64.const 64767) ) ) - (func $shifts-square-no-overflow-small-64 (; 42 ;) (type $8) (param $x i64) (result i64) + (func $shifts-square-no-overflow-small-64 (; 42 ;) (type $FUNCSIG$jj) (param $x i64) (result i64) (i64.shr_u (local.get $x) (i64.const 9) ) ) - (func $shifts-square-unreachable (; 43 ;) (type $4) (param $x i32) (result i32) + (func $shifts-square-unreachable (; 43 ;) (type $FUNCSIG$ii) (param $x i32) (result i32) (i32.shr_u (i32.shr_u (unreachable) @@ -2299,7 +2299,7 @@ (i32.const 4098) ) ) - (func $mix-shifts (; 44 ;) (type $3) (result i32) + (func $mix-shifts (; 44 ;) (type $FUNCSIG$i) (result i32) (i32.shr_s (i32.shl (i32.const 23) @@ -2308,13 +2308,13 @@ (i32.const 168) ) ) - (func $actually-no-shifts (; 45 ;) (type $3) (result i32) + (func $actually-no-shifts (; 45 ;) (type $FUNCSIG$i) (result i32) (i32.const 33) ) - (func $less-shifts-than-it-seems (; 46 ;) (type $4) (param $x i32) (result i32) + (func $less-shifts-than-it-seems (; 46 ;) (type $FUNCSIG$ii) (param $x i32) (result i32) (i32.const 4800) ) - (func $and-popcount32 (; 47 ;) (type $3) (result i32) + (func $and-popcount32 (; 47 ;) (type $FUNCSIG$i) (result i32) (i32.and (i32.popcnt (i32.const -1) @@ -2322,12 +2322,12 @@ (i32.const 31) ) ) - (func $and-popcount32-big (; 48 ;) (type $3) (result i32) + (func $and-popcount32-big (; 48 ;) (type $FUNCSIG$i) (result i32) (i32.popcnt (i32.const -1) ) ) - (func $and-popcount64 (; 49 ;) (type $9) (result i64) + (func $and-popcount64 (; 49 ;) (type $FUNCSIG$j) (result i64) (i64.and (i64.popcnt (i64.const -1) @@ -2335,7 +2335,7 @@ (i64.const 63) ) ) - (func $and-popcount64-big (; 50 ;) (type $9) (result i64) + (func $and-popcount64-big (; 50 ;) (type $FUNCSIG$j) (result i64) (i64.and (i64.popcnt (i64.const -1) @@ -2343,7 +2343,7 @@ (i64.const 127) ) ) - (func $and-popcount64-bigger (; 51 ;) (type $9) (result i64) + (func $and-popcount64-bigger (; 51 ;) (type $FUNCSIG$j) (result i64) (i64.and (i64.popcnt (i64.const -1) @@ -2351,7 +2351,7 @@ (i64.const 255) ) ) - (func $optimizeAddedConstants-filters-through-nonzero (; 52 ;) (type $3) (result i32) + (func $optimizeAddedConstants-filters-through-nonzero (; 52 ;) (type $FUNCSIG$i) (result i32) (i32.add (i32.shl (i32.const -536870912) @@ -2362,7 +2362,7 @@ (i32.const -31744) ) ) - (func $optimizeAddedConstants-filters-through-nonzero-b (; 53 ;) (type $3) (result i32) + (func $optimizeAddedConstants-filters-through-nonzero-b (; 53 ;) (type $FUNCSIG$i) (result i32) (i32.add (i32.shl (i32.const -536870912) @@ -2373,7 +2373,7 @@ (i32.const -31744) ) ) - (func $return-proper-value-from-shift-left-by-zero (; 54 ;) (type $3) (result i32) + (func $return-proper-value-from-shift-left-by-zero (; 54 ;) (type $FUNCSIG$i) (result i32) (if (result i32) (i32.add (loop $label$0 (result i32) @@ -2392,7 +2392,7 @@ (i32.const 0) ) ) - (func $de-morgan-2 (; 55 ;) (type $5) (param $x i32) (param $y i32) + (func $de-morgan-2 (; 55 ;) (type $FUNCSIG$vii) (param $x i32) (param $y i32) (drop (i32.eqz (i32.or @@ -2458,7 +2458,7 @@ ) ) ) - (func $subzero1 (; 56 ;) (type $4) (param $0 i32) (result i32) + (func $subzero1 (; 56 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32) (i32.sub (i32.const 32) (i32.clz @@ -2466,7 +2466,7 @@ ) ) ) - (func $subzero2 (; 57 ;) (type $4) (param $0 i32) (result i32) + (func $subzero2 (; 57 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32) (i32.sub (i32.const 32) (i32.clz @@ -2474,7 +2474,7 @@ ) ) ) - (func $subzero3 (; 58 ;) (type $7) (param $0 i32) (param $1 i32) (result i32) + (func $subzero3 (; 58 ;) (type $FUNCSIG$iii) (param $0 i32) (param $1 i32) (result i32) (i32.sub (local.get $1) (i32.clz @@ -2482,7 +2482,7 @@ ) ) ) - (func $subzero4 (; 59 ;) (type $7) (param $0 i32) (param $1 i32) (result i32) + (func $subzero4 (; 59 ;) (type $FUNCSIG$iii) (param $0 i32) (param $1 i32) (result i32) (i32.sub (local.get $0) (i32.clz @@ -2490,7 +2490,7 @@ ) ) ) - (func $mul-power-2 (; 60 ;) (type $4) (param $x i32) (result i32) + (func $mul-power-2 (; 60 ;) (type $FUNCSIG$ii) (param $x i32) (result i32) (drop (call $mul-power-2 (i32.shl @@ -2545,7 +2545,7 @@ ) (unreachable) ) - (func $urem-power-2 (; 61 ;) (type $4) (param $x i32) (result i32) + (func $urem-power-2 (; 61 ;) (type $FUNCSIG$ii) (param $x i32) (result i32) (drop (call $urem-power-2 (i32.and @@ -2593,10 +2593,10 @@ ) (unreachable) ) - (func $orZero (; 62 ;) (type $4) (param $0 i32) (result i32) + (func $orZero (; 62 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32) (local.get $0) ) - (func $andZero (; 63 ;) (type $4) (param $0 i32) (result i32) + (func $andZero (; 63 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32) (drop (i32.const 0) ) @@ -2610,7 +2610,7 @@ ) (unreachable) ) - (func $abstract-additions (; 64 ;) (type $10) (param $x32 i32) (param $x64 i64) (param $y32 f32) (param $y64 f64) + (func $abstract-additions (; 64 ;) (type $FUNCSIG$vijfd) (param $x32 i32) (param $x64 i64) (param $y32 f32) (param $y64 f64) (drop (local.get $x32) ) @@ -2816,7 +2816,7 @@ ) ) ) - (func $negatives-are-sometimes-better (; 65 ;) (type $11) (param $x i32) (param $y i64) (param $z f32) + (func $negatives-are-sometimes-better (; 65 ;) (type $FUNCSIG$vijf) (param $x i32) (param $y i64) (param $z f32) (drop (i32.sub (local.get $x) @@ -2914,7 +2914,7 @@ ) ) ) - (func $shift-a-zero (; 66 ;) (type $11) (param $x i32) (param $y i64) (param $z f32) + (func $shift-a-zero (; 66 ;) (type $FUNCSIG$vijf) (param $x i32) (param $y i64) (param $z f32) (drop (i32.const 0) ) @@ -2934,7 +2934,7 @@ ) ) ) - (func $identical-siblings (; 67 ;) (type $12) (param $x i32) (param $y i64) (param $z f64) (param $xx i32) + (func $identical-siblings (; 67 ;) (type $FUNCSIG$vijdi) (param $x i32) (param $y i64) (param $z f64) (param $xx i32) (drop (i32.const 0) ) @@ -3071,7 +3071,7 @@ (local.get $x) ) ) - (func $select-on-const (; 70 ;) (type $5) (param $x i32) (param $y i32) + (func $select-on-const (; 70 ;) (type $FUNCSIG$vii) (param $x i32) (param $y i32) (drop (local.get $x) ) @@ -3108,7 +3108,7 @@ ) ) ) - (func $getFallthrough (; 71 ;) (type $1) + (func $getFallthrough (; 71 ;) (type $FUNCSIG$v) (local $x0 i32) (local $x1 i32) (local $x2 i32) @@ -3187,7 +3187,7 @@ ) ) ) - (func $tee-with-unreachable-value (; 72 ;) (type $13) (result f64) + (func $tee-with-unreachable-value (; 72 ;) (type $FUNCSIG$d) (result f64) (local $var$0 i32) (block $label$1 (result f64) (local.tee $var$0 @@ -3198,7 +3198,7 @@ ) ) ) - (func $add-sub-zero-reorder-1 (; 73 ;) (type $4) (param $temp i32) (result i32) + (func $add-sub-zero-reorder-1 (; 73 ;) (type $FUNCSIG$ii) (param $temp i32) (result i32) (i32.add (i32.add (i32.sub @@ -3212,7 +3212,7 @@ (i32.const 2) ) ) - (func $add-sub-zero-reorder-2 (; 74 ;) (type $4) (param $temp i32) (result i32) + (func $add-sub-zero-reorder-2 (; 74 ;) (type $FUNCSIG$ii) (param $temp i32) (result i32) (i32.add (i32.sub (local.tee $temp @@ -3223,7 +3223,7 @@ (i32.const 2) ) ) - (func $pre-combine-or (; 75 ;) (type $5) (param $x i32) (param $y i32) + (func $pre-combine-or (; 75 ;) (type $FUNCSIG$vii) (param $x i32) (param $y i32) (drop (i32.ge_s (local.get $x) @@ -3285,7 +3285,7 @@ ) ) ) - (func $combine-or (; 76 ;) (type $5) (param $x i32) (param $y i32) + (func $combine-or (; 76 ;) (type $FUNCSIG$vii) (param $x i32) (param $y i32) (drop (i32.ge_s (local.get $x) @@ -3295,9 +3295,9 @@ ) ) (module - (type $0 (func)) + (type $FUNCSIG$v (func)) (import "env" "memory" (memory $0 (shared 256 256))) - (func $x (; 0 ;) (type $0) + (func $x (; 0 ;) (type $FUNCSIG$v) (drop (i32.shr_s (i32.shl diff --git a/test/passes/optimize-instructions_optimize-level=2_ignore-implicit-traps.txt b/test/passes/optimize-instructions_optimize-level=2_ignore-implicit-traps.txt index a58efa46a..1f68bded1 100644 --- a/test/passes/optimize-instructions_optimize-level=2_ignore-implicit-traps.txt +++ b/test/passes/optimize-instructions_optimize-level=2_ignore-implicit-traps.txt @@ -1,6 +1,6 @@ (module (type $0 (func (param i32 i32) (result i32))) - (type $1 (func (result f64))) + (type $FUNCSIG$d (func (result f64))) (memory $0 0) (func $conditionals (; 0 ;) (type $0) (param $0 i32) (param $1 i32) (result i32) (local $2 i32) @@ -322,7 +322,7 @@ (local.get $1) ) ) - (func $conditionalize-if-type-change (; 5 ;) (type $1) (result f64) + (func $conditionalize-if-type-change (; 5 ;) (type $FUNCSIG$d) (result f64) (local $0 i32) (drop (loop $label$1 (result f32) diff --git a/test/passes/pick-load-signs.txt b/test/passes/pick-load-signs.txt index 126343b79..d4b1d62c1 100644 --- a/test/passes/pick-load-signs.txt +++ b/test/passes/pick-load-signs.txt @@ -1,8 +1,8 @@ (module - (type $0 (func)) - (type $1 (func (result i32))) + (type $FUNCSIG$v (func)) + (type $FUNCSIG$i (func (result i32))) (memory $0 1) - (func $a (; 0 ;) (type $0) + (func $a (; 0 ;) (type $FUNCSIG$v) (local $y i32) (local.set $y (i32.load8_u @@ -16,7 +16,7 @@ ) ) ) - (func $b (; 1 ;) (type $0) + (func $b (; 1 ;) (type $FUNCSIG$v) (local $y i32) (local.set $y (i32.load16_u @@ -30,7 +30,7 @@ ) ) ) - (func $c (; 2 ;) (type $0) + (func $c (; 2 ;) (type $FUNCSIG$v) (local $y i32) (local.set $y (i32.load8_u @@ -44,7 +44,7 @@ ) ) ) - (func $d (; 3 ;) (type $0) + (func $d (; 3 ;) (type $FUNCSIG$v) (local $y i32) (local.set $y (i32.load16_u @@ -58,7 +58,7 @@ ) ) ) - (func $one-of-each (; 4 ;) (type $0) + (func $one-of-each (; 4 ;) (type $FUNCSIG$v) (local $y i32) (local.set $y (i32.load8_s @@ -81,7 +81,7 @@ ) ) ) - (func $more-of-one (; 5 ;) (type $0) + (func $more-of-one (; 5 ;) (type $FUNCSIG$v) (local $y i32) (local.set $y (i32.load8_s @@ -110,7 +110,7 @@ ) ) ) - (func $many-more-of-one (; 6 ;) (type $0) + (func $many-more-of-one (; 6 ;) (type $FUNCSIG$v) (local $y i32) (local.set $y (i32.load8_u @@ -145,7 +145,7 @@ ) ) ) - (func $a-sign (; 7 ;) (type $0) + (func $a-sign (; 7 ;) (type $FUNCSIG$v) (local $y i32) (local.set $y (i32.load8_s @@ -162,7 +162,7 @@ ) ) ) - (func $multivar (; 8 ;) (type $0) + (func $multivar (; 8 ;) (type $FUNCSIG$v) (local $x i32) (local $y i32) (local.set $x @@ -191,7 +191,7 @@ ) ) ) - (func $corners (; 9 ;) (type $0) + (func $corners (; 9 ;) (type $FUNCSIG$v) (local $y i32) (drop (i32.load8_s @@ -207,7 +207,7 @@ (i32.const 1024) ) ) - (func $wrong-size (; 10 ;) (type $0) + (func $wrong-size (; 10 ;) (type $FUNCSIG$v) (local $y i32) (local.set $y (i32.load8_s @@ -221,7 +221,7 @@ ) ) ) - (func $wrong-size_s (; 11 ;) (type $0) + (func $wrong-size_s (; 11 ;) (type $FUNCSIG$v) (local $y i32) (local.set $y (i32.load8_u @@ -238,7 +238,7 @@ ) ) ) - (func $non-sign-or-unsigned-use (; 12 ;) (type $0) + (func $non-sign-or-unsigned-use (; 12 ;) (type $FUNCSIG$v) (local $y i32) (local.set $y (i32.load8_s @@ -255,12 +255,12 @@ (local.get $y) ) ) - (func $toplevel-load (; 13 ;) (type $1) (result i32) + (func $toplevel-load (; 13 ;) (type $FUNCSIG$i) (result i32) (i32.load8_s (i32.const 1024) ) ) - (func $tees (; 14 ;) (type $0) + (func $tees (; 14 ;) (type $FUNCSIG$v) (local $y i32) (drop (local.tee $y diff --git a/test/passes/post-emscripten.txt b/test/passes/post-emscripten.txt index 089287fbf..c6b53e43c 100644 --- a/test/passes/post-emscripten.txt +++ b/test/passes/post-emscripten.txt @@ -1,10 +1,10 @@ (module (type $0 (func (param i32))) (type $FUNCSIG$ddd (func (param f64 f64) (result f64))) - (type $2 (func)) + (type $FUNCSIG$v (func)) (import "global.Math" "pow" (func $Math_pow (param f64 f64) (result f64))) (memory $0 256 256) - (func $pow2 (; 1 ;) (type $2) + (func $pow2 (; 1 ;) (type $FUNCSIG$v) (local $x f64) (local $y f64) (local $2 f64) @@ -55,7 +55,7 @@ ) ) ) - (func $pow.2 (; 2 ;) (type $2) + (func $pow.2 (; 2 ;) (type $FUNCSIG$v) (drop (f64.sqrt (f64.const 1) diff --git a/test/passes/precompute-propagate.txt b/test/passes/precompute-propagate.txt index 0db40489f..a544c30ba 100644 --- a/test/passes/precompute-propagate.txt +++ b/test/passes/precompute-propagate.txt @@ -1,10 +1,10 @@ (module - (type $0 (func (param i32))) - (type $1 (func (param i32) (result i32))) - (type $2 (func (param i32 i32) (result i32))) - (type $3 (func (param i32 i32 i32) (result i32))) + (type $FUNCSIG$vi (func (param i32))) + (type $FUNCSIG$ii (func (param i32) (result i32))) + (type $FUNCSIG$iii (func (param i32 i32) (result i32))) + (type $FUNCSIG$iiii (func (param i32 i32 i32) (result i32))) (memory $0 10 10) - (func $basic (; 0 ;) (type $0) (param $p i32) + (func $basic (; 0 ;) (type $FUNCSIG$vi) (param $p i32) (local $x i32) (local.set $x (i32.const 10) @@ -13,7 +13,7 @@ (i32.const 20) ) ) - (func $split (; 1 ;) (type $0) (param $p i32) + (func $split (; 1 ;) (type $FUNCSIG$vi) (param $p i32) (local $x i32) (if (i32.const 1) @@ -28,7 +28,7 @@ ) ) ) - (func $split-but-join (; 2 ;) (type $0) (param $p i32) + (func $split-but-join (; 2 ;) (type $FUNCSIG$vi) (param $p i32) (local $x i32) (if (i32.const 1) @@ -43,7 +43,7 @@ (i32.const 20) ) ) - (func $split-but-join-different (; 3 ;) (type $0) (param $p i32) + (func $split-but-join-different (; 3 ;) (type $FUNCSIG$vi) (param $p i32) (local $x i32) (if (i32.const 1) @@ -61,7 +61,7 @@ ) ) ) - (func $split-but-join-different-b (; 4 ;) (type $0) (param $p i32) + (func $split-but-join-different-b (; 4 ;) (type $FUNCSIG$vi) (param $p i32) (local $x i32) (if (i32.const 1) @@ -79,7 +79,7 @@ ) ) ) - (func $split-but-join-init0 (; 5 ;) (type $0) (param $p i32) + (func $split-but-join-init0 (; 5 ;) (type $FUNCSIG$vi) (param $p i32) (local $x i32) (if (i32.const 1) @@ -91,7 +91,7 @@ (i32.const 0) ) ) - (func $later (; 6 ;) (type $0) (param $p i32) + (func $later (; 6 ;) (type $FUNCSIG$vi) (param $p i32) (local $x i32) (local.set $x (i32.const 10) @@ -109,7 +109,7 @@ (i32.const 39) ) ) - (func $later2 (; 7 ;) (type $1) (param $p i32) (result i32) + (func $later2 (; 7 ;) (type $FUNCSIG$ii) (param $p i32) (result i32) (local $x i32) (local.set $x (i32.const 10) @@ -119,7 +119,7 @@ ) (i32.const 20) ) - (func $two-ways-but-identical (; 8 ;) (type $1) (param $p i32) (result i32) + (func $two-ways-but-identical (; 8 ;) (type $FUNCSIG$ii) (param $p i32) (result i32) (local $x i32) (local $y i32) (local.set $x @@ -139,7 +139,7 @@ ) (i32.const 21) ) - (func $two-ways-but-almost-identical (; 9 ;) (type $1) (param $p i32) (result i32) + (func $two-ways-but-almost-identical (; 9 ;) (type $FUNCSIG$ii) (param $p i32) (result i32) (local $x i32) (local $y i32) (local.set $x @@ -162,7 +162,7 @@ ) (local.get $y) ) - (func $deadloop (; 10 ;) (type $1) (param $p i32) (result i32) + (func $deadloop (; 10 ;) (type $FUNCSIG$ii) (param $p i32) (result i32) (local $x i32) (local $y i32) (loop $loop @@ -175,7 +175,7 @@ (br $loop) ) ) - (func $deadloop2 (; 11 ;) (type $0) (param $p i32) + (func $deadloop2 (; 11 ;) (type $FUNCSIG$vi) (param $p i32) (local $x i32) (local $y i32) (loop $loop @@ -194,7 +194,7 @@ (br $loop) ) ) - (func $deadloop3 (; 12 ;) (type $0) (param $p i32) + (func $deadloop3 (; 12 ;) (type $FUNCSIG$vi) (param $p i32) (local $x i32) (local $y i32) (loop $loop @@ -213,7 +213,7 @@ (br $loop) ) ) - (func $through-tee (; 13 ;) (type $2) (param $x i32) (param $y i32) (result i32) + (func $through-tee (; 13 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (local.set $x (local.tee $y (i32.const 7) @@ -223,7 +223,7 @@ (i32.const 14) ) ) - (func $through-tee-more (; 14 ;) (type $2) (param $x i32) (param $y i32) (result i32) + (func $through-tee-more (; 14 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (local.set $x (i32.eqz (local.tee $y @@ -235,13 +235,13 @@ (i32.const 7) ) ) - (func $multipass (; 15 ;) (type $3) (param $0 i32) (param $1 i32) (param $2 i32) (result i32) + (func $multipass (; 15 ;) (type $FUNCSIG$iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32) (local $3 i32) (nop) (nop) (local.get $2) ) - (func $through-fallthrough (; 16 ;) (type $2) (param $x i32) (param $y i32) (result i32) + (func $through-fallthrough (; 16 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (local.set $x (block $block (result i32) (nop) diff --git a/test/passes/precompute_all-features.txt b/test/passes/precompute_all-features.txt index a6eae53d3..c662aa406 100644 --- a/test/passes/precompute_all-features.txt +++ b/test/passes/precompute_all-features.txt @@ -1,9 +1,9 @@ (module (type $0 (func (param i32))) - (type $1 (func (result i32))) - (type $2 (func)) - (type $3 (func (result f64))) - (type $4 (func (result v128))) + (type $FUNCSIG$i (func (result i32))) + (type $FUNCSIG$v (func)) + (type $FUNCSIG$d (func (result f64))) + (type $FUNCSIG$V (func (result v128))) (memory $0 512 512) (data (i32.const 0) "passive") (global $global i32 (i32.const 1)) @@ -89,7 +89,7 @@ (i32.const 0) ) ) - (func $ret (; 1 ;) (type $1) (result i32) + (func $ret (; 1 ;) (type $FUNCSIG$i) (result i32) (if (call $ret) (return @@ -104,13 +104,13 @@ ) (i32.const 1) ) - (func $noret (; 2 ;) (type $2) + (func $noret (; 2 ;) (type $FUNCSIG$v) (if (call $ret) (return) ) ) - (func $refinalize-br-condition-unreachable (; 3 ;) (type $2) + (func $refinalize-br-condition-unreachable (; 3 ;) (type $FUNCSIG$v) (block $label$1 (drop (br_if $label$1 @@ -119,7 +119,7 @@ ) ) ) - (func $br_if-condition-is-block-i32-but-unreachable-so-refinalize-tricky (; 4 ;) (type $2) + (func $br_if-condition-is-block-i32-but-unreachable-so-refinalize-tricky (; 4 ;) (type $FUNCSIG$v) (drop (block $label$1 (result i32) (drop @@ -134,7 +134,7 @@ ) ) ) - (func $reuse-br-value (; 5 ;) (type $3) (result f64) + (func $reuse-br-value (; 5 ;) (type $FUNCSIG$d) (result f64) (block $label$0 (result f64) (i32.store8 (i32.const 1919623207) @@ -161,7 +161,7 @@ (f64.const 4776014875438170098655851e156) ) ) - (func $refinalize-two-breaks-one-unreachable (; 6 ;) (type $2) + (func $refinalize-two-breaks-one-unreachable (; 6 ;) (type $FUNCSIG$v) (drop (block $label$0 (result i64) (block @@ -184,7 +184,7 @@ ) ) ) - (func $one-break-value-and-it-is-unreachable (; 7 ;) (type $3) (result f64) + (func $one-break-value-and-it-is-unreachable (; 7 ;) (type $FUNCSIG$d) (result f64) (local $var$0 i32) (block $label$6 (block @@ -195,16 +195,16 @@ ) ) ) - (func $global-notprecomputable (; 8 ;) (type $1) (result i32) + (func $global-notprecomputable (; 8 ;) (type $FUNCSIG$i) (result i32) (i32.add (i32.const 1) (global.get $global-mut) ) ) - (func $global-precomputable (; 9 ;) (type $1) (result i32) + (func $global-precomputable (; 9 ;) (type $FUNCSIG$i) (result i32) (i32.const 2) ) - (func $global-partiallyprecomputable (; 10 ;) (type $1) (result i32) + (func $global-partiallyprecomputable (; 10 ;) (type $FUNCSIG$i) (result i32) (i32.sub (i32.add (i32.const 1) @@ -213,36 +213,36 @@ (i32.const 2) ) ) - (func $no-simd-precompute (; 11 ;) (type $4) (result v128) + (func $no-simd-precompute (; 11 ;) (type $FUNCSIG$V) (result v128) (i32x4.splat (i32.const 0) ) ) - (func $no-simd-precompute-if (; 12 ;) (type $4) (result v128) + (func $no-simd-precompute-if (; 12 ;) (type $FUNCSIG$V) (result v128) (return (i32x4.splat (i32.const 0) ) ) ) - (func $no-memory-init-precompute (; 13 ;) (type $2) + (func $no-memory-init-precompute (; 13 ;) (type $FUNCSIG$v) (memory.init 0 (i32.const 512) (i32.const 0) (i32.const 12) ) ) - (func $no-data-drop-precompute (; 14 ;) (type $2) + (func $no-data-drop-precompute (; 14 ;) (type $FUNCSIG$v) (data.drop 0) ) - (func $no-memory-copy-precompute (; 15 ;) (type $2) + (func $no-memory-copy-precompute (; 15 ;) (type $FUNCSIG$v) (memory.copy (i32.const 512) (i32.const 0) (i32.const 12) ) ) - (func $no-memory-fill-precompute (; 16 ;) (type $2) + (func $no-memory-fill-precompute (; 16 ;) (type $FUNCSIG$v) (memory.fill (i32.const 512) (i32.const 0) diff --git a/test/passes/precompute_coalesce-locals_vacuum.txt b/test/passes/precompute_coalesce-locals_vacuum.txt index a4d1ce982..2129f2418 100644 --- a/test/passes/precompute_coalesce-locals_vacuum.txt +++ b/test/passes/precompute_coalesce-locals_vacuum.txt @@ -1,6 +1,6 @@ (module - (type $0 (func (param i32) (result i32))) - (func $nested-br_if-value (; 0 ;) (type $0) (param $0 i32) (result i32) + (type $FUNCSIG$ii (func (param i32) (result i32))) + (func $nested-br_if-value (; 0 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32) (loop $label$0 (br $label$0) ) diff --git a/test/passes/print-call-graph.txt b/test/passes/print-call-graph.txt index f02d08efa..ce77ab850 100644 --- a/test/passes/print-call-graph.txt +++ b/test/passes/print-call-graph.txt @@ -118,8 +118,8 @@ digraph call { (type $FUNCSIG$vi (func (param i32))) (type $FUNCSIG$iii (func (param i32 i32) (result i32))) (type $FUNCSIG$vii (func (param i32 i32))) - (type $6 (func (result i32))) - (type $7 (func (param i32 i32 i32 i32) (result i32))) + (type $FUNCSIG$i (func (result i32))) + (type $FUNCSIG$iiiii (func (param i32 i32 i32 i32) (result i32))) (import "env" "memory" (memory $0 256 256)) (data (global.get $memoryBase) "\05\00\00\00\00\00\00\00\00\00\00\00\01\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\01\00\00\00\02\00\00\00\b0\04\00\00\00\04\00\00\00\00\00\00\00\00\00\00\01\00\00\00\00\00\00\00\00\00\00\00\00\00\00\n\ff\ff\ff\ff\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\04") (import "env" "table" (table $0 9 9 funcref)) @@ -208,7 +208,7 @@ digraph call { ) (local.get $1) ) - (func $stackSave (; 11 ;) (type $6) (result i32) + (func $stackSave (; 11 ;) (type $FUNCSIG$i) (result i32) (global.get $STACKTOP) ) (func $stackRestore (; 12 ;) (type $FUNCSIG$vi) (param $0 i32) @@ -244,7 +244,7 @@ digraph call { (local.get $0) ) ) - (func $getTempRet0 (; 16 ;) (type $6) (result i32) + (func $getTempRet0 (; 16 ;) (type $FUNCSIG$i) (result i32) (global.get $tempRet0) ) (func $_malloc (; 17 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32) @@ -253,7 +253,7 @@ digraph call { (func $_free (; 18 ;) (type $FUNCSIG$vi) (param $0 i32) (nop) ) - (func $_main (; 19 ;) (type $6) (result i32) + (func $_main (; 19 ;) (type $FUNCSIG$i) (result i32) (local $0 i32) (i64.store align=4 (local.tee $0 @@ -733,7 +733,7 @@ digraph call { (local.get $0) ) ) - (func $___errno_location (; 24 ;) (type $6) (result i32) + (func $___errno_location (; 24 ;) (type $FUNCSIG$i) (result i32) (if (result i32) (i32.load (i32.const 1140) @@ -1115,7 +1115,7 @@ digraph call { ) (local.get $0) ) - (func $__ZSt15get_new_handlerv (; 30 ;) (type $6) (result i32) + (func $__ZSt15get_new_handlerv (; 30 ;) (type $FUNCSIG$i) (result i32) (local $0 i32) (i32.store (i32.const 1188) @@ -1420,7 +1420,7 @@ digraph call { ) (local.get $3) ) - (func $_pthread_self (; 34 ;) (type $6) (result i32) + (func $_pthread_self (; 34 ;) (type $FUNCSIG$i) (result i32) (i32.const 0) ) (func $dynCall_ii (; 35 ;) (type $FUNCSIG$iii) (param $0 i32) (param $1 i32) (result i32) @@ -1435,7 +1435,7 @@ digraph call { ) ) ) - (func $dynCall_iiii (; 36 ;) (type $7) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32) + (func $dynCall_iiii (; 36 ;) (type $FUNCSIG$iiiii) (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32) (call_indirect (type $FUNCSIG$iiii) (local.get $1) (local.get $2) diff --git a/test/passes/remove-non-js-ops.txt b/test/passes/remove-non-js-ops.txt index 6b579d65e..333b11536 100644 --- a/test/passes/remove-non-js-ops.txt +++ b/test/passes/remove-non-js-ops.txt @@ -1,11 +1,11 @@ (module - (type $0 (func (param f64 f64) (result f64))) - (type $1 (func (param f32 f32) (result f32))) - (type $2 (func (param i32 i32) (result i32))) - (type $3 (func (param i64 i64) (result i64))) - (type $4 (func (param f64) (result f64))) - (type $5 (func (param f32) (result f32))) - (type $6 (func (param i32) (result i32))) + (type $FUNCSIG$ddd (func (param f64 f64) (result f64))) + (type $FUNCSIG$fff (func (param f32 f32) (result f32))) + (type $FUNCSIG$iii (func (param i32 i32) (result i32))) + (type $FUNCSIG$jjj (func (param i64 i64) (result i64))) + (type $FUNCSIG$dd (func (param f64) (result f64))) + (type $FUNCSIG$ff (func (param f32) (result f32))) + (type $FUNCSIG$ii (func (param i32) (result i32))) (import "env" "wasm2js_scratch_load_i32" (func $wasm2js_scratch_load_i32 (param i32) (result i32))) (import "env" "wasm2js_scratch_store_i32" (func $wasm2js_scratch_store_i32 (param i32 i32))) (import "env" "wasm2js_scratch_load_i64" (func $wasm2js_scratch_load_i64 (result i64))) @@ -15,7 +15,7 @@ (import "env" "wasm2js_scratch_load_f64" (func $wasm2js_scratch_load_f64 (result f64))) (import "env" "wasm2js_scratch_store_f64" (func $wasm2js_scratch_store_f64 (param f64))) (memory $0 1) - (func $copysign64 (; 8 ;) (type $0) (param $0 f64) (param $1 f64) (result f64) + (func $copysign64 (; 8 ;) (type $FUNCSIG$ddd) (param $0 f64) (param $1 f64) (result f64) (f64.reinterpret_i64 (i64.or (i64.and @@ -33,7 +33,7 @@ ) ) ) - (func $copysign32 (; 9 ;) (type $1) (param $0 f32) (param $1 f32) (result f32) + (func $copysign32 (; 9 ;) (type $FUNCSIG$fff) (param $0 f32) (param $1 f32) (result f32) (f32.reinterpret_i32 (i32.or (i32.and @@ -51,85 +51,85 @@ ) ) ) - (func $rotl32 (; 10 ;) (type $2) (param $0 i32) (param $1 i32) (result i32) + (func $rotl32 (; 10 ;) (type $FUNCSIG$iii) (param $0 i32) (param $1 i32) (result i32) (call $__wasm_rotl_i32 (local.get $0) (local.get $1) ) ) - (func $rotr32 (; 11 ;) (type $2) (param $0 i32) (param $1 i32) (result i32) + (func $rotr32 (; 11 ;) (type $FUNCSIG$iii) (param $0 i32) (param $1 i32) (result i32) (call $__wasm_rotr_i32 (local.get $0) (local.get $1) ) ) - (func $rotl64 (; 12 ;) (type $3) (param $0 i64) (param $1 i64) (result i64) + (func $rotl64 (; 12 ;) (type $FUNCSIG$jjj) (param $0 i64) (param $1 i64) (result i64) (call $__wasm_rotl_i64 (local.get $0) (local.get $1) ) ) - (func $rotr64 (; 13 ;) (type $3) (param $0 i64) (param $1 i64) (result i64) + (func $rotr64 (; 13 ;) (type $FUNCSIG$jjj) (param $0 i64) (param $1 i64) (result i64) (call $__wasm_rotr_i64 (local.get $0) (local.get $1) ) ) - (func $nearest64 (; 14 ;) (type $4) (param $0 f64) (result f64) + (func $nearest64 (; 14 ;) (type $FUNCSIG$dd) (param $0 f64) (result f64) (call $__wasm_nearest_f64 (local.get $0) ) ) - (func $nearest32 (; 15 ;) (type $5) (param $0 f32) (result f32) + (func $nearest32 (; 15 ;) (type $FUNCSIG$ff) (param $0 f32) (result f32) (call $__wasm_nearest_f32 (local.get $0) ) ) - (func $trunc64 (; 16 ;) (type $4) (param $0 f64) (result f64) + (func $trunc64 (; 16 ;) (type $FUNCSIG$dd) (param $0 f64) (result f64) (call $__wasm_trunc_f64 (local.get $0) ) ) - (func $trunc32 (; 17 ;) (type $5) (param $0 f32) (result f32) + (func $trunc32 (; 17 ;) (type $FUNCSIG$ff) (param $0 f32) (result f32) (call $__wasm_trunc_f32 (local.get $0) ) ) - (func $popcnt32 (; 18 ;) (type $6) (param $0 i32) (result i32) + (func $popcnt32 (; 18 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32) (call $__wasm_popcnt_i32 (local.get $0) ) ) - (func $ctz32 (; 19 ;) (type $6) (param $0 i32) (result i32) + (func $ctz32 (; 19 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32) (call $__wasm_ctz_i32 (local.get $0) ) ) - (func $i64_sdiv (; 20 ;) (type $3) (param $0 i64) (param $1 i64) (result i64) + (func $i64_sdiv (; 20 ;) (type $FUNCSIG$jjj) (param $0 i64) (param $1 i64) (result i64) (call $__wasm_i64_sdiv (local.get $0) (local.get $1) ) ) - (func $i64_udiv (; 21 ;) (type $3) (param $0 i64) (param $1 i64) (result i64) + (func $i64_udiv (; 21 ;) (type $FUNCSIG$jjj) (param $0 i64) (param $1 i64) (result i64) (call $__wasm_i64_udiv (local.get $0) (local.get $1) ) ) - (func $i64_srem (; 22 ;) (type $3) (param $0 i64) (param $1 i64) (result i64) + (func $i64_srem (; 22 ;) (type $FUNCSIG$jjj) (param $0 i64) (param $1 i64) (result i64) (call $__wasm_i64_srem (local.get $0) (local.get $1) ) ) - (func $i64_urem (; 23 ;) (type $3) (param $0 i64) (param $1 i64) (result i64) + (func $i64_urem (; 23 ;) (type $FUNCSIG$jjj) (param $0 i64) (param $1 i64) (result i64) (call $__wasm_i64_urem (local.get $0) (local.get $1) ) ) - (func $i64_mul (; 24 ;) (type $3) (param $0 i64) (param $1 i64) (result i64) + (func $i64_mul (; 24 ;) (type $FUNCSIG$jjj) (param $0 i64) (param $1 i64) (result i64) (call $__wasm_i64_mul (local.get $0) (local.get $1) diff --git a/test/passes/remove-unused-brs.txt b/test/passes/remove-unused-brs.txt index 8282d888f..944828d5c 100644 --- a/test/passes/remove-unused-brs.txt +++ b/test/passes/remove-unused-brs.txt @@ -2,15 +2,15 @@ (type $0 (func (param i32))) (type $1 (func)) (type $2 (func (result i32))) - (type $3 (func (param i32 i32) (result i32))) - (type $4 (func (param i32 i32))) - (type $5 (func (param f32 i32 f32 i32 i32 f64 f32) (result i32))) - (type $6 (func (param i32) (result i64))) - (type $7 (func (result i64))) - (type $8 (func (result f32))) - (type $9 (func (param i32) (result f32))) - (type $10 (func (param i32) (result i32))) - (type $11 (func (param i32 f64 i32 f64 f32 f32) (result i32))) + (type $FUNCSIG$iii (func (param i32 i32) (result i32))) + (type $FUNCSIG$vii (func (param i32 i32))) + (type $FUNCSIG$ififiidf (func (param f32 i32 f32 i32 i32 f64 f32) (result i32))) + (type $FUNCSIG$ji (func (param i32) (result i64))) + (type $FUNCSIG$j (func (result i64))) + (type $FUNCSIG$f (func (result f32))) + (type $FUNCSIG$fi (func (param i32) (result f32))) + (type $FUNCSIG$ii (func (param i32) (result i32))) + (type $FUNCSIG$iididff (func (param i32 f64 i32 f64 f32 f32) (result i32))) (memory $0 256 256) (func $b0-yes (; 0 ;) (type $0) (param $i1 i32) (block $topmost @@ -767,7 +767,7 @@ ) ) ) - (func $if-to-br_if-conflict (; 28 ;) (type $3) (param $x i32) (param $y i32) (result i32) + (func $if-to-br_if-conflict (; 28 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (block $leave (local.set $y (block $out (result i32) @@ -794,7 +794,7 @@ (local.get $y) ) ) - (func $if-to-br_if-conflict2 (; 29 ;) (type $3) (param $x i32) (param $y i32) (result i32) + (func $if-to-br_if-conflict2 (; 29 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (block $leave (local.set $y (block $out (result i32) @@ -821,7 +821,7 @@ (local.get $y) ) ) - (func $if-to-br_if-value-sideeffect (; 30 ;) (type $3) (param $x i32) (param $y i32) (result i32) + (func $if-to-br_if-value-sideeffect (; 30 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (block $leave (local.set $y (block $out (result i32) @@ -849,7 +849,7 @@ (local.get $y) ) ) - (func $fuzz (; 31 ;) (type $4) (param $j i32) (param $g i32) + (func $fuzz (; 31 ;) (type $FUNCSIG$vii) (param $j i32) (param $g i32) (loop $label$continue$d (block $label$break$c (block $label$break$d @@ -977,7 +977,7 @@ ) ) ) - (func $untaken-brs-might-prevent-block-removal (; 36 ;) (type $5) (param $0 f32) (param $1 i32) (param $2 f32) (param $3 i32) (param $4 i32) (param $5 f64) (param $6 f32) (result i32) + (func $untaken-brs-might-prevent-block-removal (; 36 ;) (type $FUNCSIG$ififiidf) (param $0 f32) (param $1 i32) (param $2 f32) (param $3 i32) (param $4 i32) (param $5 f64) (param $6 f32) (result i32) (block $label$0 (result i32) (block $label$1 (br_if $label$1 @@ -1012,7 +1012,7 @@ (i32.const 1935947830) ) ) - (func $unexitable-loops-result (; 37 ;) (type $6) (param $0 i32) (result i64) + (func $unexitable-loops-result (; 37 ;) (type $FUNCSIG$ji) (param $0 i32) (result i64) (loop $label$0 (loop $label$1 (br_if $label$0 @@ -1067,7 +1067,7 @@ ) ) ) - (func $unreachable-if-that-could-be-a-br_if (; 41 ;) (type $7) (result i64) + (func $unreachable-if-that-could-be-a-br_if (; 41 ;) (type $FUNCSIG$j) (result i64) (loop $label$3 (result i64) (drop (if (result f64) @@ -1094,7 +1094,7 @@ ) ) ) - (func $no-flow-through-if-without-else (; 43 ;) (type $8) (result f32) + (func $no-flow-through-if-without-else (; 43 ;) (type $FUNCSIG$f) (result f32) (local $0 i32) (local $2 f32) (if (result f32) @@ -1115,7 +1115,7 @@ (f32.const -9223372036854775808) ) ) - (func $unreachable-return-loop-value (; 44 ;) (type $7) (result i64) + (func $unreachable-return-loop-value (; 44 ;) (type $FUNCSIG$j) (result i64) (loop $loop (if (i32.const 1) @@ -1129,7 +1129,7 @@ (br $loop) ) ) - (func $obviously-flows-out-maybe (; 45 ;) (type $9) (param $var$0 i32) (result f32) + (func $obviously-flows-out-maybe (; 45 ;) (type $FUNCSIG$fi) (param $var$0 i32) (result f32) (block $label$1 (result f32) (br $label$1 (f32.const 1) @@ -1338,7 +1338,7 @@ ) (unreachable) ) - (func $br-to-table-bad (; 54 ;) (type $10) (param $a i32) (result i32) + (func $br-to-table-bad (; 54 ;) (type $FUNCSIG$ii) (param $a i32) (result i32) (block $value (result i32) (block $x (block $y @@ -1361,7 +1361,7 @@ (i32.const 2000) ) ) - (func $br-to-table-bad2 (; 55 ;) (type $10) (param $a i32) (result i32) + (func $br-to-table-bad2 (; 55 ;) (type $FUNCSIG$ii) (param $a i32) (result i32) (block $value (result i32) (block $x (block $y @@ -1805,7 +1805,7 @@ ) (i32.const 3) ) - (func $undo-if-return (; 73 ;) (type $10) (param $p i32) (result i32) + (func $undo-if-return (; 73 ;) (type $FUNCSIG$ii) (param $p i32) (result i32) (local $x i32) (block $out (block @@ -1836,7 +1836,7 @@ ) (local.get $p) ) - (func $if-unreachable-but-declares-value (; 74 ;) (type $11) (param $var$0 i32) (param $var$1 f64) (param $var$2 i32) (param $var$3 f64) (param $var$4 f32) (param $var$5 f32) (result i32) + (func $if-unreachable-but-declares-value (; 74 ;) (type $FUNCSIG$iididff) (param $var$0 i32) (param $var$1 f64) (param $var$2 i32) (param $var$3 f64) (param $var$4 f32) (param $var$5 f32) (result i32) (local $var$6 f64) (if (i32.const 0) @@ -1937,7 +1937,7 @@ ) ) ) - (func $drop-restructure-if (; 81 ;) (type $3) (param $x i32) (param $y i32) (result i32) + (func $drop-restructure-if (; 81 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (if (result i32) (local.get $y) (local.get $x) @@ -1947,7 +1947,7 @@ ) ) ) - (func $drop-restructure-if-final (; 82 ;) (type $3) (param $x i32) (param $y i32) (result i32) + (func $drop-restructure-if-final (; 82 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (if (result i32) (local.get $y) (local.get $x) @@ -1957,7 +1957,7 @@ ) ) ) - (func $drop-restructure-if-middle (; 83 ;) (type $3) (param $x i32) (param $y i32) (result i32) + (func $drop-restructure-if-middle (; 83 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (if (result i32) (local.get $y) (local.get $x) @@ -1968,7 +1968,7 @@ ) ) ) - (func $drop-restructure-if-bad (; 84 ;) (type $3) (param $x i32) (param $y i32) (result i32) + (func $drop-restructure-if-bad (; 84 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (block $label$2 (result i32) (drop (br_if $label$2 @@ -1981,7 +1981,7 @@ (i32.const 0) ) ) - (func $drop-restructure-if-bad-2 (; 85 ;) (type $3) (param $x i32) (param $y i32) (result i32) + (func $drop-restructure-if-bad-2 (; 85 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (block $label$2 (result i32) (drop (br_if $label$2 @@ -2157,7 +2157,7 @@ ) ) ) - (func $switch-threading-multi (; 99 ;) (type $3) (param $x i32) (param $y i32) (result i32) + (func $switch-threading-multi (; 99 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (block $block$5$break (block $block$4$break (loop $shape$1$continue @@ -2287,7 +2287,7 @@ ) (local.get $x) ) - (func $if-one-side-tee-etc (; 105 ;) (type $10) (param $0 i32) (result i32) + (func $if-one-side-tee-etc (; 105 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32) (local $1 i32) (local $2 i32) (local $3 i32) @@ -2308,7 +2308,7 @@ ) (i32.const 0) ) - (func $ifs-copies-recursive (; 106 ;) (type $10) (param $20 i32) (result i32) + (func $ifs-copies-recursive (; 106 ;) (type $FUNCSIG$ii) (param $20 i32) (result i32) (if (i32.const 1) (local.set $20 @@ -2382,7 +2382,7 @@ (br $top) ) ) - (func $loop-end-set (; 111 ;) (type $10) (param $x i32) (result i32) + (func $loop-end-set (; 111 ;) (type $FUNCSIG$ii) (param $x i32) (result i32) (loop $loop (nop) (br_if $loop @@ -2394,7 +2394,7 @@ ) (local.get $x) ) - (func $loop-end-value (; 112 ;) (type $10) (param $x i32) (result i32) + (func $loop-end-value (; 112 ;) (type $FUNCSIG$ii) (param $x i32) (result i32) (loop $loop (result i32) (nop) (br_if $loop diff --git a/test/passes/remove-unused-brs_precompute_vacuum_remove-unused-brs.txt b/test/passes/remove-unused-brs_precompute_vacuum_remove-unused-brs.txt index b3a96185e..430b9e42a 100644 --- a/test/passes/remove-unused-brs_precompute_vacuum_remove-unused-brs.txt +++ b/test/passes/remove-unused-brs_precompute_vacuum_remove-unused-brs.txt @@ -1,7 +1,7 @@ (module - (type $0 (func (param i32) (result f64))) + (type $FUNCSIG$di (func (param i32) (result f64))) (global $global$3 (mut f64) (f64.const 0)) - (func $1 (; 0 ;) (type $0) (param $x i32) (result f64) + (func $1 (; 0 ;) (type $FUNCSIG$di) (param $x i32) (result f64) (local $var$0 f64) (block $label$0 (result f64) (local.set $var$0 diff --git a/test/passes/remove-unused-module-elements_enable-threads.txt b/test/passes/remove-unused-module-elements_enable-threads.txt index 99820cc52..5db1ba5e6 100644 --- a/test/passes/remove-unused-module-elements_enable-threads.txt +++ b/test/passes/remove-unused-module-elements_enable-threads.txt @@ -90,12 +90,12 @@ (export "tab" (table $0)) ) (module - (type $0 (func)) + (type $FUNCSIG$v (func)) (import "env" "memory" (memory $0 256)) (data (i32.const 1) "hello, world!") (import "env" "table" (table $0 1 funcref)) (elem (i32.const 0) $waka) - (func $waka (; 0 ;) (type $0) + (func $waka (; 0 ;) (type $FUNCSIG$v) (nop) ) ) @@ -116,10 +116,10 @@ ) ) (module - (type $0 (func)) + (type $FUNCSIG$v (func)) (memory $0 (shared 23 256)) (export "user" (func $user)) - (func $user (; 0 ;) (type $0) + (func $user (; 0 ;) (type $FUNCSIG$v) (i32.store (i32.const 0) (i32.const 0) @@ -127,10 +127,10 @@ ) ) (module - (type $0 (func (result i32))) + (type $FUNCSIG$i (func (result i32))) (memory $0 (shared 23 256)) (export "user" (func $user)) - (func $user (; 0 ;) (type $0) (result i32) + (func $user (; 0 ;) (type $FUNCSIG$i) (result i32) (i32.atomic.rmw.add (i32.const 0) (i32.const 0) @@ -138,10 +138,10 @@ ) ) (module - (type $0 (func (result i32))) + (type $FUNCSIG$i (func (result i32))) (memory $0 (shared 23 256)) (export "user" (func $user)) - (func $user (; 0 ;) (type $0) (result i32) + (func $user (; 0 ;) (type $FUNCSIG$i) (result i32) (i32.atomic.rmw8.cmpxchg_u (i32.const 0) (i32.const 0) @@ -150,10 +150,10 @@ ) ) (module - (type $0 (func)) + (type $FUNCSIG$v (func)) (memory $0 (shared 23 256)) (export "user" (func $user)) - (func $user (; 0 ;) (type $0) + (func $user (; 0 ;) (type $FUNCSIG$v) (local $0 i32) (local $1 i64) (drop @@ -166,10 +166,10 @@ ) ) (module - (type $0 (func (result i32))) + (type $FUNCSIG$i (func (result i32))) (memory $0 (shared 23 256)) (export "user" (func $user)) - (func $user (; 0 ;) (type $0) (result i32) + (func $user (; 0 ;) (type $FUNCSIG$i) (result i32) (atomic.notify (i32.const 0) (i32.const 0) @@ -177,49 +177,49 @@ ) ) (module - (type $0 (func (result i32))) + (type $FUNCSIG$i (func (result i32))) (memory $0 23 256) (export "user" (func $user)) - (func $user (; 0 ;) (type $0) (result i32) + (func $user (; 0 ;) (type $FUNCSIG$i) (result i32) (memory.grow (i32.const 0) ) ) ) (module - (type $0 (func (result i32))) + (type $FUNCSIG$i (func (result i32))) (import "env" "memory" (memory $0 256)) (export "user" (func $user)) - (func $user (; 0 ;) (type $0) (result i32) + (func $user (; 0 ;) (type $FUNCSIG$i) (result i32) (memory.grow (i32.const 0) ) ) ) (module - (type $0 (func (result i32))) + (type $FUNCSIG$i (func (result i32))) (memory $0 23 256) (export "user" (func $user)) - (func $user (; 0 ;) (type $0) (result i32) + (func $user (; 0 ;) (type $FUNCSIG$i) (result i32) (memory.size) ) ) (module - (type $0 (func)) + (type $FUNCSIG$v (func)) (import "env" "memory" (memory $0 256)) (data (global.get $memoryBase) "hello, world!") (import "env" "table" (table $0 0 funcref)) (elem (global.get $tableBase) $waka) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) - (func $waka (; 0 ;) (type $0) + (func $waka (; 0 ;) (type $FUNCSIG$v) (nop) ) ) (module (type $FUNCSIG$ii (func (param i32) (result i32))) - (type $1 (func (result i32))) - (type $2 (func)) + (type $FUNCSIG$i (func (result i32))) + (type $FUNCSIG$v (func)) (import "env" "imported" (global $imported i32)) (import "env" "_puts" (func $_puts (param i32) (result i32))) (global $int (mut i32) (global.get $imported)) @@ -228,16 +228,16 @@ (export "one" (func $one)) (export "three" (func $three)) (export "exp_glob" (global $exp_glob)) - (func $one (; 1 ;) (type $1) (result i32) + (func $one (; 1 ;) (type $FUNCSIG$i) (result i32) (call $two) ) - (func $two (; 2 ;) (type $1) (result i32) + (func $two (; 2 ;) (type $FUNCSIG$i) (result i32) (global.get $int) ) - (func $three (; 3 ;) (type $2) + (func $three (; 3 ;) (type $FUNCSIG$v) (call $four) ) - (func $four (; 4 ;) (type $2) + (func $four (; 4 ;) (type $FUNCSIG$v) (global.set $set (i32.const 200) ) @@ -251,9 +251,9 @@ (module ) (module - (type $0 (func)) + (type $FUNCSIG$v (func)) (start $starter) - (func $starter (; 0 ;) (type $0) + (func $starter (; 0 ;) (type $FUNCSIG$v) (drop (i32.const 0) ) diff --git a/test/passes/remove-unused-module-elements_enable-threads.wast b/test/passes/remove-unused-module-elements_enable-threads.wast index 7cb4423b5..8e07fb9c1 100644 --- a/test/passes/remove-unused-module-elements_enable-threads.wast +++ b/test/passes/remove-unused-module-elements_enable-threads.wast @@ -54,7 +54,7 @@ (func $remove4 (type $0) (call $remove3) ) - (func $other1 (param i32) (type $1) + (func $other1 (type $1) (param i32) (call_indirect (type $0) (i32.const 0)) (call_indirect (type $0) (i32.const 0)) (call_indirect (type $0-dupe) (i32.const 0)) @@ -65,7 +65,7 @@ (drop (call_indirect (type $2-dupe) (i32.const 0) (i32.const 0))) (drop (call_indirect (type $2-thrupe) (i32.const 0) (i32.const 0))) ) - (func $other2 (param i32) (type $1-dupe) + (func $other2 (type $1-dupe) (param i32) (unreachable) ) ) diff --git a/test/passes/remove-unused-names.txt b/test/passes/remove-unused-names.txt index 864dcca6c..441930539 100644 --- a/test/passes/remove-unused-names.txt +++ b/test/passes/remove-unused-names.txt @@ -1,7 +1,7 @@ (module (type $0 (func (param i32) (result i32))) (type $1 (func)) - (type $2 (func (result i32))) + (type $FUNCSIG$i (func (result i32))) (memory $0 256 256) (func $b0 (; 0 ;) (type $0) (param $i1 i32) (result i32) (i32.const 0) @@ -64,7 +64,7 @@ ) ) ) - (func $merge-typed-with-unreachable-child (; 3 ;) (type $2) (result i32) + (func $merge-typed-with-unreachable-child (; 3 ;) (type $FUNCSIG$i) (result i32) (local $0 f32) (block $label$1 (result i32) (br_if $label$1 diff --git a/test/passes/remove-unused-names_code-folding.txt b/test/passes/remove-unused-names_code-folding.txt index 85750e06d..f84032ef6 100644 --- a/test/passes/remove-unused-names_code-folding.txt +++ b/test/passes/remove-unused-names_code-folding.txt @@ -1,9 +1,9 @@ (module - (type $0 (func)) - (type $1 (func (param i32 i32) (result i32))) - (type $2 (func (result i32))) - (type $3 (func (param i32) (result i32))) - (func $ifs (; 0 ;) (type $0) + (type $FUNCSIG$v (func)) + (type $FUNCSIG$iii (func (param i32 i32) (result i32))) + (type $FUNCSIG$i (func (result i32))) + (type $FUNCSIG$ii (func (param i32) (result i32))) + (func $ifs (; 0 ;) (type $FUNCSIG$v) (if (i32.const 0) (nop) @@ -44,7 +44,7 @@ ) ) ) - (func $ifs-blocks (; 1 ;) (type $0) + (func $ifs-blocks (; 1 ;) (type $FUNCSIG$v) (block (drop (i32.const 0) @@ -88,7 +88,7 @@ ) ) ) - (func $ifs-blocks-big (; 2 ;) (type $0) + (func $ifs-blocks-big (; 2 ;) (type $FUNCSIG$v) (block (drop (i32.const 0) @@ -167,7 +167,7 @@ ) ) ) - (func $ifs-blocks-long (; 3 ;) (type $0) + (func $ifs-blocks-long (; 3 ;) (type $FUNCSIG$v) (block (if (i32.const 1) @@ -237,7 +237,7 @@ ) ) ) - (func $if-worth-it-i-dunno (; 4 ;) (type $0) + (func $if-worth-it-i-dunno (; 4 ;) (type $FUNCSIG$v) (block $folding-inner0 (block (if @@ -411,7 +411,7 @@ (unreachable) (unreachable) ) - (func $no-grandparent (; 5 ;) (type $0) + (func $no-grandparent (; 5 ;) (type $FUNCSIG$v) (if (i32.const 9999) (block @@ -436,7 +436,7 @@ ) ) ) - (func $yes-grandparent (; 6 ;) (type $0) + (func $yes-grandparent (; 6 ;) (type $FUNCSIG$v) (block (if (i32.const 9999) @@ -461,7 +461,7 @@ (unreachable) ) ) - (func $ifs-named-block (; 7 ;) (type $1) (param $x i32) (param $y i32) (result i32) + (func $ifs-named-block (; 7 ;) (type $FUNCSIG$iii) (param $x i32) (param $y i32) (result i32) (block $out (block $out2 (block @@ -546,7 +546,7 @@ (i32.const 20) ) ) - (func $block (; 8 ;) (type $0) + (func $block (; 8 ;) (type $FUNCSIG$v) (block $x (if (i32.const 0) @@ -565,7 +565,7 @@ (i32.const 2) ) ) - (func $block2 (; 9 ;) (type $0) + (func $block2 (; 9 ;) (type $FUNCSIG$v) (block $x (if (i32.const 0) @@ -600,7 +600,7 @@ (br $x) ) ) - (func $block3 (; 10 ;) (type $0) + (func $block3 (; 10 ;) (type $FUNCSIG$v) (block $x (if (i32.const 0) @@ -641,7 +641,7 @@ (i32.const 2) ) ) - (func $mixture (; 11 ;) (type $0) + (func $mixture (; 11 ;) (type $FUNCSIG$v) (block $out (block (drop @@ -720,7 +720,7 @@ (nop) ) ) - (func $block-corners (; 12 ;) (type $0) + (func $block-corners (; 12 ;) (type $FUNCSIG$v) (block (block $x (if @@ -879,7 +879,7 @@ ) ) ) - (func $terminating (; 13 ;) (type $0) + (func $terminating (; 13 ;) (type $FUNCSIG$v) (block $folding-inner0 (block (if @@ -910,7 +910,7 @@ (nop) (unreachable) ) - (func $terminating-unreachable (; 14 ;) (type $0) + (func $terminating-unreachable (; 14 ;) (type $FUNCSIG$v) (block $folding-inner0 (block (if @@ -941,7 +941,7 @@ (nop) (unreachable) ) - (func $terminating-value (; 15 ;) (type $2) (result i32) + (func $terminating-value (; 15 ;) (type $FUNCSIG$i) (result i32) (block $folding-inner0 (return (block (result i32) @@ -974,7 +974,7 @@ (nop) (unreachable) ) - (func $terminating-just-2 (; 16 ;) (type $0) + (func $terminating-just-2 (; 16 ;) (type $FUNCSIG$v) (block $folding-inner0 (block (if @@ -1021,7 +1021,7 @@ (nop) (unreachable) ) - (func $terminating-shortness (; 17 ;) (type $0) + (func $terminating-shortness (; 17 ;) (type $FUNCSIG$v) (block $folding-inner1 (block (block $folding-inner0 @@ -1062,7 +1062,7 @@ (nop) (unreachable) ) - (func $terminating-multiple-separate (; 18 ;) (type $0) + (func $terminating-multiple-separate (; 18 ;) (type $FUNCSIG$v) (block $folding-inner1 (block (block $folding-inner0 @@ -1119,7 +1119,7 @@ ) (unreachable) ) - (func $terminating-just-worth-it (; 19 ;) (type $0) + (func $terminating-just-worth-it (; 19 ;) (type $FUNCSIG$v) (block $folding-inner0 (block (if @@ -1142,7 +1142,7 @@ (nop) (unreachable) ) - (func $terminating-not-worth-it (; 20 ;) (type $0) + (func $terminating-not-worth-it (; 20 ;) (type $FUNCSIG$v) (if (i32.const 1) (block @@ -1168,7 +1168,7 @@ ) ) ) - (func $terminating-return (; 21 ;) (type $0) + (func $terminating-return (; 21 ;) (type $FUNCSIG$v) (block $folding-inner0 (block (if @@ -1199,7 +1199,7 @@ (nop) (return) ) - (func $terminating-return-value (; 22 ;) (type $2) (result i32) + (func $terminating-return-value (; 22 ;) (type $FUNCSIG$i) (result i32) (block $folding-inner0 (block (if @@ -1239,7 +1239,7 @@ ) ) ) - (func $terminating-fallthrough-value (; 23 ;) (type $2) (result i32) + (func $terminating-fallthrough-value (; 23 ;) (type $FUNCSIG$i) (result i32) (block $folding-inner0 (return (block (result i32) @@ -1279,7 +1279,7 @@ ) ) ) - (func $big-return (; 24 ;) (type $2) (result i32) + (func $big-return (; 24 ;) (type $FUNCSIG$i) (result i32) (block $folding-inner0 (block (if @@ -1316,7 +1316,7 @@ ) ) ) - (func $return-mix (; 25 ;) (type $2) (result i32) + (func $return-mix (; 25 ;) (type $FUNCSIG$i) (result i32) (block $folding-inner0 (block (if @@ -1354,10 +1354,10 @@ ) ) ) - (func $just-unreachable (; 26 ;) (type $0) + (func $just-unreachable (; 26 ;) (type $FUNCSIG$v) (unreachable) ) - (func $just-return (; 27 ;) (type $2) (result i32) + (func $just-return (; 27 ;) (type $FUNCSIG$i) (result i32) (return (i32.add (i32.const 1) @@ -1365,7 +1365,7 @@ ) ) ) - (func $drop-if-with-value-but-unreachable (; 28 ;) (type $0) + (func $drop-if-with-value-but-unreachable (; 28 ;) (type $FUNCSIG$v) (if (i32.const 0) (nop) @@ -1411,7 +1411,7 @@ ) ) ) - (func $nested-control-flow (; 29 ;) (type $0) + (func $nested-control-flow (; 29 ;) (type $FUNCSIG$v) (block $out (block (block $x @@ -1441,7 +1441,7 @@ ) ) ) - (func $nested-control-flow-dangerous (; 30 ;) (type $0) + (func $nested-control-flow-dangerous (; 30 ;) (type $FUNCSIG$v) (block $folding-inner0 (block $out (block @@ -1485,7 +1485,7 @@ ) (return) ) - (func $nested-control-flow-dangerous-but-ok (; 31 ;) (type $0) + (func $nested-control-flow-dangerous-but-ok (; 31 ;) (type $FUNCSIG$v) (block $folding-inner0 (block (block $middle @@ -1540,7 +1540,7 @@ ) (return) ) - (func $nested-control-flow-dangerous-but-ok-b (; 32 ;) (type $0) + (func $nested-control-flow-dangerous-but-ok-b (; 32 ;) (type $FUNCSIG$v) (block $out (block $middle (block @@ -1606,7 +1606,7 @@ (i32.const 4) ) ) - (func $nested-control-flow-dangerous-but-ok-c (; 33 ;) (type $0) + (func $nested-control-flow-dangerous-but-ok-c (; 33 ;) (type $FUNCSIG$v) (block $x (block (block $out @@ -1643,7 +1643,7 @@ (i32.const 5) ) ) - (func $nested-control-flow-dangerous-but-ok-d (; 34 ;) (type $0) + (func $nested-control-flow-dangerous-but-ok-d (; 34 ;) (type $FUNCSIG$v) (block (block $out (block @@ -1678,7 +1678,7 @@ (i32.const 3) ) ) - (func $if-suffix (; 35 ;) (type $3) (param $x i32) (result i32) + (func $if-suffix (; 35 ;) (type $FUNCSIG$ii) (param $x i32) (result i32) (block (if (local.get $x) diff --git a/test/passes/remove-unused-names_merge-blocks_enable-threads.txt b/test/passes/remove-unused-names_merge-blocks_enable-threads.txt index b60d01957..74cce687a 100644 --- a/test/passes/remove-unused-names_merge-blocks_enable-threads.txt +++ b/test/passes/remove-unused-names_merge-blocks_enable-threads.txt @@ -3,8 +3,8 @@ (type $ii (func (param i32 i32))) (type $iii (func (param i32 i32 i32))) (type $3 (func)) - (type $4 (func (result i32))) - (type $5 (func (result f64))) + (type $FUNCSIG$i (func (result i32))) + (type $FUNCSIG$d (func (result f64))) (memory $0 (shared 256 256)) (table $0 1 1 funcref) (elem (i32.const 0) $call-i) @@ -828,7 +828,7 @@ ) ) ) - (func $return-different-type (; 23 ;) (type $4) (result i32) + (func $return-different-type (; 23 ;) (type $FUNCSIG$i) (result i32) (drop (f64.abs (block @@ -843,7 +843,7 @@ ) (unreachable) ) - (func $drop-unreachable (; 24 ;) (type $4) (result i32) + (func $drop-unreachable (; 24 ;) (type $FUNCSIG$i) (result i32) (local $0 i32) (drop (block (result i32) @@ -852,7 +852,7 @@ ) (unreachable) ) - (func $concrete_finale_in_unreachable (; 25 ;) (type $5) (result f64) + (func $concrete_finale_in_unreachable (; 25 ;) (type $FUNCSIG$d) (result f64) (drop (block (result f64) (unreachable) @@ -911,7 +911,7 @@ ) ) ) - (func $merging-with-unreachable-in-middle (; 30 ;) (type $4) (result i32) + (func $merging-with-unreachable-in-middle (; 30 ;) (type $FUNCSIG$i) (result i32) (block (result i32) (return (i32.const 21536) @@ -1260,7 +1260,7 @@ (i32.const 2) ) ) - (func $block-tail-value (; 36 ;) (type $4) (result i32) + (func $block-tail-value (; 36 ;) (type $FUNCSIG$i) (result i32) (block $l1 (result i32) (drop (i32.const -1) @@ -1290,7 +1290,7 @@ (br $l1) ) ) - (func $block-tail-unreachable (; 39 ;) (type $4) (result i32) + (func $block-tail-unreachable (; 39 ;) (type $FUNCSIG$i) (result i32) (block $l1 (result i32) (drop (i32.const -1) @@ -1307,7 +1307,7 @@ (unreachable) ) ) - (func $loop-tail-unreachable (; 40 ;) (type $4) (result i32) + (func $loop-tail-unreachable (; 40 ;) (type $FUNCSIG$i) (result i32) (loop $l1 (drop (i32.const -1) @@ -1323,9 +1323,9 @@ ) ) (module - (type $0 (func (param f64 i32) (result i32))) - (type $1 (func (result i32))) - (func $unreachable-in-sub-block (; 0 ;) (type $0) (param $0 f64) (param $1 i32) (result i32) + (type $FUNCSIG$idi (func (param f64 i32) (result i32))) + (type $FUNCSIG$i (func (result i32))) + (func $unreachable-in-sub-block (; 0 ;) (type $FUNCSIG$idi) (param $0 f64) (param $1 i32) (result i32) (local $2 i32) (local $9 i32) (loop $label$1 @@ -1354,13 +1354,13 @@ (nop) (local.get $9) ) - (func $trivial (; 1 ;) (type $1) (result i32) + (func $trivial (; 1 ;) (type $FUNCSIG$i) (result i32) (block (unreachable) (nop) ) ) - (func $trivial-more (; 2 ;) (type $1) (result i32) + (func $trivial-more (; 2 ;) (type $FUNCSIG$i) (result i32) (block (nop) (unreachable) @@ -1376,8 +1376,8 @@ ) ) (module - (type $0 (func)) - (func $merge-some-block (; 0 ;) (type $0) + (type $FUNCSIG$v (func)) + (func $merge-some-block (; 0 ;) (type $FUNCSIG$v) (drop (i32.const 1) ) @@ -1454,7 +1454,7 @@ ) ) ) - (func $merge-some-loop (; 1 ;) (type $0) + (func $merge-some-loop (; 1 ;) (type $FUNCSIG$v) (drop (i32.const 1) ) @@ -1522,7 +1522,7 @@ ) ) ) - (func $merge-some-loop-taken (; 2 ;) (type $0) + (func $merge-some-loop-taken (; 2 ;) (type $FUNCSIG$v) (loop $l1 (block $b1 (drop diff --git a/test/passes/remove-unused-names_precompute.txt b/test/passes/remove-unused-names_precompute.txt index fe6239294..7fcc2dbe7 100644 --- a/test/passes/remove-unused-names_precompute.txt +++ b/test/passes/remove-unused-names_precompute.txt @@ -1,7 +1,7 @@ (module - (type $0 (func (param i32))) + (type $FUNCSIG$vi (func (param i32))) (memory $0 256 256) - (func $__ZN10WasmAssertC2Ev__async_cb (; 0 ;) (type $0) (param $$0 i32) + (func $__ZN10WasmAssertC2Ev__async_cb (; 0 ;) (type $FUNCSIG$vi) (param $$0 i32) (block $switch-default (nop) (block diff --git a/test/passes/remove-unused-names_remove-unused-brs_vacuum.txt b/test/passes/remove-unused-names_remove-unused-brs_vacuum.txt index c11613f67..e18770b15 100644 --- a/test/passes/remove-unused-names_remove-unused-brs_vacuum.txt +++ b/test/passes/remove-unused-names_remove-unused-brs_vacuum.txt @@ -15,14 +15,7 @@ (type $13 (func (param i32 i32 i32 i32 i32))) (type $14 (func (param f64 i32) (result f64))) (type $15 (func (param i32 i32 i32 i32) (result i32))) - (type $FUNCSIG$i (func (result i32))) - (type $FUNCSIG$vi (func (param i32))) - (type $FUNCSIG$v (func)) - (type $FUNCSIG$iii (func (param i32 i32) (result i32))) - (type $FUNCSIG$vii (func (param i32 i32))) - (type $FUNCSIG$iiii (func (param i32 i32 i32) (result i32))) - (type $FUNCSIG$id (func (param f64) (result i32))) - (type $23 (func (param i32) (result i64))) + (type $FUNCSIG$ji (func (param i32) (result i64))) (import "env" "memory" (memory $0 256)) (import "env" "table" (table $0 18 18 funcref)) (import "env" "DYNAMICTOP_PTR" (global $import$0 i32)) @@ -114,7 +107,7 @@ (func $23 (; 24 ;) (type $0) (param $0 i32) (param $1 i32) (param $2 i32) (result i32) (unreachable) ) - (func $unexitable-loops-result (; 25 ;) (type $23) (param $0 i32) (result i64) + (func $unexitable-loops-result (; 25 ;) (type $FUNCSIG$ji) (param $0 i32) (result i64) (loop $label$0 (loop $label$1 (br_if $label$0 diff --git a/test/passes/remove-unused-names_vacuum.txt b/test/passes/remove-unused-names_vacuum.txt index 07b41cf13..e78c3f40e 100644 --- a/test/passes/remove-unused-names_vacuum.txt +++ b/test/passes/remove-unused-names_vacuum.txt @@ -1,30 +1,30 @@ (module - (type $0 (func (result i32))) - (type $1 (func)) - (func $return-i32-but-body-is-unreachable3 (; 0 ;) (type $0) (result i32) + (type $FUNCSIG$i (func (result i32))) + (type $FUNCSIG$v (func)) + (func $return-i32-but-body-is-unreachable3 (; 0 ;) (type $FUNCSIG$i) (result i32) (local $label i32) (loop $while-in$1 (br $while-in$1) ) ) - (func $return-i32-but-body-is-unreachable4 (; 1 ;) (type $0) (result i32) + (func $return-i32-but-body-is-unreachable4 (; 1 ;) (type $FUNCSIG$i) (result i32) (local $label i32) (loop $while-in$1 (br $while-in$1) ) ) - (func $to-drop-unreachable (; 2 ;) (type $1) + (func $to-drop-unreachable (; 2 ;) (type $FUNCSIG$v) (drop (block (result i32) (unreachable) ) ) ) - (func $return-i32-but-body-is-unreachable5 (; 3 ;) (type $0) (result i32) + (func $return-i32-but-body-is-unreachable5 (; 3 ;) (type $FUNCSIG$i) (result i32) (local $label i32) (unreachable) ) - (func $return-i32-but-body-is-unreachable6 (; 4 ;) (type $0) (result i32) + (func $return-i32-but-body-is-unreachable6 (; 4 ;) (type $FUNCSIG$i) (result i32) (local $label i32) (unreachable) ) diff --git a/test/passes/remove-unused-names_vacuum_ignore-implicit-traps.txt b/test/passes/remove-unused-names_vacuum_ignore-implicit-traps.txt index 2a4b8e490..22288056a 100644 --- a/test/passes/remove-unused-names_vacuum_ignore-implicit-traps.txt +++ b/test/passes/remove-unused-names_vacuum_ignore-implicit-traps.txt @@ -6,7 +6,6 @@ (type $FUNCSIG$vj (func (param i32 i32))) (type $legaltype$wasm2js_scratch_store_i64 (func (param i32 i32))) (type $FUNCSIG$ii (func (param i32) (result i32))) - (type $FUNCSIG$vii (func (param i32 i32))) (type $FUNCSIG$f (func (result f32))) (type $FUNCSIG$vf (func (param f32))) (type $FUNCSIG$d (func (result f64))) diff --git a/test/passes/remove-unused-nonfunction-module-elements_enable-threads.txt b/test/passes/remove-unused-nonfunction-module-elements_enable-threads.txt index 1ac7e5228..140cf61e6 100644 --- a/test/passes/remove-unused-nonfunction-module-elements_enable-threads.txt +++ b/test/passes/remove-unused-nonfunction-module-elements_enable-threads.txt @@ -105,12 +105,12 @@ (export "tab" (table $0)) ) (module - (type $0 (func)) + (type $FUNCSIG$v (func)) (import "env" "memory" (memory $0 256)) (data (i32.const 1) "hello, world!") (import "env" "table" (table $0 1 funcref)) (elem (i32.const 0) $waka) - (func $waka (; 0 ;) (type $0) + (func $waka (; 0 ;) (type $FUNCSIG$v) (nop) ) ) @@ -131,10 +131,10 @@ ) ) (module - (type $0 (func)) + (type $FUNCSIG$v (func)) (memory $0 (shared 23 256)) (export "user" (func $user)) - (func $user (; 0 ;) (type $0) + (func $user (; 0 ;) (type $FUNCSIG$v) (i32.store (i32.const 0) (i32.const 0) @@ -142,10 +142,10 @@ ) ) (module - (type $0 (func (result i32))) + (type $FUNCSIG$i (func (result i32))) (memory $0 (shared 23 256)) (export "user" (func $user)) - (func $user (; 0 ;) (type $0) (result i32) + (func $user (; 0 ;) (type $FUNCSIG$i) (result i32) (i32.atomic.rmw.add (i32.const 0) (i32.const 0) @@ -153,10 +153,10 @@ ) ) (module - (type $0 (func (result i32))) + (type $FUNCSIG$i (func (result i32))) (memory $0 (shared 23 256)) (export "user" (func $user)) - (func $user (; 0 ;) (type $0) (result i32) + (func $user (; 0 ;) (type $FUNCSIG$i) (result i32) (i32.atomic.rmw8.cmpxchg_u (i32.const 0) (i32.const 0) @@ -165,10 +165,10 @@ ) ) (module - (type $0 (func)) + (type $FUNCSIG$v (func)) (memory $0 (shared 23 256)) (export "user" (func $user)) - (func $user (; 0 ;) (type $0) + (func $user (; 0 ;) (type $FUNCSIG$v) (local $0 i32) (local $1 i64) (drop @@ -181,10 +181,10 @@ ) ) (module - (type $0 (func (result i32))) + (type $FUNCSIG$i (func (result i32))) (memory $0 (shared 23 256)) (export "user" (func $user)) - (func $user (; 0 ;) (type $0) (result i32) + (func $user (; 0 ;) (type $FUNCSIG$i) (result i32) (atomic.notify (i32.const 0) (i32.const 0) @@ -192,49 +192,49 @@ ) ) (module - (type $0 (func (result i32))) + (type $FUNCSIG$i (func (result i32))) (memory $0 23 256) (export "user" (func $user)) - (func $user (; 0 ;) (type $0) (result i32) + (func $user (; 0 ;) (type $FUNCSIG$i) (result i32) (memory.grow (i32.const 0) ) ) ) (module - (type $0 (func (result i32))) + (type $FUNCSIG$i (func (result i32))) (import "env" "memory" (memory $0 256)) (export "user" (func $user)) - (func $user (; 0 ;) (type $0) (result i32) + (func $user (; 0 ;) (type $FUNCSIG$i) (result i32) (memory.grow (i32.const 0) ) ) ) (module - (type $0 (func (result i32))) + (type $FUNCSIG$i (func (result i32))) (memory $0 23 256) (export "user" (func $user)) - (func $user (; 0 ;) (type $0) (result i32) + (func $user (; 0 ;) (type $FUNCSIG$i) (result i32) (memory.size) ) ) (module - (type $0 (func)) + (type $FUNCSIG$v (func)) (import "env" "memory" (memory $0 256)) (data (global.get $memoryBase) "hello, world!") (import "env" "table" (table $0 0 funcref)) (elem (global.get $tableBase) $waka) (import "env" "memoryBase" (global $memoryBase i32)) (import "env" "tableBase" (global $tableBase i32)) - (func $waka (; 0 ;) (type $0) + (func $waka (; 0 ;) (type $FUNCSIG$v) (nop) ) ) (module (type $FUNCSIG$ii (func (param i32) (result i32))) - (type $1 (func (result i32))) - (type $2 (func)) + (type $FUNCSIG$i (func (result i32))) + (type $FUNCSIG$v (func)) (import "env" "imported" (global $imported i32)) (import "env" "_puts" (func $_puts (param i32) (result i32))) (global $int (mut i32) (global.get $imported)) @@ -243,16 +243,16 @@ (export "one" (func $one)) (export "three" (func $three)) (export "exp_glob" (global $exp_glob)) - (func $one (; 1 ;) (type $1) (result i32) + (func $one (; 1 ;) (type $FUNCSIG$i) (result i32) (call $two) ) - (func $two (; 2 ;) (type $1) (result i32) + (func $two (; 2 ;) (type $FUNCSIG$i) (result i32) (global.get $int) ) - (func $three (; 3 ;) (type $2) + (func $three (; 3 ;) (type $FUNCSIG$v) (call $four) ) - (func $four (; 4 ;) (type $2) + (func $four (; 4 ;) (type $FUNCSIG$v) (global.set $set (i32.const 200) ) @@ -262,23 +262,23 @@ ) ) ) - (func $forget_implemented (; 5 ;) (type $2) + (func $forget_implemented (; 5 ;) (type $FUNCSIG$v) (nop) ) - (func $starter (; 6 ;) (type $2) + (func $starter (; 6 ;) (type $FUNCSIG$v) (nop) ) ) (module - (type $0 (func)) - (func $starter (; 0 ;) (type $0) + (type $FUNCSIG$v (func)) + (func $starter (; 0 ;) (type $FUNCSIG$v) (nop) ) ) (module - (type $0 (func)) + (type $FUNCSIG$v (func)) (start $starter) - (func $starter (; 0 ;) (type $0) + (func $starter (; 0 ;) (type $FUNCSIG$v) (drop (i32.const 0) ) diff --git a/test/passes/remove-unused-nonfunction-module-elements_enable-threads.wast b/test/passes/remove-unused-nonfunction-module-elements_enable-threads.wast index 6024e1bc1..4c1944c12 100644 --- a/test/passes/remove-unused-nonfunction-module-elements_enable-threads.wast +++ b/test/passes/remove-unused-nonfunction-module-elements_enable-threads.wast @@ -54,7 +54,7 @@ (func $remove4 (type $0) (call $remove3) ) - (func $other1 (param i32) (type $1) + (func $other1 (type $1) (param i32) (call_indirect (type $0) (i32.const 0)) (call_indirect (type $0) (i32.const 0)) (call_indirect (type $0-dupe) (i32.const 0)) @@ -65,7 +65,7 @@ (drop (call_indirect (type $2-dupe) (i32.const 0) (i32.const 0))) (drop (call_indirect (type $2-thrupe) (i32.const 0) (i32.const 0))) ) - (func $other2 (param i32) (type $1-dupe) + (func $other2 (type $1-dupe) (param i32) (unreachable) ) ) diff --git a/test/passes/rse.txt b/test/passes/rse.txt index 82edd86fc..3c2056457 100644 --- a/test/passes/rse.txt +++ b/test/passes/rse.txt @@ -1,9 +1,9 @@ (module - (type $0 (func (param i32 f64))) - (type $1 (func (param i32))) - (type $2 (func)) - (type $3 (func (param i32 i32))) - (func $basic (; 0 ;) (type $0) (param $x i32) (param $y f64) + (type $FUNCSIG$vid (func (param i32 f64))) + (type $FUNCSIG$vi (func (param i32))) + (type $FUNCSIG$v (func)) + (type $FUNCSIG$vii (func (param i32 i32))) + (func $basic (; 0 ;) (type $FUNCSIG$vid) (param $x i32) (param $y f64) (local $a f32) (local $b i64) (local.set $x @@ -19,7 +19,7 @@ (i64.const 0) ) ) - (func $later-param-use (; 1 ;) (type $1) (param $x i32) + (func $later-param-use (; 1 ;) (type $FUNCSIG$vi) (param $x i32) (local.set $x (i32.const 0) ) @@ -27,7 +27,7 @@ (i32.const 0) ) ) - (func $diff-value (; 2 ;) (type $1) (param $x i32) + (func $diff-value (; 2 ;) (type $FUNCSIG$vi) (param $x i32) (local $a i32) (local.set $x (i32.const 0) @@ -48,7 +48,7 @@ (i32.const 0) ) ) - (func $unreach (; 3 ;) (type $2) + (func $unreach (; 3 ;) (type $FUNCSIG$v) (local $a i32) (block $x (drop @@ -72,7 +72,7 @@ ) ) ) - (func $loop (; 4 ;) (type $2) + (func $loop (; 4 ;) (type $FUNCSIG$v) (local $a i32) (local $b i32) (loop $x @@ -99,7 +99,7 @@ (i32.const 1) ) ) - (func $if (; 5 ;) (type $2) + (func $if (; 5 ;) (type $FUNCSIG$v) (local $x i32) (if (i32.const 0) @@ -114,7 +114,7 @@ (i32.const 1) ) ) - (func $if2 (; 6 ;) (type $2) + (func $if2 (; 6 ;) (type $FUNCSIG$v) (local $x i32) (if (local.tee $x @@ -131,7 +131,7 @@ (i32.const 1) ) ) - (func $if3 (; 7 ;) (type $2) + (func $if3 (; 7 ;) (type $FUNCSIG$v) (local $x i32) (if (local.tee $x @@ -148,7 +148,7 @@ (i32.const 1) ) ) - (func $copy (; 8 ;) (type $2) + (func $copy (; 8 ;) (type $FUNCSIG$v) (local $x i32) (local $y i32) (local.set $x @@ -192,7 +192,7 @@ (local.get $x) ) ) - (func $param-unique (; 9 ;) (type $1) (param $x i32) + (func $param-unique (; 9 ;) (type $FUNCSIG$vi) (param $x i32) (local $a i32) (local.set $a (local.get $x) @@ -212,7 +212,7 @@ (local.get $x) ) ) - (func $set-unique (; 10 ;) (type $2) + (func $set-unique (; 10 ;) (type $FUNCSIG$v) (local $x i32) (local $y i32) (local.set $x @@ -270,7 +270,7 @@ (local.get $x) ) ) - (func $identical_complex (; 11 ;) (type $1) (param $x i32) + (func $identical_complex (; 11 ;) (type $FUNCSIG$vi) (param $x i32) (local $y i32) (local.set $y (local.get $x) @@ -291,7 +291,7 @@ (local.get $y) ) ) - (func $merge (; 12 ;) (type $2) + (func $merge (; 12 ;) (type $FUNCSIG$v) (local $x i32) (if (i32.const 1) @@ -326,7 +326,7 @@ (i32.const 2) ) ) - (func $one-arm (; 13 ;) (type $3) (param $1 i32) (param $3 i32) + (func $one-arm (; 13 ;) (type $FUNCSIG$vii) (param $1 i32) (param $3 i32) (local.set $1 (local.get $3) ) @@ -338,7 +338,7 @@ ) ) ) - (func $one-arm2 (; 14 ;) (type $3) (param $1 i32) (param $3 i32) + (func $one-arm2 (; 14 ;) (type $FUNCSIG$vii) (param $1 i32) (param $3 i32) (local.set $1 (local.get $3) ) @@ -349,7 +349,7 @@ ) ) ) - (func $many-merges (; 15 ;) (type $2) + (func $many-merges (; 15 ;) (type $FUNCSIG$v) (local $0 i32) (local $1 i32) (block $block @@ -378,7 +378,7 @@ ) ) ) - (func $fuzz (; 16 ;) (type $2) + (func $fuzz (; 16 ;) (type $FUNCSIG$v) (local $x i32) (loop $label$4 (block $label$5 @@ -407,7 +407,7 @@ ) ) ) - (func $fuzz2 (; 17 ;) (type $2) + (func $fuzz2 (; 17 ;) (type $FUNCSIG$v) (local $var$1 i32) (if (i32.const 0) @@ -430,7 +430,7 @@ ) ) ) - (func $fuzz-nan (; 18 ;) (type $2) + (func $fuzz-nan (; 18 ;) (type $FUNCSIG$v) (local $0 f64) (local $1 f64) (block $block diff --git a/test/passes/safe-heap_enable-threads_enable-simd.txt b/test/passes/safe-heap_enable-threads_enable-simd.txt index 1f9640ce2..0150ad53a 100644 --- a/test/passes/safe-heap_enable-threads_enable-simd.txt +++ b/test/passes/safe-heap_enable-threads_enable-simd.txt @@ -1,11 +1,10 @@ (module - (type $0 (func)) (type $FUNCSIG$v (func)) (import "env" "DYNAMICTOP_PTR" (global $DYNAMICTOP_PTR i32)) (import "env" "segfault" (func $segfault)) (import "env" "alignfault" (func $alignfault)) (memory $0 (shared 100 100)) - (func $loads (; 2 ;) (type $0) + (func $loads (; 2 ;) (type $FUNCSIG$v) (drop (call $SAFE_HEAP_LOAD_i32_4_4 (i32.const 1) @@ -97,7 +96,7 @@ ) ) ) - (func $stores (; 3 ;) (type $0) + (func $stores (; 3 ;) (type $FUNCSIG$v) (call $SAFE_HEAP_STORE_i32_4_4 (i32.const 1) (i32.const 0) @@ -3132,13 +3131,12 @@ ) ) (module - (type $0 (func)) (type $FUNCSIG$v (func)) (import "env" "DYNAMICTOP_PTR" (global $DYNAMICTOP_PTR i32)) (import "env" "segfault" (func $segfault)) (import "env" "alignfault" (func $alignfault)) (memory $0 100 100) - (func $loads (; 2 ;) (type $0) + (func $loads (; 2 ;) (type $FUNCSIG$v) (drop (call $SAFE_HEAP_LOAD_i32_4_4 (i32.const 1) diff --git a/test/passes/safe-heap_low-memory-unused_enable-threads_enable-simd.txt b/test/passes/safe-heap_low-memory-unused_enable-threads_enable-simd.txt index 469cf9f94..faeabd1fd 100644 --- a/test/passes/safe-heap_low-memory-unused_enable-threads_enable-simd.txt +++ b/test/passes/safe-heap_low-memory-unused_enable-threads_enable-simd.txt @@ -1,11 +1,10 @@ (module - (type $0 (func)) (type $FUNCSIG$v (func)) (import "env" "DYNAMICTOP_PTR" (global $DYNAMICTOP_PTR i32)) (import "env" "segfault" (func $segfault)) (import "env" "alignfault" (func $alignfault)) (memory $0 (shared 100 100)) - (func $loads (; 2 ;) (type $0) + (func $loads (; 2 ;) (type $FUNCSIG$v) (drop (call $SAFE_HEAP_LOAD_i32_4_4 (i32.const 1) @@ -97,7 +96,7 @@ ) ) ) - (func $stores (; 3 ;) (type $0) + (func $stores (; 3 ;) (type $FUNCSIG$v) (call $SAFE_HEAP_STORE_i32_4_4 (i32.const 1) (i32.const 0) @@ -3132,13 +3131,12 @@ ) ) (module - (type $0 (func)) (type $FUNCSIG$v (func)) (import "env" "DYNAMICTOP_PTR" (global $DYNAMICTOP_PTR i32)) (import "env" "segfault" (func $segfault)) (import "env" "alignfault" (func $alignfault)) (memory $0 100 100) - (func $loads (; 2 ;) (type $0) + (func $loads (; 2 ;) (type $FUNCSIG$v) (drop (call $SAFE_HEAP_LOAD_i32_4_4 (i32.const 1) diff --git a/test/passes/simplify-globals_enable-mutable-globals.txt b/test/passes/simplify-globals_enable-mutable-globals.txt index 0b3ce2201..407fbdaa1 100644 --- a/test/passes/simplify-globals_enable-mutable-globals.txt +++ b/test/passes/simplify-globals_enable-mutable-globals.txt @@ -1,8 +1,8 @@ (module - (type $0 (func)) + (type $FUNCSIG$v (func)) (import "env" "global-1" (global $g1 i32)) (global $g2 i32 (global.get $g1)) - (func $foo (; 0 ;) (type $0) + (func $foo (; 0 ;) (type $FUNCSIG$v) (drop (global.get $g1) ) @@ -12,12 +12,12 @@ ) ) (module - (type $0 (func)) + (type $FUNCSIG$v (func)) (import "env" "global-1" (global $g1 i32)) (global $g2 i32 (global.get $g1)) (global $g3 i32 (global.get $g2)) (global $g4 i32 (global.get $g3)) - (func $foo (; 0 ;) (type $0) + (func $foo (; 0 ;) (type $FUNCSIG$v) (drop (global.get $g1) ) @@ -37,10 +37,10 @@ (global $g2 i32 (global.get $g1)) ) (module - (type $0 (func)) + (type $FUNCSIG$v (func)) (import "env" "global-1" (global $g1 i32)) (global $g2 (mut i32) (global.get $g1)) - (func $foo (; 0 ;) (type $0) + (func $foo (; 0 ;) (type $FUNCSIG$v) (global.set $g2 (unreachable) ) diff --git a/test/passes/simplify-locals-nostructure.txt b/test/passes/simplify-locals-nostructure.txt index 10f1544e1..1b5ca6580 100644 --- a/test/passes/simplify-locals-nostructure.txt +++ b/test/passes/simplify-locals-nostructure.txt @@ -1,9 +1,9 @@ (module - (type $0 (func)) - (type $1 (func (param i32 i32) (result f64))) - (type $2 (func (param i32) (result i32))) + (type $FUNCSIG$v (func)) + (type $FUNCSIG$dii (func (param i32 i32) (result f64))) + (type $FUNCSIG$ii (func (param i32) (result i32))) (memory $0 1) - (func $contrast (; 0 ;) (type $0) + (func $contrast (; 0 ;) (type $FUNCSIG$v) (local $x i32) (local $y i32) (local $z i32) @@ -64,11 +64,11 @@ (local.get $b) ) ) - (func $no-unreachable (; 1 ;) (type $0) + (func $no-unreachable (; 1 ;) (type $FUNCSIG$v) (local $x i32) (unreachable) ) - (func $implicit-trap-and-global-effects (; 2 ;) (type $0) + (func $implicit-trap-and-global-effects (; 2 ;) (type $FUNCSIG$v) (local $var$0 i32) (local.set $var$0 (i32.trunc_f64_u @@ -83,7 +83,7 @@ (local.get $var$0) ) ) - (func $implicit-trap-and-local-effects (; 3 ;) (type $0) + (func $implicit-trap-and-local-effects (; 3 ;) (type $FUNCSIG$v) (local $var$0 i32) (local $other i32) (nop) @@ -102,7 +102,7 @@ ) ) ) - (func $multi-pass-get-equivs-right (; 4 ;) (type $1) (param $var$0 i32) (param $var$1 i32) (result f64) + (func $multi-pass-get-equivs-right (; 4 ;) (type $FUNCSIG$dii) (param $var$0 i32) (param $var$1 i32) (result f64) (local $var$2 i32) (nop) (i32.store @@ -115,7 +115,7 @@ ) ) ) - (func $if-value-structure-equivalent (; 5 ;) (type $2) (param $x i32) (result i32) + (func $if-value-structure-equivalent (; 5 ;) (type $FUNCSIG$ii) (param $x i32) (result i32) (local $y i32) (if (i32.const 1) diff --git a/test/passes/simplify-locals-notee-nostructure.txt b/test/passes/simplify-locals-notee-nostructure.txt index eaaeb6cd2..517c87dea 100644 --- a/test/passes/simplify-locals-notee-nostructure.txt +++ b/test/passes/simplify-locals-notee-nostructure.txt @@ -1,6 +1,6 @@ (module - (type $0 (func)) - (func $contrast (; 0 ;) (type $0) + (type $FUNCSIG$v (func)) + (func $contrast (; 0 ;) (type $FUNCSIG$v) (local $x i32) (local $y i32) (local $z i32) diff --git a/test/passes/simplify-locals-notee.txt b/test/passes/simplify-locals-notee.txt index bf5b17d07..66cf78ead 100644 --- a/test/passes/simplify-locals-notee.txt +++ b/test/passes/simplify-locals-notee.txt @@ -1,6 +1,6 @@ (module - (type $0 (func)) - (func $contrast (; 0 ;) (type $0) + (type $FUNCSIG$v (func)) + (func $contrast (; 0 ;) (type $FUNCSIG$v) (local $x i32) (local $y i32) (local $z i32) diff --git a/test/passes/simplify-locals.txt b/test/passes/simplify-locals.txt index b743ea528..5804fd658 100644 --- a/test/passes/simplify-locals.txt +++ b/test/passes/simplify-locals.txt @@ -1,6 +1,6 @@ (module - (type $0 (func (result i32))) - (func $sink-from-inside (; 0 ;) (type $0) (result i32) + (type $FUNCSIG$i (func (result i32))) + (func $sink-from-inside (; 0 ;) (type $FUNCSIG$i) (result i32) (local $0 i32) (local $1 i32) (local $2 i32) diff --git a/test/passes/simplify-locals_all-features.txt b/test/passes/simplify-locals_all-features.txt index d33dd9769..84dcaeb6a 100644 --- a/test/passes/simplify-locals_all-features.txt +++ b/test/passes/simplify-locals_all-features.txt @@ -8,10 +8,10 @@ (type $6 (func (param i32 i32 i32 i32 i32 i32))) (type $FUNCSIG$iii (func (param i32 i32) (result i32))) (type $FUNCSIG$vf (func (param f32))) - (type $9 (func (param i32 i32))) - (type $10 (func (param i32 i32 i32) (result i32))) - (type $11 (func (param i64))) - (type $12 (func (param i32 f64 f64 f32 i32) (result f64))) + (type $FUNCSIG$vii (func (param i32 i32))) + (type $FUNCSIG$iiii (func (param i32 i32 i32) (result i32))) + (type $FUNCSIG$vj (func (param i64))) + (type $FUNCSIG$diddfi (func (param i32 f64 f64 f32 i32) (result f64))) (import "env" "waka" (func $waka)) (import "env" "waka_int" (func $waka_int (result i32))) (import "env" "i64sub" (func $_i64Subtract (param i32 i32 i32 i32) (result i32))) @@ -754,7 +754,7 @@ (local.get $i1) ) ) - (func $no-out-of-label (; 14 ;) (type $9) (param $x i32) (param $y i32) + (func $no-out-of-label (; 14 ;) (type $FUNCSIG$vii) (param $x i32) (param $y i32) (nop) (local.set $x (loop $moar (result i32) @@ -809,7 +809,7 @@ ) ) ) - (func $drop-if-value (; 16 ;) (type $10) (param $x i32) (param $y i32) (param $z i32) (result i32) + (func $drop-if-value (; 16 ;) (type $FUNCSIG$iiii) (param $x i32) (param $y i32) (param $z i32) (result i32) (local $temp i32) (drop (if (result i32) @@ -837,7 +837,7 @@ (i32.const 0) ) ) - (func $drop-br_if (; 17 ;) (type $10) (param $label i32) (param $$cond2 i32) (param $$$0151 i32) (result i32) + (func $drop-br_if (; 17 ;) (type $FUNCSIG$iiii) (param $label i32) (param $$cond2 i32) (param $$$0151 i32) (result i32) (nop) (local.tee $label (block $label$break$L4 (result i32) @@ -878,7 +878,7 @@ (local.get $x) ) ) - (func $if-return-but-unreachable (; 19 ;) (type $11) (param $var$0 i64) + (func $if-return-but-unreachable (; 19 ;) (type $FUNCSIG$vj) (param $var$0 i64) (if (unreachable) (drop @@ -1047,7 +1047,7 @@ ) ) ) - (func $update-getCounter (; 25 ;) (type $12) (param $0 i32) (param $1 f64) (param $2 f64) (param $3 f32) (param $4 i32) (result f64) + (func $update-getCounter (; 25 ;) (type $FUNCSIG$diddfi) (param $0 i32) (param $1 f64) (param $2 f64) (param $3 f32) (param $4 i32) (result f64) (global.set $global$0 (i32.sub (global.get $global$0) @@ -1123,12 +1123,11 @@ (type $4 (func (param i32))) (type $5 (func (param i32) (result i32))) (type $6 (func (param i32 i32 i32 i32 i32 i32))) - (type $FUNCSIG$vi (func (param i32))) (type $FUNCSIG$vf (func (param f32))) - (type $9 (func (param i32 i32))) - (type $10 (func (result f64))) - (type $11 (func (param i32 i32) (result f64))) - (type $12 (func (param i32 i32) (result i32))) + (type $FUNCSIG$vii (func (param i32 i32))) + (type $FUNCSIG$d (func (result f64))) + (type $FUNCSIG$dii (func (param i32 i32) (result f64))) + (type $FUNCSIG$iii (func (param i32 i32) (result i32))) (import "fuzzing-support" "log1" (func $fimport$0 (result i32))) (import "fuzzing-support" "log2" (func $fimport$1 (param i32))) (import "fuzzing-support" "log3" (func $fimport$2 (param f32))) @@ -1566,7 +1565,7 @@ (local.get $x) ) ) - (func $loop-copies (; 22 ;) (type $9) (param $x i32) (param $y i32) + (func $loop-copies (; 22 ;) (type $FUNCSIG$vii) (param $x i32) (param $y i32) (loop $loop (nop) (drop @@ -1577,7 +1576,7 @@ ) ) ) - (func $proper-type (; 23 ;) (type $10) (result f64) + (func $proper-type (; 23 ;) (type $FUNCSIG$d) (result f64) (local $var$0 i32) (local $var$2 f64) (local.set $var$0 @@ -1589,7 +1588,7 @@ ) (local.get $var$2) ) - (func $multi-pass-get-equivs-right (; 24 ;) (type $11) (param $var$0 i32) (param $var$1 i32) (result f64) + (func $multi-pass-get-equivs-right (; 24 ;) (type $FUNCSIG$dii) (param $var$0 i32) (param $var$1 i32) (result f64) (local $var$2 i32) (nop) (i32.store @@ -1622,7 +1621,7 @@ ) ) ) - (func $set-tee-need-one-of-them (; 26 ;) (type $12) (param $var$0 i32) (param $var$1 i32) (result i32) + (func $set-tee-need-one-of-them (; 26 ;) (type $FUNCSIG$iii) (param $var$0 i32) (param $var$1 i32) (result i32) (local $var$2 i32) (local $var$3 i32) (local.set $var$2 @@ -1721,10 +1720,10 @@ ) ) (module - (type $0 (func)) + (type $FUNCSIG$v (func)) (memory $0 256 256) (data passive "hello, there!") - (func $memory-init-load (; 0 ;) (type $0) + (func $memory-init-load (; 0 ;) (type $FUNCSIG$v) (local $x i32) (local.set $x (i32.load @@ -1740,7 +1739,7 @@ (local.get $x) ) ) - (func $memory-init-store (; 1 ;) (type $0) + (func $memory-init-store (; 1 ;) (type $FUNCSIG$v) (local $x i32) (local.set $x (block $block (result i32) @@ -1760,7 +1759,7 @@ (local.get $x) ) ) - (func $memory-copy-load (; 2 ;) (type $0) + (func $memory-copy-load (; 2 ;) (type $FUNCSIG$v) (local $x i32) (local.set $x (i32.load @@ -1776,7 +1775,7 @@ (local.get $x) ) ) - (func $memory-copy-store (; 3 ;) (type $0) + (func $memory-copy-store (; 3 ;) (type $FUNCSIG$v) (local $x i32) (local.set $x (block $block (result i32) @@ -1796,7 +1795,7 @@ (local.get $x) ) ) - (func $memory-fill-load (; 4 ;) (type $0) + (func $memory-fill-load (; 4 ;) (type $FUNCSIG$v) (local $x i32) (local.set $x (i32.load @@ -1812,7 +1811,7 @@ (local.get $x) ) ) - (func $memory-fill-store (; 5 ;) (type $0) + (func $memory-fill-store (; 5 ;) (type $FUNCSIG$v) (local $x i32) (local.set $x (block $block (result i32) @@ -1832,7 +1831,7 @@ (local.get $x) ) ) - (func $data-drop-load (; 6 ;) (type $0) + (func $data-drop-load (; 6 ;) (type $FUNCSIG$v) (local $x i32) (nop) (data.drop 0) @@ -1842,7 +1841,7 @@ ) ) ) - (func $data-drop-store (; 7 ;) (type $0) + (func $data-drop-store (; 7 ;) (type $FUNCSIG$v) (local $x i32) (local.set $x (block $block (result i32) @@ -1858,7 +1857,7 @@ (local.get $x) ) ) - (func $data-drop-memory-init (; 8 ;) (type $0) + (func $data-drop-memory-init (; 8 ;) (type $FUNCSIG$v) (local $x i32) (local.set $x (block $block (result i32) diff --git a/test/passes/spill-pointers.txt b/test/passes/spill-pointers.txt index 8a87c17d1..debd87eac 100644 --- a/test/passes/spill-pointers.txt +++ b/test/passes/spill-pointers.txt @@ -1,26 +1,26 @@ (module (type $ii (func (param i32 i32))) (type $FUNCSIG$vi (func (param i32))) - (type $2 (func)) - (type $3 (func (result i32))) - (type $4 (func (param i32) (result i32))) - (type $5 (func (param f64))) + (type $FUNCSIG$v (func)) + (type $FUNCSIG$i (func (result i32))) + (type $FUNCSIG$ii (func (param i32) (result i32))) + (type $FUNCSIG$vd (func (param f64))) (import "env" "STACKTOP" (global $STACKTOP$asm2wasm$import i32)) (import "env" "segfault" (func $segfault (param i32))) (memory $0 10) (table $0 1 1 funcref) (global $stack_ptr (mut i32) (global.get $STACKTOP$asm2wasm$import)) - (func $nothing (; 1 ;) (type $2) + (func $nothing (; 1 ;) (type $FUNCSIG$v) (nop) ) - (func $not-alive (; 2 ;) (type $2) + (func $not-alive (; 2 ;) (type $FUNCSIG$v) (local $x i32) (local.set $x (i32.const 1) ) (call $nothing) ) - (func $spill (; 3 ;) (type $2) + (func $spill (; 3 ;) (type $FUNCSIG$v) (local $x i32) (local $1 i32) (local.set $1 @@ -48,7 +48,7 @@ (local.get $1) ) ) - (func $ignore-non-pointers (; 4 ;) (type $2) + (func $ignore-non-pointers (; 4 ;) (type $FUNCSIG$v) (local $x i32) (local $y i64) (local $z f32) @@ -100,7 +100,7 @@ (local.get $4) ) ) - (func $spill4 (; 5 ;) (type $2) + (func $spill4 (; 5 ;) (type $FUNCSIG$v) (local $x i32) (local $y i32) (local $z i32) @@ -164,7 +164,7 @@ (local.get $4) ) ) - (func $spill5 (; 6 ;) (type $2) + (func $spill5 (; 6 ;) (type $FUNCSIG$v) (local $x i32) (local $y i32) (local $z i32) @@ -239,7 +239,7 @@ (local.get $5) ) ) - (func $some-alive (; 7 ;) (type $2) + (func $some-alive (; 7 ;) (type $FUNCSIG$v) (local $x i32) (local $y i32) (local $2 i32) @@ -307,7 +307,7 @@ (local.get $3) ) ) - (func $spill-ret (; 9 ;) (type $3) (result i32) + (func $spill-ret (; 9 ;) (type $FUNCSIG$i) (result i32) (local $x i32) (local $1 i32) (local $2 i32) @@ -367,7 +367,7 @@ ) (local.get $4) ) - (func $spill-unreachable (; 10 ;) (type $3) (result i32) + (func $spill-unreachable (; 10 ;) (type $FUNCSIG$i) (result i32) (local $x i32) (local $1 i32) (local $2 i32) @@ -400,10 +400,10 @@ ) (local.get $2) ) - (func $spill-call-call0 (; 11 ;) (type $4) (param $p i32) (result i32) + (func $spill-call-call0 (; 11 ;) (type $FUNCSIG$ii) (param $p i32) (result i32) (unreachable) ) - (func $spill-call-call1 (; 12 ;) (type $4) (param $p i32) (result i32) + (func $spill-call-call1 (; 12 ;) (type $FUNCSIG$ii) (param $p i32) (result i32) (local $x i32) (local $2 i32) (local $3 i32) @@ -453,7 +453,7 @@ ) (local.get $5) ) - (func $spill-call-ret (; 13 ;) (type $4) (param $p i32) (result i32) + (func $spill-call-ret (; 13 ;) (type $FUNCSIG$ii) (param $p i32) (result i32) (local $x i32) (drop (call $spill-call-call0 @@ -464,7 +464,7 @@ ) (i32.const 0) ) - (func $spill-ret-call (; 14 ;) (type $4) (param $p i32) (result i32) + (func $spill-ret-call (; 14 ;) (type $FUNCSIG$ii) (param $p i32) (result i32) (local $x i32) (drop (return @@ -475,7 +475,7 @@ ) (i32.const 0) ) - (func $spill-ret-ret (; 15 ;) (type $3) (result i32) + (func $spill-ret-ret (; 15 ;) (type $FUNCSIG$i) (result i32) (local $x i32) (local $1 i32) (local $2 i32) @@ -529,7 +529,7 @@ ) (local.get $3) ) - (func $spill-call-othertype (; 16 ;) (type $5) (param $y f64) + (func $spill-call-othertype (; 16 ;) (type $FUNCSIG$vd) (param $y f64) (local $x i32) (local $2 i32) (local $3 f64) @@ -563,7 +563,7 @@ (local.get $2) ) ) - (func $spill-call_indirect (; 17 ;) (type $2) + (func $spill-call_indirect (; 17 ;) (type $FUNCSIG$v) (local $x i32) (local $1 i32) (local $2 i32) @@ -607,7 +607,7 @@ (local.get $1) ) ) - (func $spill-call_import (; 18 ;) (type $2) + (func $spill-call_import (; 18 ;) (type $FUNCSIG$v) (local $x i32) (local $1 i32) (local $2 i32) diff --git a/test/passes/ssa-nomerge.txt b/test/passes/ssa-nomerge.txt index fbe9b0c76..48f34f054 100644 --- a/test/passes/ssa-nomerge.txt +++ b/test/passes/ssa-nomerge.txt @@ -1,8 +1,8 @@ (module - (type $0 (func (param i32))) - (type $1 (func (param i32 i32))) + (type $FUNCSIG$vi (func (param i32))) + (type $FUNCSIG$vii (func (param i32 i32))) (global $global$0 (mut i32) (i32.const 1)) - (func $basics (; 0 ;) (type $0) (param $x i32) + (func $basics (; 0 ;) (type $FUNCSIG$vi) (param $x i32) (local $y i32) (local $z f32) (local $w i64) @@ -47,7 +47,7 @@ (local.get $7) ) ) - (func $if (; 1 ;) (type $0) (param $p i32) + (func $if (; 1 ;) (type $FUNCSIG$vi) (param $p i32) (local $x i32) (local $y i32) (local $3 i32) @@ -126,7 +126,7 @@ (local.get $x) ) ) - (func $if2 (; 2 ;) (type $0) (param $x i32) + (func $if2 (; 2 ;) (type $FUNCSIG$vi) (param $x i32) (if (i32.const 1) (block $block @@ -142,7 +142,7 @@ (local.get $x) ) ) - (func $nomerge (; 3 ;) (type $1) (param $p i32) (param $q i32) + (func $nomerge (; 3 ;) (type $FUNCSIG$vii) (param $p i32) (param $q i32) (local $x i32) (local $3 i32) (local $4 i32) diff --git a/test/passes/ssa_enable-threads.txt b/test/passes/ssa_enable-threads.txt index 54a5cd757..09029195a 100644 --- a/test/passes/ssa_enable-threads.txt +++ b/test/passes/ssa_enable-threads.txt @@ -1,9 +1,9 @@ (module - (type $0 (func (param i32))) - (type $1 (func)) - (type $2 (func (result i32))) + (type $FUNCSIG$vi (func (param i32))) + (type $FUNCSIG$v (func)) + (type $FUNCSIG$i (func (result i32))) (global $global$0 (mut i32) (i32.const 1)) - (func $basics (; 0 ;) (type $0) (param $x i32) + (func $basics (; 0 ;) (type $FUNCSIG$vi) (param $x i32) (local $y i32) (local $z f32) (local $w i64) @@ -48,7 +48,7 @@ (local.get $7) ) ) - (func $if (; 1 ;) (type $0) (param $p i32) + (func $if (; 1 ;) (type $FUNCSIG$vi) (param $p i32) (local $x i32) (local $y i32) (local $3 i32) @@ -168,7 +168,7 @@ ) ) ) - (func $if2 (; 2 ;) (type $0) (param $x i32) + (func $if2 (; 2 ;) (type $FUNCSIG$vi) (param $x i32) (local $1 i32) (local $2 i32) (local.set $2 @@ -193,7 +193,7 @@ ) ) ) - (func $block (; 3 ;) (type $0) (param $x i32) + (func $block (; 3 ;) (type $FUNCSIG$vi) (param $x i32) (local $1 i32) (local $2 i32) (local.set $2 @@ -215,7 +215,7 @@ ) ) ) - (func $block2 (; 4 ;) (type $0) (param $x i32) + (func $block2 (; 4 ;) (type $FUNCSIG$vi) (param $x i32) (local $1 i32) (local $2 i32) (local $3 i32) @@ -315,7 +315,7 @@ (local.get $6) ) ) - (func $loop (; 5 ;) (type $0) (param $x i32) + (func $loop (; 5 ;) (type $FUNCSIG$vi) (param $x i32) (local $1 i32) (local $2 i32) (local.set $2 @@ -343,7 +343,7 @@ ) ) ) - (func $loop2 (; 6 ;) (type $0) (param $x i32) + (func $loop2 (; 6 ;) (type $FUNCSIG$vi) (param $x i32) (local $1 i32) (local $2 i32) (local $3 i32) @@ -391,7 +391,7 @@ ) ) ) - (func $loop2-zeroinit (; 7 ;) (type $1) + (func $loop2-zeroinit (; 7 ;) (type $FUNCSIG$v) (local $x i32) (local $1 i32) (local $2 i32) @@ -435,7 +435,7 @@ (local.get $3) ) ) - (func $real-loop (; 8 ;) (type $0) (param $param i32) + (func $real-loop (; 8 ;) (type $FUNCSIG$vi) (param $param i32) (local $loopvar i32) (local $inc i32) (local $3 i32) @@ -475,7 +475,7 @@ (local.get $6) ) ) - (func $real-loop-outblock (; 9 ;) (type $0) (param $param i32) + (func $real-loop-outblock (; 9 ;) (type $FUNCSIG$vi) (param $param i32) (local $loopvar i32) (local $inc i32) (local $3 i32) @@ -515,7 +515,7 @@ (local.get $6) ) ) - (func $loop-loop-param (; 10 ;) (type $0) (param $param i32) + (func $loop-loop-param (; 10 ;) (type $FUNCSIG$vi) (param $param i32) (local $1 i32) (local $2 i32) (local $3 i32) @@ -559,7 +559,7 @@ ) ) ) - (func $loop-loop-param-nomerge (; 11 ;) (type $0) (param $param i32) + (func $loop-loop-param-nomerge (; 11 ;) (type $FUNCSIG$vi) (param $param i32) (local $1 i32) (local $2 i32) (local $3 i32) @@ -592,7 +592,7 @@ ) ) ) - (func $loop-nesting (; 12 ;) (type $0) (param $x i32) + (func $loop-nesting (; 12 ;) (type $FUNCSIG$vi) (param $x i32) (local $1 i32) (local $2 i32) (local $3 i32) @@ -645,7 +645,7 @@ ) ) ) - (func $loop-nesting-2 (; 13 ;) (type $0) (param $x i32) + (func $loop-nesting-2 (; 13 ;) (type $FUNCSIG$vi) (param $x i32) (local $1 i32) (local $2 i32) (local $3 i32) @@ -700,7 +700,7 @@ ) ) ) - (func $func_6 (; 14 ;) (type $2) (result i32) + (func $func_6 (; 14 ;) (type $FUNCSIG$i) (result i32) (local $result i32) (local $zero i32) (local $2 i32) @@ -734,7 +734,7 @@ (br $label$1) ) ) - (func $ssa-merge-tricky (; 15 ;) (type $2) (result i32) + (func $ssa-merge-tricky (; 15 ;) (type $FUNCSIG$i) (result i32) (local $var$0 i32) (local $var$1 i32) (local $2 i32) diff --git a/test/passes/trap-mode-clamp.txt b/test/passes/trap-mode-clamp.txt index b0e014f22..1ba06b773 100644 --- a/test/passes/trap-mode-clamp.txt +++ b/test/passes/trap-mode-clamp.txt @@ -1,8 +1,8 @@ (module - (type $0 (func (param i32 i64))) - (type $1 (func (param f32))) - (type $2 (func (param f64))) - (func $test_div (; 0 ;) (type $0) (param $0 i32) (param $1 i64) + (type $FUNCSIG$vij (func (param i32 i64))) + (type $FUNCSIG$vf (func (param f32))) + (type $FUNCSIG$vd (func (param f64))) + (func $test_div (; 0 ;) (type $FUNCSIG$vij) (param $0 i32) (param $1 i64) (drop (call $i32s-div (local.get $0) @@ -28,7 +28,7 @@ ) ) ) - (func $test_rem (; 1 ;) (type $0) (param $0 i32) (param $1 i64) + (func $test_rem (; 1 ;) (type $FUNCSIG$vij) (param $0 i32) (param $1 i64) (drop (call $i32s-rem (local.get $0) @@ -54,7 +54,7 @@ ) ) ) - (func $test_f32_to_int (; 2 ;) (type $1) (param $0 f32) + (func $test_f32_to_int (; 2 ;) (type $FUNCSIG$vf) (param $0 f32) (drop (call $f32-to-int (local.get $0) @@ -76,7 +76,7 @@ ) ) ) - (func $test_f64_to_int (; 3 ;) (type $2) (param $0 f64) + (func $test_f64_to_int (; 3 ;) (type $FUNCSIG$vd) (param $0 f64) (drop (call $f64-to-int (local.get $0) diff --git a/test/passes/trap-mode-js.txt b/test/passes/trap-mode-js.txt index 9bcaf1f99..af632378a 100644 --- a/test/passes/trap-mode-js.txt +++ b/test/passes/trap-mode-js.txt @@ -1,10 +1,10 @@ (module - (type $0 (func (param i32 i64))) - (type $1 (func (param f32))) - (type $2 (func (param f64))) + (type $FUNCSIG$vij (func (param i32 i64))) + (type $FUNCSIG$vf (func (param f32))) + (type $FUNCSIG$vd (func (param f64))) (type $FUNCSIG$id (func (param f64) (result i32))) (import "asm2wasm" "f64-to-int" (func $f64-to-int (param f64) (result i32))) - (func $test_div (; 1 ;) (type $0) (param $0 i32) (param $1 i64) + (func $test_div (; 1 ;) (type $FUNCSIG$vij) (param $0 i32) (param $1 i64) (drop (call $i32s-div (local.get $0) @@ -30,7 +30,7 @@ ) ) ) - (func $test_rem (; 2 ;) (type $0) (param $0 i32) (param $1 i64) + (func $test_rem (; 2 ;) (type $FUNCSIG$vij) (param $0 i32) (param $1 i64) (drop (call $i32s-rem (local.get $0) @@ -56,7 +56,7 @@ ) ) ) - (func $test_f32_to_int (; 3 ;) (type $1) (param $0 f32) + (func $test_f32_to_int (; 3 ;) (type $FUNCSIG$vf) (param $0 f32) (drop (call $f64-to-int (f64.promote_f32 @@ -82,7 +82,7 @@ ) ) ) - (func $test_f64_to_int (; 4 ;) (type $2) (param $0 f64) + (func $test_f64_to_int (; 4 ;) (type $FUNCSIG$vd) (param $0 f64) (drop (call $f64-to-int (local.get $0) diff --git a/test/passes/untee.txt b/test/passes/untee.txt index 2c21ae178..531c6e365 100644 --- a/test/passes/untee.txt +++ b/test/passes/untee.txt @@ -1,6 +1,6 @@ (module - (type $0 (func)) - (func $tee (; 0 ;) (type $0) + (type $FUNCSIG$v (func)) + (func $tee (; 0 ;) (type $FUNCSIG$v) (local $x i32) (local $y f64) (drop diff --git a/test/passes/vacuum.txt b/test/passes/vacuum.txt index 638aa3bed..dbeddeb96 100644 --- a/test/passes/vacuum.txt +++ b/test/passes/vacuum.txt @@ -4,8 +4,7 @@ (type $2 (func (result f32))) (type $3 (func (result i32))) (type $4 (func (param i32 f64 i32 i32))) - (type $FUNCSIG$i (func (result i32))) - (type $6 (func (result f64))) + (type $FUNCSIG$d (func (result f64))) (import "env" "int" (func $int (result i32))) (memory $0 256 256) (global $Int i32 (i32.const 0)) @@ -222,7 +221,7 @@ ) ) ) - (func $leave-block-even-if-br-not-taken (; 25 ;) (type $6) (result f64) + (func $leave-block-even-if-br-not-taken (; 25 ;) (type $FUNCSIG$d) (result f64) (block $label$0 (result f64) (f64.store align=1 (i32.const 879179022) @@ -327,27 +326,27 @@ ) ) (module - (type $0 (func (param i32) (result i32))) - (type $1 (func (param i32 i32 i32))) + (type $FUNCSIG$ii (func (param i32) (result i32))) + (type $FUNCSIG$viii (func (param i32 i32 i32))) (memory $0 1 1) (global $global$1 (mut i32) (i32.const 0)) (export "compress" (func $3)) - (func $_deflate (; 0 ;) (type $0) (param $0 i32) (result i32) + (func $_deflate (; 0 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32) (call $_deflate (local.get $0) ) ) - (func $_deflateInit2_ (; 1 ;) (type $0) (param $0 i32) (result i32) + (func $_deflateInit2_ (; 1 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32) (call $_deflateInit2_ (local.get $0) ) ) - (func $_deflateEnd (; 2 ;) (type $0) (param $0 i32) (result i32) + (func $_deflateEnd (; 2 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32) (call $_deflateEnd (local.get $0) ) ) - (func $3 (; 3 ;) (type $1) (param $0 i32) (param $1 i32) (param $2 i32) + (func $3 (; 3 ;) (type $FUNCSIG$viii) (param $0 i32) (param $1 i32) (param $2 i32) (local $3 i32) (local.set $3 (global.get $global$1) diff --git a/test/passes/vacuum_ignore-implicit-traps.txt b/test/passes/vacuum_ignore-implicit-traps.txt index 5df38be47..61ab6f8d2 100644 --- a/test/passes/vacuum_ignore-implicit-traps.txt +++ b/test/passes/vacuum_ignore-implicit-traps.txt @@ -1,14 +1,14 @@ (module - (type $0 (func (result i32))) - (type $1 (func)) + (type $FUNCSIG$i (func (result i32))) + (type $FUNCSIG$v (func)) (memory $0 1) - (func $load-would-normally-have-side-effects (; 0 ;) (type $0) (result i32) + (func $load-would-normally-have-side-effects (; 0 ;) (type $FUNCSIG$i) (result i32) (i64.ge_s (i64.const 2912825531628789796) (i64.const 0) ) ) - (func $unary-binary-may-trap (; 1 ;) (type $1) + (func $unary-binary-may-trap (; 1 ;) (type $FUNCSIG$v) (nop) ) ) diff --git a/test/passes/vacuum_remove-unused-names_merge-blocks.txt b/test/passes/vacuum_remove-unused-names_merge-blocks.txt index 210362877..2d7993bd1 100644 --- a/test/passes/vacuum_remove-unused-names_merge-blocks.txt +++ b/test/passes/vacuum_remove-unused-names_merge-blocks.txt @@ -1,6 +1,6 @@ (module - (type $0 (func (param i32) (result i32))) - (func $return-block (; 0 ;) (type $0) (param $x i32) (result i32) + (type $FUNCSIG$ii (func (param i32) (result i32))) + (func $return-block (; 0 ;) (type $FUNCSIG$ii) (param $x i32) (result i32) (local.set $x (local.get $x) ) diff --git a/test/polymorphic_stack.wast.from-wast b/test/polymorphic_stack.wast.from-wast index d1056b2ef..cb0d47355 100644 --- a/test/polymorphic_stack.wast.from-wast +++ b/test/polymorphic_stack.wast.from-wast @@ -1,10 +1,10 @@ (module (type $FUNCSIG$ii (func (param i32) (result i32))) - (type $1 (func (result i32))) - (type $2 (func (param i32))) - (type $3 (func)) + (type $FUNCSIG$i (func (result i32))) + (type $FUNCSIG$vi (func (param i32))) + (type $FUNCSIG$v (func)) (import "env" "table" (table $0 9 9 funcref)) - (func $break-and-binary (; 0 ;) (type $1) (result i32) + (func $break-and-binary (; 0 ;) (type $FUNCSIG$i) (result i32) (block $x (result i32) (f32.add (br_if $x @@ -43,7 +43,7 @@ ) ) ) - (func $tee (; 2 ;) (type $2) (param $x i32) + (func $tee (; 2 ;) (type $FUNCSIG$vi) (param $x i32) (local $y f32) (drop (i64.eqz @@ -60,7 +60,7 @@ ) ) ) - (func $tee2 (; 3 ;) (type $3) + (func $tee2 (; 3 ;) (type $FUNCSIG$v) (local $0 f32) (if (i32.const 259) @@ -69,7 +69,7 @@ ) ) ) - (func $select (; 4 ;) (type $3) + (func $select (; 4 ;) (type $FUNCSIG$v) (drop (i64.eqz (select @@ -80,7 +80,7 @@ ) ) ) - (func $untaken-break-should-have-value (; 5 ;) (type $1) (result i32) + (func $untaken-break-should-have-value (; 5 ;) (type $FUNCSIG$i) (result i32) (block $x (result i32) (block $block (br_if $x @@ -106,7 +106,7 @@ ) ) ) - (func $br_table_unreachable_to_also_unreachable (; 7 ;) (type $1) (result i32) + (func $br_table_unreachable_to_also_unreachable (; 7 ;) (type $FUNCSIG$i) (result i32) (block $a (result i32) (block $b (result i32) (br_table $a $b @@ -116,7 +116,7 @@ ) ) ) - (func $untaken-br_if (; 8 ;) (type $1) (result i32) + (func $untaken-br_if (; 8 ;) (type $FUNCSIG$i) (result i32) (block $label$8 (result i32) (block $label$9 (drop diff --git a/test/simd.wast.from-wast b/test/simd.wast.from-wast index 55e97a6f1..5d010f9ed 100644 --- a/test/simd.wast.from-wast +++ b/test/simd.wast.from-wast @@ -1,823 +1,823 @@ (module - (type $0 (func (param i32) (result v128))) - (type $1 (func (param i32 v128))) - (type $2 (func (result v128))) - (type $3 (func (param v128 v128) (result v128))) - (type $4 (func (param v128) (result i32))) - (type $5 (func (param v128 i32) (result v128))) - (type $6 (func (param v128) (result i64))) - (type $7 (func (param v128 i64) (result v128))) - (type $8 (func (param f32) (result v128))) - (type $9 (func (param v128) (result f32))) - (type $10 (func (param v128 f32) (result v128))) - (type $11 (func (param f64) (result v128))) - (type $12 (func (param v128) (result f64))) - (type $13 (func (param v128 f64) (result v128))) - (type $14 (func (param v128) (result v128))) - (type $15 (func (param v128 v128 v128) (result v128))) + (type $FUNCSIG$Vi (func (param i32) (result v128))) + (type $FUNCSIG$viV (func (param i32 v128))) + (type $FUNCSIG$V (func (result v128))) + (type $FUNCSIG$VVV (func (param v128 v128) (result v128))) + (type $FUNCSIG$iV (func (param v128) (result i32))) + (type $FUNCSIG$VVi (func (param v128 i32) (result v128))) + (type $FUNCSIG$jV (func (param v128) (result i64))) + (type $FUNCSIG$VVj (func (param v128 i64) (result v128))) + (type $FUNCSIG$Vf (func (param f32) (result v128))) + (type $FUNCSIG$fV (func (param v128) (result f32))) + (type $FUNCSIG$VVf (func (param v128 f32) (result v128))) + (type $FUNCSIG$Vd (func (param f64) (result v128))) + (type $FUNCSIG$dV (func (param v128) (result f64))) + (type $FUNCSIG$VVd (func (param v128 f64) (result v128))) + (type $FUNCSIG$VV (func (param v128) (result v128))) + (type $FUNCSIG$VVVV (func (param v128 v128 v128) (result v128))) (memory $0 1 1) - (func $v128.load (; 0 ;) (type $0) (param $0 i32) (result v128) + (func $v128.load (; 0 ;) (type $FUNCSIG$Vi) (param $0 i32) (result v128) (v128.load (local.get $0) ) ) - (func $v128.store (; 1 ;) (type $1) (param $0 i32) (param $1 v128) + (func $v128.store (; 1 ;) (type $FUNCSIG$viV) (param $0 i32) (param $1 v128) (v128.store (local.get $0) (local.get $1) ) ) - (func $v128.const.i8x16 (; 2 ;) (type $2) (result v128) + (func $v128.const.i8x16 (; 2 ;) (type $FUNCSIG$V) (result v128) (v128.const i32x4 0x04030201 0x08070605 0x0c0b0a09 0x100f0e0d) ) - (func $v128.const.i16x8 (; 3 ;) (type $2) (result v128) + (func $v128.const.i16x8 (; 3 ;) (type $FUNCSIG$V) (result v128) (v128.const i32x4 0x00020001 0x00040003 0x00060005 0x00080007) ) - (func $v128.const.i32x4 (; 4 ;) (type $2) (result v128) + (func $v128.const.i32x4 (; 4 ;) (type $FUNCSIG$V) (result v128) (v128.const i32x4 0x00000001 0x00000002 0x00000003 0x00000004) ) - (func $v128.const.i64x2 (; 5 ;) (type $2) (result v128) + (func $v128.const.i64x2 (; 5 ;) (type $FUNCSIG$V) (result v128) (v128.const i32x4 0x00000001 0x00000000 0x00000002 0x00000000) ) - (func $v128.const.f32x4 (; 6 ;) (type $2) (result v128) + (func $v128.const.f32x4 (; 6 ;) (type $FUNCSIG$V) (result v128) (v128.const i32x4 0x3f800000 0x40000000 0x40400000 0x40800000) ) - (func $v128.const.f64x2 (; 7 ;) (type $2) (result v128) + (func $v128.const.f64x2 (; 7 ;) (type $FUNCSIG$V) (result v128) (v128.const i32x4 0x00000000 0x3ff00000 0x00000000 0x40000000) ) - (func $v128.shuffle (; 8 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $v128.shuffle (; 8 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (v8x16.shuffle 0 17 2 19 4 21 6 23 8 25 10 27 12 29 14 31 (local.get $0) (local.get $1) ) ) - (func $i8x16.splat (; 9 ;) (type $0) (param $0 i32) (result v128) + (func $i8x16.splat (; 9 ;) (type $FUNCSIG$Vi) (param $0 i32) (result v128) (i8x16.splat (local.get $0) ) ) - (func $i8x16.extract_lane_s (; 10 ;) (type $4) (param $0 v128) (result i32) + (func $i8x16.extract_lane_s (; 10 ;) (type $FUNCSIG$iV) (param $0 v128) (result i32) (i8x16.extract_lane_s 0 (local.get $0) ) ) - (func $i8x16.extract_lane_u (; 11 ;) (type $4) (param $0 v128) (result i32) + (func $i8x16.extract_lane_u (; 11 ;) (type $FUNCSIG$iV) (param $0 v128) (result i32) (i8x16.extract_lane_u 0 (local.get $0) ) ) - (func $i8x16.replace_lane (; 12 ;) (type $5) (param $0 v128) (param $1 i32) (result v128) + (func $i8x16.replace_lane (; 12 ;) (type $FUNCSIG$VVi) (param $0 v128) (param $1 i32) (result v128) (i8x16.replace_lane 0 (local.get $0) (local.get $1) ) ) - (func $i16x8.splat (; 13 ;) (type $0) (param $0 i32) (result v128) + (func $i16x8.splat (; 13 ;) (type $FUNCSIG$Vi) (param $0 i32) (result v128) (i16x8.splat (local.get $0) ) ) - (func $i16x8.extract_lane_s (; 14 ;) (type $4) (param $0 v128) (result i32) + (func $i16x8.extract_lane_s (; 14 ;) (type $FUNCSIG$iV) (param $0 v128) (result i32) (i16x8.extract_lane_s 0 (local.get $0) ) ) - (func $i16x8.extract_lane_u (; 15 ;) (type $4) (param $0 v128) (result i32) + (func $i16x8.extract_lane_u (; 15 ;) (type $FUNCSIG$iV) (param $0 v128) (result i32) (i16x8.extract_lane_u 0 (local.get $0) ) ) - (func $i16x8.replace_lane (; 16 ;) (type $5) (param $0 v128) (param $1 i32) (result v128) + (func $i16x8.replace_lane (; 16 ;) (type $FUNCSIG$VVi) (param $0 v128) (param $1 i32) (result v128) (i16x8.replace_lane 0 (local.get $0) (local.get $1) ) ) - (func $i32x4.splat (; 17 ;) (type $0) (param $0 i32) (result v128) + (func $i32x4.splat (; 17 ;) (type $FUNCSIG$Vi) (param $0 i32) (result v128) (i32x4.splat (local.get $0) ) ) - (func $i32x4.extract_lane (; 18 ;) (type $4) (param $0 v128) (result i32) + (func $i32x4.extract_lane (; 18 ;) (type $FUNCSIG$iV) (param $0 v128) (result i32) (i32x4.extract_lane 0 (local.get $0) ) ) - (func $i32x4.replace_lane (; 19 ;) (type $5) (param $0 v128) (param $1 i32) (result v128) + (func $i32x4.replace_lane (; 19 ;) (type $FUNCSIG$VVi) (param $0 v128) (param $1 i32) (result v128) (i32x4.replace_lane 0 (local.get $0) (local.get $1) ) ) - (func $i64x2.extract_lane (; 20 ;) (type $6) (param $0 v128) (result i64) + (func $i64x2.extract_lane (; 20 ;) (type $FUNCSIG$jV) (param $0 v128) (result i64) (i64x2.extract_lane 0 (local.get $0) ) ) - (func $i64x2.replace_lane (; 21 ;) (type $7) (param $0 v128) (param $1 i64) (result v128) + (func $i64x2.replace_lane (; 21 ;) (type $FUNCSIG$VVj) (param $0 v128) (param $1 i64) (result v128) (i64x2.replace_lane 0 (local.get $0) (local.get $1) ) ) - (func $f32x4.splat (; 22 ;) (type $8) (param $0 f32) (result v128) + (func $f32x4.splat (; 22 ;) (type $FUNCSIG$Vf) (param $0 f32) (result v128) (f32x4.splat (local.get $0) ) ) - (func $f32x4.extract_lane (; 23 ;) (type $9) (param $0 v128) (result f32) + (func $f32x4.extract_lane (; 23 ;) (type $FUNCSIG$fV) (param $0 v128) (result f32) (f32x4.extract_lane 0 (local.get $0) ) ) - (func $f32x4.replace_lane (; 24 ;) (type $10) (param $0 v128) (param $1 f32) (result v128) + (func $f32x4.replace_lane (; 24 ;) (type $FUNCSIG$VVf) (param $0 v128) (param $1 f32) (result v128) (f32x4.replace_lane 0 (local.get $0) (local.get $1) ) ) - (func $f64x2.splat (; 25 ;) (type $11) (param $0 f64) (result v128) + (func $f64x2.splat (; 25 ;) (type $FUNCSIG$Vd) (param $0 f64) (result v128) (f64x2.splat (local.get $0) ) ) - (func $f64x2.extract_lane (; 26 ;) (type $12) (param $0 v128) (result f64) + (func $f64x2.extract_lane (; 26 ;) (type $FUNCSIG$dV) (param $0 v128) (result f64) (f64x2.extract_lane 0 (local.get $0) ) ) - (func $f64x2.replace_lane (; 27 ;) (type $13) (param $0 v128) (param $1 f64) (result v128) + (func $f64x2.replace_lane (; 27 ;) (type $FUNCSIG$VVd) (param $0 v128) (param $1 f64) (result v128) (f64x2.replace_lane 0 (local.get $0) (local.get $1) ) ) - (func $i8x16.eq (; 28 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $i8x16.eq (; 28 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (i8x16.eq (local.get $0) (local.get $1) ) ) - (func $i8x16.ne (; 29 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $i8x16.ne (; 29 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (i8x16.ne (local.get $0) (local.get $1) ) ) - (func $i8x16.lt_s (; 30 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $i8x16.lt_s (; 30 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (i8x16.lt_s (local.get $0) (local.get $1) ) ) - (func $i8x16.lt_u (; 31 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $i8x16.lt_u (; 31 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (i8x16.lt_u (local.get $0) (local.get $1) ) ) - (func $i8x16.gt_s (; 32 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $i8x16.gt_s (; 32 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (i8x16.gt_s (local.get $0) (local.get $1) ) ) - (func $i8x16.gt_u (; 33 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $i8x16.gt_u (; 33 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (i8x16.gt_u (local.get $0) (local.get $1) ) ) - (func $i8x16.le_s (; 34 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $i8x16.le_s (; 34 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (i8x16.le_s (local.get $0) (local.get $1) ) ) - (func $i8x16.le_u (; 35 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $i8x16.le_u (; 35 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (i8x16.le_u (local.get $0) (local.get $1) ) ) - (func $i8x16.ge_s (; 36 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $i8x16.ge_s (; 36 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (i8x16.ge_s (local.get $0) (local.get $1) ) ) - (func $i8x16.ge_u (; 37 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $i8x16.ge_u (; 37 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (i8x16.ge_u (local.get $0) (local.get $1) ) ) - (func $i16x8.eq (; 38 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $i16x8.eq (; 38 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (i16x8.eq (local.get $0) (local.get $1) ) ) - (func $i16x8.ne (; 39 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $i16x8.ne (; 39 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (i16x8.ne (local.get $0) (local.get $1) ) ) - (func $i16x8.lt_s (; 40 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $i16x8.lt_s (; 40 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (i16x8.lt_s (local.get $0) (local.get $1) ) ) - (func $i16x8.lt_u (; 41 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $i16x8.lt_u (; 41 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (i16x8.lt_u (local.get $0) (local.get $1) ) ) - (func $i16x8.gt_s (; 42 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $i16x8.gt_s (; 42 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (i16x8.gt_s (local.get $0) (local.get $1) ) ) - (func $i16x8.gt_u (; 43 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $i16x8.gt_u (; 43 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (i16x8.gt_u (local.get $0) (local.get $1) ) ) - (func $i16x8.le_s (; 44 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $i16x8.le_s (; 44 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (i16x8.le_s (local.get $0) (local.get $1) ) ) - (func $i16x8.le_u (; 45 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $i16x8.le_u (; 45 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (i16x8.le_u (local.get $0) (local.get $1) ) ) - (func $i16x8.ge_s (; 46 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $i16x8.ge_s (; 46 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (i16x8.ge_s (local.get $0) (local.get $1) ) ) - (func $i16x8.ge_u (; 47 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $i16x8.ge_u (; 47 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (i16x8.ge_u (local.get $0) (local.get $1) ) ) - (func $i32x4.eq (; 48 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $i32x4.eq (; 48 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (i32x4.eq (local.get $0) (local.get $1) ) ) - (func $i32x4.ne (; 49 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $i32x4.ne (; 49 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (i32x4.ne (local.get $0) (local.get $1) ) ) - (func $i32x4.lt_s (; 50 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $i32x4.lt_s (; 50 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (i32x4.lt_s (local.get $0) (local.get $1) ) ) - (func $i32x4.lt_u (; 51 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $i32x4.lt_u (; 51 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (i32x4.lt_u (local.get $0) (local.get $1) ) ) - (func $i32x4.gt_s (; 52 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $i32x4.gt_s (; 52 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (i32x4.gt_s (local.get $0) (local.get $1) ) ) - (func $i32x4.gt_u (; 53 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $i32x4.gt_u (; 53 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (i32x4.gt_u (local.get $0) (local.get $1) ) ) - (func $i32x4.le_s (; 54 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $i32x4.le_s (; 54 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (i32x4.le_s (local.get $0) (local.get $1) ) ) - (func $i32x4.le_u (; 55 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $i32x4.le_u (; 55 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (i32x4.le_u (local.get $0) (local.get $1) ) ) - (func $i32x4.ge_s (; 56 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $i32x4.ge_s (; 56 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (i32x4.ge_s (local.get $0) (local.get $1) ) ) - (func $i32x4.ge_u (; 57 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $i32x4.ge_u (; 57 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (i32x4.ge_u (local.get $0) (local.get $1) ) ) - (func $f32x4.eq (; 58 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $f32x4.eq (; 58 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (f32x4.eq (local.get $0) (local.get $1) ) ) - (func $f32x4.ne (; 59 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $f32x4.ne (; 59 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (f32x4.ne (local.get $0) (local.get $1) ) ) - (func $f32x4.lt (; 60 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $f32x4.lt (; 60 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (f32x4.lt (local.get $0) (local.get $1) ) ) - (func $f32x4.gt (; 61 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $f32x4.gt (; 61 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (f32x4.gt (local.get $0) (local.get $1) ) ) - (func $f32x4.le (; 62 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $f32x4.le (; 62 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (f32x4.le (local.get $0) (local.get $1) ) ) - (func $f32x4.ge (; 63 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $f32x4.ge (; 63 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (f32x4.ge (local.get $0) (local.get $1) ) ) - (func $f64x2.eq (; 64 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $f64x2.eq (; 64 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (f64x2.eq (local.get $0) (local.get $1) ) ) - (func $f64x2.ne (; 65 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $f64x2.ne (; 65 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (f64x2.ne (local.get $0) (local.get $1) ) ) - (func $f64x2.lt (; 66 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $f64x2.lt (; 66 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (f64x2.lt (local.get $0) (local.get $1) ) ) - (func $f64x2.gt (; 67 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $f64x2.gt (; 67 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (f64x2.gt (local.get $0) (local.get $1) ) ) - (func $f64x2.le (; 68 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $f64x2.le (; 68 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (f64x2.le (local.get $0) (local.get $1) ) ) - (func $f64x2.ge (; 69 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $f64x2.ge (; 69 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (f64x2.ge (local.get $0) (local.get $1) ) ) - (func $v128.not (; 70 ;) (type $14) (param $0 v128) (result v128) + (func $v128.not (; 70 ;) (type $FUNCSIG$VV) (param $0 v128) (result v128) (v128.not (local.get $0) ) ) - (func $v128.and (; 71 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $v128.and (; 71 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (v128.and (local.get $0) (local.get $1) ) ) - (func $v128.or (; 72 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $v128.or (; 72 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (v128.or (local.get $0) (local.get $1) ) ) - (func $v128.xor (; 73 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $v128.xor (; 73 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (v128.xor (local.get $0) (local.get $1) ) ) - (func $v128.bitselect (; 74 ;) (type $15) (param $0 v128) (param $1 v128) (param $2 v128) (result v128) + (func $v128.bitselect (; 74 ;) (type $FUNCSIG$VVVV) (param $0 v128) (param $1 v128) (param $2 v128) (result v128) (v128.bitselect (local.get $0) (local.get $1) (local.get $2) ) ) - (func $i8x16.neg (; 75 ;) (type $14) (param $0 v128) (result v128) + (func $i8x16.neg (; 75 ;) (type $FUNCSIG$VV) (param $0 v128) (result v128) (i8x16.neg (local.get $0) ) ) - (func $i8x16.any_true (; 76 ;) (type $4) (param $0 v128) (result i32) + (func $i8x16.any_true (; 76 ;) (type $FUNCSIG$iV) (param $0 v128) (result i32) (i8x16.any_true (local.get $0) ) ) - (func $i8x16.all_true (; 77 ;) (type $4) (param $0 v128) (result i32) + (func $i8x16.all_true (; 77 ;) (type $FUNCSIG$iV) (param $0 v128) (result i32) (i8x16.all_true (local.get $0) ) ) - (func $i8x16.shl (; 78 ;) (type $5) (param $0 v128) (param $1 i32) (result v128) + (func $i8x16.shl (; 78 ;) (type $FUNCSIG$VVi) (param $0 v128) (param $1 i32) (result v128) (i8x16.shl (local.get $0) (local.get $1) ) ) - (func $i8x16.shr_s (; 79 ;) (type $5) (param $0 v128) (param $1 i32) (result v128) + (func $i8x16.shr_s (; 79 ;) (type $FUNCSIG$VVi) (param $0 v128) (param $1 i32) (result v128) (i8x16.shr_s (local.get $0) (local.get $1) ) ) - (func $i8x16.shr_u (; 80 ;) (type $5) (param $0 v128) (param $1 i32) (result v128) + (func $i8x16.shr_u (; 80 ;) (type $FUNCSIG$VVi) (param $0 v128) (param $1 i32) (result v128) (i8x16.shr_u (local.get $0) (local.get $1) ) ) - (func $i8x16.add (; 81 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $i8x16.add (; 81 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (i8x16.add (local.get $0) (local.get $1) ) ) - (func $i8x16.add_saturate_s (; 82 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $i8x16.add_saturate_s (; 82 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (i8x16.add_saturate_s (local.get $0) (local.get $1) ) ) - (func $i8x16.add_saturate_u (; 83 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $i8x16.add_saturate_u (; 83 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (i8x16.add_saturate_u (local.get $0) (local.get $1) ) ) - (func $i8x16.sub (; 84 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $i8x16.sub (; 84 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (i8x16.sub (local.get $0) (local.get $1) ) ) - (func $i8x16.sub_saturate_s (; 85 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $i8x16.sub_saturate_s (; 85 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (i8x16.sub_saturate_s (local.get $0) (local.get $1) ) ) - (func $i8x16.sub_saturate_u (; 86 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $i8x16.sub_saturate_u (; 86 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (i8x16.sub_saturate_u (local.get $0) (local.get $1) ) ) - (func $i8x16.mul (; 87 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $i8x16.mul (; 87 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (i8x16.mul (local.get $0) (local.get $1) ) ) - (func $i16x8.neg (; 88 ;) (type $14) (param $0 v128) (result v128) + (func $i16x8.neg (; 88 ;) (type $FUNCSIG$VV) (param $0 v128) (result v128) (i16x8.neg (local.get $0) ) ) - (func $i16x8.any_true (; 89 ;) (type $4) (param $0 v128) (result i32) + (func $i16x8.any_true (; 89 ;) (type $FUNCSIG$iV) (param $0 v128) (result i32) (i16x8.any_true (local.get $0) ) ) - (func $i16x8.all_true (; 90 ;) (type $4) (param $0 v128) (result i32) + (func $i16x8.all_true (; 90 ;) (type $FUNCSIG$iV) (param $0 v128) (result i32) (i16x8.all_true (local.get $0) ) ) - (func $i16x8.shl (; 91 ;) (type $5) (param $0 v128) (param $1 i32) (result v128) + (func $i16x8.shl (; 91 ;) (type $FUNCSIG$VVi) (param $0 v128) (param $1 i32) (result v128) (i16x8.shl (local.get $0) (local.get $1) ) ) - (func $i16x8.shr_s (; 92 ;) (type $5) (param $0 v128) (param $1 i32) (result v128) + (func $i16x8.shr_s (; 92 ;) (type $FUNCSIG$VVi) (param $0 v128) (param $1 i32) (result v128) (i16x8.shr_s (local.get $0) (local.get $1) ) ) - (func $i16x8.shr_u (; 93 ;) (type $5) (param $0 v128) (param $1 i32) (result v128) + (func $i16x8.shr_u (; 93 ;) (type $FUNCSIG$VVi) (param $0 v128) (param $1 i32) (result v128) (i16x8.shr_u (local.get $0) (local.get $1) ) ) - (func $i16x8.add (; 94 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $i16x8.add (; 94 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (i16x8.add (local.get $0) (local.get $1) ) ) - (func $i16x8.add_saturate_s (; 95 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $i16x8.add_saturate_s (; 95 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (i16x8.add_saturate_s (local.get $0) (local.get $1) ) ) - (func $i16x8.add_saturate_u (; 96 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $i16x8.add_saturate_u (; 96 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (i16x8.add_saturate_u (local.get $0) (local.get $1) ) ) - (func $i16x8.sub (; 97 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $i16x8.sub (; 97 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (i16x8.sub (local.get $0) (local.get $1) ) ) - (func $i16x8.sub_saturate_s (; 98 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $i16x8.sub_saturate_s (; 98 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (i16x8.sub_saturate_s (local.get $0) (local.get $1) ) ) - (func $i16x8.sub_saturate_u (; 99 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $i16x8.sub_saturate_u (; 99 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (i16x8.sub_saturate_u (local.get $0) (local.get $1) ) ) - (func $i16x8.mul (; 100 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $i16x8.mul (; 100 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (i16x8.mul (local.get $0) (local.get $1) ) ) - (func $i32x4.neg (; 101 ;) (type $14) (param $0 v128) (result v128) + (func $i32x4.neg (; 101 ;) (type $FUNCSIG$VV) (param $0 v128) (result v128) (i32x4.neg (local.get $0) ) ) - (func $i32x4.any_true (; 102 ;) (type $4) (param $0 v128) (result i32) + (func $i32x4.any_true (; 102 ;) (type $FUNCSIG$iV) (param $0 v128) (result i32) (i32x4.any_true (local.get $0) ) ) - (func $i32x4.all_true (; 103 ;) (type $4) (param $0 v128) (result i32) + (func $i32x4.all_true (; 103 ;) (type $FUNCSIG$iV) (param $0 v128) (result i32) (i32x4.all_true (local.get $0) ) ) - (func $i32x4.shl (; 104 ;) (type $5) (param $0 v128) (param $1 i32) (result v128) + (func $i32x4.shl (; 104 ;) (type $FUNCSIG$VVi) (param $0 v128) (param $1 i32) (result v128) (i32x4.shl (local.get $0) (local.get $1) ) ) - (func $i32x4.shr_s (; 105 ;) (type $5) (param $0 v128) (param $1 i32) (result v128) + (func $i32x4.shr_s (; 105 ;) (type $FUNCSIG$VVi) (param $0 v128) (param $1 i32) (result v128) (i32x4.shr_s (local.get $0) (local.get $1) ) ) - (func $i32x4.shr_u (; 106 ;) (type $5) (param $0 v128) (param $1 i32) (result v128) + (func $i32x4.shr_u (; 106 ;) (type $FUNCSIG$VVi) (param $0 v128) (param $1 i32) (result v128) (i32x4.shr_u (local.get $0) (local.get $1) ) ) - (func $i32x4.add (; 107 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $i32x4.add (; 107 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (i32x4.add (local.get $0) (local.get $1) ) ) - (func $i32x4.sub (; 108 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $i32x4.sub (; 108 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (i32x4.sub (local.get $0) (local.get $1) ) ) - (func $i32x4.mul (; 109 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $i32x4.mul (; 109 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (i32x4.mul (local.get $0) (local.get $1) ) ) - (func $i64x2.neg (; 110 ;) (type $14) (param $0 v128) (result v128) + (func $i64x2.neg (; 110 ;) (type $FUNCSIG$VV) (param $0 v128) (result v128) (i64x2.neg (local.get $0) ) ) - (func $i64x2.any_true (; 111 ;) (type $4) (param $0 v128) (result i32) + (func $i64x2.any_true (; 111 ;) (type $FUNCSIG$iV) (param $0 v128) (result i32) (i64x2.any_true (local.get $0) ) ) - (func $i64x2.all_true (; 112 ;) (type $4) (param $0 v128) (result i32) + (func $i64x2.all_true (; 112 ;) (type $FUNCSIG$iV) (param $0 v128) (result i32) (i64x2.all_true (local.get $0) ) ) - (func $i64x2.shl (; 113 ;) (type $5) (param $0 v128) (param $1 i32) (result v128) + (func $i64x2.shl (; 113 ;) (type $FUNCSIG$VVi) (param $0 v128) (param $1 i32) (result v128) (i64x2.shl (local.get $0) (local.get $1) ) ) - (func $i64x2.shr_s (; 114 ;) (type $5) (param $0 v128) (param $1 i32) (result v128) + (func $i64x2.shr_s (; 114 ;) (type $FUNCSIG$VVi) (param $0 v128) (param $1 i32) (result v128) (i64x2.shr_s (local.get $0) (local.get $1) ) ) - (func $i64x2.shr_u (; 115 ;) (type $5) (param $0 v128) (param $1 i32) (result v128) + (func $i64x2.shr_u (; 115 ;) (type $FUNCSIG$VVi) (param $0 v128) (param $1 i32) (result v128) (i64x2.shr_u (local.get $0) (local.get $1) ) ) - (func $i64x2.add (; 116 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $i64x2.add (; 116 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (i64x2.add (local.get $0) (local.get $1) ) ) - (func $i64x2.sub (; 117 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $i64x2.sub (; 117 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (i64x2.sub (local.get $0) (local.get $1) ) ) - (func $f32x4.add (; 118 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $f32x4.add (; 118 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (f32x4.add (local.get $0) (local.get $1) ) ) - (func $f32x4.sub (; 119 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $f32x4.sub (; 119 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (f32x4.sub (local.get $0) (local.get $1) ) ) - (func $f32x4.mul (; 120 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $f32x4.mul (; 120 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (f32x4.mul (local.get $0) (local.get $1) ) ) - (func $f32x4.div (; 121 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $f32x4.div (; 121 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (f32x4.div (local.get $0) (local.get $1) ) ) - (func $f32x4.min (; 122 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $f32x4.min (; 122 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (f32x4.min (local.get $0) (local.get $1) ) ) - (func $f32x4.max (; 123 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $f32x4.max (; 123 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (f32x4.max (local.get $0) (local.get $1) ) ) - (func $f32x4.abs (; 124 ;) (type $14) (param $0 v128) (result v128) + (func $f32x4.abs (; 124 ;) (type $FUNCSIG$VV) (param $0 v128) (result v128) (f32x4.abs (local.get $0) ) ) - (func $f32x4.neg (; 125 ;) (type $14) (param $0 v128) (result v128) + (func $f32x4.neg (; 125 ;) (type $FUNCSIG$VV) (param $0 v128) (result v128) (f32x4.neg (local.get $0) ) ) - (func $f32x4.sqrt (; 126 ;) (type $14) (param $0 v128) (result v128) + (func $f32x4.sqrt (; 126 ;) (type $FUNCSIG$VV) (param $0 v128) (result v128) (f32x4.sqrt (local.get $0) ) ) - (func $f64x2.add (; 127 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $f64x2.add (; 127 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (f64x2.add (local.get $0) (local.get $1) ) ) - (func $f64x2.sub (; 128 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $f64x2.sub (; 128 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (f64x2.sub (local.get $0) (local.get $1) ) ) - (func $f64x2.mul (; 129 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $f64x2.mul (; 129 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (f64x2.mul (local.get $0) (local.get $1) ) ) - (func $f64x2.div (; 130 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $f64x2.div (; 130 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (f64x2.div (local.get $0) (local.get $1) ) ) - (func $f64x2.min (; 131 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $f64x2.min (; 131 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (f64x2.min (local.get $0) (local.get $1) ) ) - (func $f64x2.max (; 132 ;) (type $3) (param $0 v128) (param $1 v128) (result v128) + (func $f64x2.max (; 132 ;) (type $FUNCSIG$VVV) (param $0 v128) (param $1 v128) (result v128) (f64x2.max (local.get $0) (local.get $1) ) ) - (func $f64x2.abs (; 133 ;) (type $14) (param $0 v128) (result v128) + (func $f64x2.abs (; 133 ;) (type $FUNCSIG$VV) (param $0 v128) (result v128) (f64x2.abs (local.get $0) ) ) - (func $f64x2.neg (; 134 ;) (type $14) (param $0 v128) (result v128) + (func $f64x2.neg (; 134 ;) (type $FUNCSIG$VV) (param $0 v128) (result v128) (f64x2.neg (local.get $0) ) ) - (func $f64x2.sqrt (; 135 ;) (type $14) (param $0 v128) (result v128) + (func $f64x2.sqrt (; 135 ;) (type $FUNCSIG$VV) (param $0 v128) (result v128) (f64x2.sqrt (local.get $0) ) ) - (func $i32x4.trunc_sat_f32x4_s (; 136 ;) (type $14) (param $0 v128) (result v128) + (func $i32x4.trunc_sat_f32x4_s (; 136 ;) (type $FUNCSIG$VV) (param $0 v128) (result v128) (i32x4.trunc_sat_f32x4_s (local.get $0) ) ) - (func $i32x4.trunc_sat_f32x4_u (; 137 ;) (type $14) (param $0 v128) (result v128) + (func $i32x4.trunc_sat_f32x4_u (; 137 ;) (type $FUNCSIG$VV) (param $0 v128) (result v128) (i32x4.trunc_sat_f32x4_u (local.get $0) ) ) - (func $i64x2.trunc_sat_f64x2_s (; 138 ;) (type $14) (param $0 v128) (result v128) + (func $i64x2.trunc_sat_f64x2_s (; 138 ;) (type $FUNCSIG$VV) (param $0 v128) (result v128) (i64x2.trunc_sat_f64x2_s (local.get $0) ) ) - (func $i64x2.trunc_sat_f64x2_u (; 139 ;) (type $14) (param $0 v128) (result v128) + (func $i64x2.trunc_sat_f64x2_u (; 139 ;) (type $FUNCSIG$VV) (param $0 v128) (result v128) (i64x2.trunc_sat_f64x2_u (local.get $0) ) ) - (func $f32x4.convert_i32x4_s (; 140 ;) (type $14) (param $0 v128) (result v128) + (func $f32x4.convert_i32x4_s (; 140 ;) (type $FUNCSIG$VV) (param $0 v128) (result v128) (f32x4.convert_i32x4_s (local.get $0) ) ) - (func $f32x4.convert_i32x4_u (; 141 ;) (type $14) (param $0 v128) (result v128) + (func $f32x4.convert_i32x4_u (; 141 ;) (type $FUNCSIG$VV) (param $0 v128) (result v128) (f32x4.convert_i32x4_u (local.get $0) ) ) - (func $f64x2.convert_i64x2_s (; 142 ;) (type $14) (param $0 v128) (result v128) + (func $f64x2.convert_i64x2_s (; 142 ;) (type $FUNCSIG$VV) (param $0 v128) (result v128) (f64x2.convert_i64x2_s (local.get $0) ) ) - (func $f64x2.convert_i64x2_u (; 143 ;) (type $14) (param $0 v128) (result v128) + (func $f64x2.convert_i64x2_u (; 143 ;) (type $FUNCSIG$VV) (param $0 v128) (result v128) (f64x2.convert_i64x2_u (local.get $0) ) diff --git a/test/unreachable-code.wast.from-wast b/test/unreachable-code.wast.from-wast index 01c041dce..40cf52db6 100644 --- a/test/unreachable-code.wast.from-wast +++ b/test/unreachable-code.wast.from-wast @@ -1,19 +1,19 @@ (module - (type $0 (func)) - (func $a (; 0 ;) (type $0) + (type $FUNCSIG$v (func)) + (func $a (; 0 ;) (type $FUNCSIG$v) (if (i32.const 1) (unreachable) ) ) - (func $b (; 1 ;) (type $0) + (func $b (; 1 ;) (type $FUNCSIG$v) (if (i32.const 1) (unreachable) (unreachable) ) ) - (func $a-block (; 2 ;) (type $0) + (func $a-block (; 2 ;) (type $FUNCSIG$v) (block $block (if (i32.const 1) @@ -21,7 +21,7 @@ ) ) ) - (func $b-block (; 3 ;) (type $0) + (func $b-block (; 3 ;) (type $FUNCSIG$v) (block $block (if (i32.const 1) @@ -30,7 +30,7 @@ ) ) ) - (func $a-prepost (; 4 ;) (type $0) + (func $a-prepost (; 4 ;) (type $FUNCSIG$v) (nop) (if (i32.const 1) @@ -38,7 +38,7 @@ ) (nop) ) - (func $b-prepost (; 5 ;) (type $0) + (func $b-prepost (; 5 ;) (type $FUNCSIG$v) (nop) (if (i32.const 1) @@ -47,7 +47,7 @@ ) (nop) ) - (func $a-block-prepost (; 6 ;) (type $0) + (func $a-block-prepost (; 6 ;) (type $FUNCSIG$v) (nop) (block $block (if @@ -57,7 +57,7 @@ ) (nop) ) - (func $b-block-prepost (; 7 ;) (type $0) + (func $b-block-prepost (; 7 ;) (type $FUNCSIG$v) (nop) (block $block (if @@ -68,7 +68,7 @@ ) (nop) ) - (func $recurse (; 8 ;) (type $0) + (func $recurse (; 8 ;) (type $FUNCSIG$v) (block $a (nop) (block $b @@ -79,7 +79,7 @@ (nop) ) ) - (func $recurse-b (; 9 ;) (type $0) + (func $recurse-b (; 9 ;) (type $FUNCSIG$v) (block $a (nop) (block $b diff --git a/test/untaken-br_if.wast.from-wast b/test/untaken-br_if.wast.from-wast index 28482aff4..a6e664e9c 100644 --- a/test/untaken-br_if.wast.from-wast +++ b/test/untaken-br_if.wast.from-wast @@ -1,6 +1,6 @@ (module - (type $0 (func (result f32))) - (func $binaryify-untaken-br_if (; 0 ;) (type $0) (result f32) + (type $FUNCSIG$f (func (result f32))) + (func $binaryify-untaken-br_if (; 0 ;) (type $FUNCSIG$f) (result f32) (if (result f32) (i32.const 1) (unreachable) |