summaryrefslogtreecommitdiff
path: root/test/lit/ctor-eval
diff options
context:
space:
mode:
Diffstat (limited to 'test/lit/ctor-eval')
-rw-r--r--test/lit/ctor-eval/array_new_data.wast4
-rw-r--r--test/lit/ctor-eval/ctor_after_serialization.wat16
-rw-r--r--test/lit/ctor-eval/data_drop.wast4
-rw-r--r--test/lit/ctor-eval/extern.wast10
-rw-r--r--test/lit/ctor-eval/gc-cycle-multi.wast14
-rw-r--r--test/lit/ctor-eval/gc-cycle.wast140
-rw-r--r--test/lit/ctor-eval/high_memory.wast6
-rw-r--r--test/lit/ctor-eval/multivalue-local.wast8
-rw-r--r--test/lit/ctor-eval/partial-global.wat4
-rw-r--r--test/lit/ctor-eval/v128.wast8
10 files changed, 107 insertions, 107 deletions
diff --git a/test/lit/ctor-eval/array_new_data.wast b/test/lit/ctor-eval/array_new_data.wast
index 3dca60207..248b71ba4 100644
--- a/test/lit/ctor-eval/array_new_data.wast
+++ b/test/lit/ctor-eval/array_new_data.wast
@@ -2,7 +2,7 @@
;; RUN: wasm-ctor-eval %s --ctors=test --kept-exports=test --quiet -all -S -o - | filecheck %s
(module
- ;; CHECK: (type $none_=>_none (func))
+ ;; CHECK: (type $0 (func))
;; CHECK: (type $[i8] (array i8))
(type $[i8] (array i8))
@@ -28,7 +28,7 @@
)
;; CHECK: (export "test" (func $0))
-;; CHECK: (func $0 (type $none_=>_none)
+;; CHECK: (func $0 (type $0)
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (array.new_data $[i8] $1
;; CHECK-NEXT: (i32.const 16)
diff --git a/test/lit/ctor-eval/ctor_after_serialization.wat b/test/lit/ctor-eval/ctor_after_serialization.wat
index 46a599002..45e811804 100644
--- a/test/lit/ctor-eval/ctor_after_serialization.wat
+++ b/test/lit/ctor-eval/ctor_after_serialization.wat
@@ -10,9 +10,9 @@
;; CHECK: (type $A (struct ))
(type $A (struct))
- ;; CHECK: (type $none_=>_ref|any| (func (result (ref any))))
+ ;; CHECK: (type $1 (func (result (ref any))))
- ;; CHECK: (type $none_=>_none (func))
+ ;; CHECK: (type $2 (func))
;; CHECK: (global $ctor-eval$global (ref $A) (struct.new_default $A))
@@ -30,11 +30,11 @@
)
)
-;; CHECK: (func $new_2 (type $none_=>_ref|any|) (result (ref any))
+;; CHECK: (func $new_2 (type $1) (result (ref any))
;; CHECK-NEXT: (global.get $ctor-eval$global)
;; CHECK-NEXT: )
-;; CHECK: (func $nop_3 (type $none_=>_none)
+;; CHECK: (func $nop_3 (type $2)
;; CHECK-NEXT: (nop)
;; CHECK-NEXT: )
(module
@@ -44,9 +44,9 @@
;; CHECK: (type $A (struct ))
(type $A (struct))
- ;; CHECK: (type $none_=>_ref|any| (func (result (ref any))))
+ ;; CHECK: (type $1 (func (result (ref any))))
- ;; CHECK: (type $none_=>_anyref (func (result anyref)))
+ ;; CHECK: (type $2 (func (result anyref)))
;; CHECK: (global $ctor-eval$global (ref $A) (struct.new_default $A))
(global $ctor-eval$global (ref $A)
@@ -69,10 +69,10 @@
(global.get $ctor-eval$global)
)
)
-;; CHECK: (func $new_2 (type $none_=>_ref|any|) (result (ref any))
+;; CHECK: (func $new_2 (type $1) (result (ref any))
;; CHECK-NEXT: (global.get $ctor-eval$global_1)
;; CHECK-NEXT: )
-;; CHECK: (func $nop_3 (type $none_=>_anyref) (result anyref)
+;; CHECK: (func $nop_3 (type $2) (result anyref)
;; CHECK-NEXT: (global.get $ctor-eval$global)
;; CHECK-NEXT: )
diff --git a/test/lit/ctor-eval/data_drop.wast b/test/lit/ctor-eval/data_drop.wast
index 4a1fcae1a..c1bfd487c 100644
--- a/test/lit/ctor-eval/data_drop.wast
+++ b/test/lit/ctor-eval/data_drop.wast
@@ -2,7 +2,7 @@
;; RUN: wasm-ctor-eval %s --ctors=test --kept-exports=test --quiet -all -S -o - | filecheck %s
(module
- ;; CHECK: (type $none_=>_none (func))
+ ;; CHECK: (type $0 (func))
;; CHECK: (memory $0 1)
(memory $0 1)
@@ -29,7 +29,7 @@
;; CHECK: (export "test" (func $0))
-;; CHECK: (func $0 (type $none_=>_none)
+;; CHECK: (func $0 (type $0)
;; CHECK-NEXT: (i32.store8
;; CHECK-NEXT: (i32.const 4)
;; CHECK-NEXT: (i32.const 100)
diff --git a/test/lit/ctor-eval/extern.wast b/test/lit/ctor-eval/extern.wast
index 2607e13c9..b279b718e 100644
--- a/test/lit/ctor-eval/extern.wast
+++ b/test/lit/ctor-eval/extern.wast
@@ -8,9 +8,9 @@
;; CHECK: (type $struct (struct (field externref)))
(type $struct (struct (field externref)))
- ;; CHECK: (type $none_=>_externref (func (result externref)))
+ ;; CHECK: (type $2 (func (result externref)))
- ;; CHECK: (type $none_=>_anyref (func (result anyref)))
+ ;; CHECK: (type $3 (func (result anyref)))
;; CHECK: (global $ctor-eval$global (ref $array) (array.new_fixed $array 3
;; CHECK-NEXT: (i32.const 1)
@@ -70,7 +70,7 @@
)
)
-;; CHECK: (func $test1_3 (type $none_=>_externref) (result externref)
+;; CHECK: (func $test1_3 (type $2) (result externref)
;; CHECK-NEXT: (extern.externalize
;; CHECK-NEXT: (i31.new
;; CHECK-NEXT: (i32.const 42)
@@ -78,12 +78,12 @@
;; CHECK-NEXT: )
;; CHECK-NEXT: )
-;; CHECK: (func $test2_4 (type $none_=>_externref) (result externref)
+;; CHECK: (func $test2_4 (type $2) (result externref)
;; CHECK-NEXT: (extern.externalize
;; CHECK-NEXT: (global.get $ctor-eval$global)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
-;; CHECK: (func $test3_5 (type $none_=>_anyref) (result anyref)
+;; CHECK: (func $test3_5 (type $3) (result anyref)
;; CHECK-NEXT: (global.get $ctor-eval$global_1)
;; CHECK-NEXT: )
diff --git a/test/lit/ctor-eval/gc-cycle-multi.wast b/test/lit/ctor-eval/gc-cycle-multi.wast
index 62a888dbd..705b76f2f 100644
--- a/test/lit/ctor-eval/gc-cycle-multi.wast
+++ b/test/lit/ctor-eval/gc-cycle-multi.wast
@@ -9,9 +9,9 @@
;; CHECK: (type $A (struct (field (mut (ref null $A))) (field i32)))
(type $A (struct (field (mut (ref null $A))) (field i32)))
- ;; CHECK: (type $none_=>_none (func))
+ ;; CHECK: (type $1 (func))
- ;; CHECK: (type $none_=>_i32 (func (result i32)))
+ ;; CHECK: (type $2 (func (result i32)))
;; CHECK: (global $ctor-eval$global_8 (ref $A) (struct.new $A
;; CHECK-NEXT: (ref.null none)
@@ -85,7 +85,7 @@
;; CHECK: (start $start)
- ;; CHECK: (func $keepalive (type $none_=>_i32) (result i32)
+ ;; CHECK: (func $keepalive (type $2) (result i32)
;; CHECK-NEXT: (i32.add
;; CHECK-NEXT: (struct.get $A 1
;; CHECK-NEXT: (global.get $a)
@@ -116,7 +116,7 @@
)
)
)
-;; CHECK: (func $start (type $none_=>_none)
+;; CHECK: (func $start (type $1)
;; CHECK-NEXT: (struct.set $A 0
;; CHECK-NEXT: (global.get $ctor-eval$global_8)
;; CHECK-NEXT: (global.get $ctor-eval$global_8)
@@ -131,14 +131,14 @@
;; CHECK-NEXT: )
;; CHECK-NEXT: )
-;; CHECK: (func $test1_6 (type $none_=>_none)
+;; CHECK: (func $test1_6 (type $1)
;; CHECK-NEXT: (nop)
;; CHECK-NEXT: )
-;; CHECK: (func $test2_7 (type $none_=>_none)
+;; CHECK: (func $test2_7 (type $1)
;; CHECK-NEXT: (nop)
;; CHECK-NEXT: )
-;; CHECK: (func $test3_8 (type $none_=>_none)
+;; CHECK: (func $test3_8 (type $1)
;; CHECK-NEXT: (nop)
;; CHECK-NEXT: )
diff --git a/test/lit/ctor-eval/gc-cycle.wast b/test/lit/ctor-eval/gc-cycle.wast
index e9c69a2fc..36333a8bd 100644
--- a/test/lit/ctor-eval/gc-cycle.wast
+++ b/test/lit/ctor-eval/gc-cycle.wast
@@ -5,9 +5,9 @@
;; CHECK: (type $A (struct (field (mut (ref null $A))) (field i32)))
(type $A (struct (field (mut (ref null $A))) (field i32)))
- ;; CHECK: (type $none_=>_none (func))
+ ;; CHECK: (type $1 (func))
- ;; CHECK: (type $none_=>_i32 (func (result i32)))
+ ;; CHECK: (type $2 (func (result i32)))
;; CHECK: (global $ctor-eval$global_3 (ref $A) (struct.new $A
;; CHECK-NEXT: (ref.null none)
@@ -42,7 +42,7 @@
;; CHECK: (start $start)
- ;; CHECK: (func $keepalive (type $none_=>_i32) (result i32)
+ ;; CHECK: (func $keepalive (type $2) (result i32)
;; CHECK-NEXT: (struct.get $A 1
;; CHECK-NEXT: (struct.get $A 0
;; CHECK-NEXT: (global.get $a)
@@ -62,14 +62,14 @@
)
)
-;; CHECK: (func $start (type $none_=>_none)
+;; CHECK: (func $start (type $1)
;; CHECK-NEXT: (struct.set $A 0
;; CHECK-NEXT: (global.get $ctor-eval$global_3)
;; CHECK-NEXT: (global.get $ctor-eval$global_3)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
-;; CHECK: (func $test_3 (type $none_=>_none)
+;; CHECK: (func $test_3 (type $1)
;; CHECK-NEXT: (local $a (ref $A))
;; CHECK-NEXT: (nop)
;; CHECK-NEXT: )
@@ -80,9 +80,9 @@
;; CHECK: (type $A (struct (field i32) (field (mut (ref null $A)))))
(type $A (struct (field i32) (field (mut (ref null $A)))))
- ;; CHECK: (type $none_=>_none (func))
+ ;; CHECK: (type $1 (func))
- ;; CHECK: (type $none_=>_i32 (func (result i32)))
+ ;; CHECK: (type $2 (func (result i32)))
;; CHECK: (global $ctor-eval$global_3 (ref $A) (struct.new $A
;; CHECK-NEXT: (i32.const 42)
@@ -114,7 +114,7 @@
;; CHECK: (start $start)
- ;; CHECK: (func $keepalive (type $none_=>_i32) (result i32)
+ ;; CHECK: (func $keepalive (type $2) (result i32)
;; CHECK-NEXT: (struct.get $A 0
;; CHECK-NEXT: (struct.get $A 1
;; CHECK-NEXT: (global.get $a)
@@ -130,14 +130,14 @@
)
)
-;; CHECK: (func $start (type $none_=>_none)
+;; CHECK: (func $start (type $1)
;; CHECK-NEXT: (struct.set $A 1
;; CHECK-NEXT: (global.get $ctor-eval$global_3)
;; CHECK-NEXT: (global.get $ctor-eval$global_3)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
-;; CHECK: (func $test_3 (type $none_=>_none)
+;; CHECK: (func $test_3 (type $1)
;; CHECK-NEXT: (local $a (ref $A))
;; CHECK-NEXT: (nop)
;; CHECK-NEXT: )
@@ -147,9 +147,9 @@
;; CHECK: (type $A (struct (field (mut (ref null $A))) (field i32)))
(type $A (struct (field (mut (ref null $A))) (field i32)))
- ;; CHECK: (type $none_=>_none (func))
+ ;; CHECK: (type $1 (func))
- ;; CHECK: (type $none_=>_i32 (func (result i32)))
+ ;; CHECK: (type $2 (func (result i32)))
;; CHECK: (global $ctor-eval$global_8 (ref $A) (struct.new $A
;; CHECK-NEXT: (ref.null none)
@@ -199,7 +199,7 @@
;; CHECK: (start $start)
- ;; CHECK: (func $keepalive (type $none_=>_i32) (result i32)
+ ;; CHECK: (func $keepalive (type $2) (result i32)
;; CHECK-NEXT: (i32.add
;; CHECK-NEXT: (struct.get $A 1
;; CHECK-NEXT: (global.get $a)
@@ -221,14 +221,14 @@
)
)
-;; CHECK: (func $start (type $none_=>_none)
+;; CHECK: (func $start (type $1)
;; CHECK-NEXT: (struct.set $A 0
;; CHECK-NEXT: (global.get $ctor-eval$global_8)
;; CHECK-NEXT: (global.get $ctor-eval$global_7)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
-;; CHECK: (func $test_3 (type $none_=>_none)
+;; CHECK: (func $test_3 (type $1)
;; CHECK-NEXT: (local $a (ref $A))
;; CHECK-NEXT: (local $b (ref $A))
;; CHECK-NEXT: (nop)
@@ -246,9 +246,9 @@
(type $B (struct (field (ref null $A)) (field i32)))
)
- ;; CHECK: (type $none_=>_none (func))
+ ;; CHECK: (type $2 (func))
- ;; CHECK: (type $none_=>_i32 (func (result i32)))
+ ;; CHECK: (type $3 (func (result i32)))
;; CHECK: (global $ctor-eval$global_8 (ref $A) (struct.new $A
;; CHECK-NEXT: (ref.null none)
@@ -297,7 +297,7 @@
;; CHECK: (start $start)
- ;; CHECK: (func $keepalive (type $none_=>_i32) (result i32)
+ ;; CHECK: (func $keepalive (type $3) (result i32)
;; CHECK-NEXT: (i32.add
;; CHECK-NEXT: (struct.get $A 1
;; CHECK-NEXT: (global.get $a)
@@ -319,14 +319,14 @@
)
)
-;; CHECK: (func $start (type $none_=>_none)
+;; CHECK: (func $start (type $2)
;; CHECK-NEXT: (struct.set $A 0
;; CHECK-NEXT: (global.get $ctor-eval$global_8)
;; CHECK-NEXT: (global.get $ctor-eval$global_7)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
-;; CHECK: (func $test_3 (type $none_=>_none)
+;; CHECK: (func $test_3 (type $2)
;; CHECK-NEXT: (local $a (ref $A))
;; CHECK-NEXT: (local $b (ref $B))
;; CHECK-NEXT: (nop)
@@ -344,9 +344,9 @@
)
- ;; CHECK: (type $none_=>_none (func))
+ ;; CHECK: (type $2 (func))
- ;; CHECK: (type $none_=>_i32 (func (result i32)))
+ ;; CHECK: (type $3 (func (result i32)))
;; CHECK: (global $ctor-eval$global_8 (ref $A) (struct.new $A
;; CHECK-NEXT: (ref.null none)
@@ -396,7 +396,7 @@
;; CHECK: (start $start)
- ;; CHECK: (func $keepalive (type $none_=>_i32) (result i32)
+ ;; CHECK: (func $keepalive (type $3) (result i32)
;; CHECK-NEXT: (i32.add
;; CHECK-NEXT: (struct.get $A 1
;; CHECK-NEXT: (global.get $a)
@@ -418,14 +418,14 @@
)
)
-;; CHECK: (func $start (type $none_=>_none)
+;; CHECK: (func $start (type $2)
;; CHECK-NEXT: (struct.set $A 0
;; CHECK-NEXT: (global.get $ctor-eval$global_8)
;; CHECK-NEXT: (global.get $ctor-eval$global_7)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
-;; CHECK: (func $test_3 (type $none_=>_none)
+;; CHECK: (func $test_3 (type $2)
;; CHECK-NEXT: (local $a (ref $A))
;; CHECK-NEXT: (local $b (ref $B))
;; CHECK-NEXT: (nop)
@@ -442,9 +442,9 @@
(type $B (struct (field (mut (ref $A))) (field i32)))
)
- ;; CHECK: (type $none_=>_none (func))
+ ;; CHECK: (type $2 (func))
- ;; CHECK: (type $none_=>_i32 (func (result i32)))
+ ;; CHECK: (type $3 (func (result i32)))
;; CHECK: (global $ctor-eval$global_8 (ref $A) (struct.new $A
;; CHECK-NEXT: (ref.null none)
@@ -492,7 +492,7 @@
;; CHECK: (start $start)
- ;; CHECK: (func $keepalive (type $none_=>_i32) (result i32)
+ ;; CHECK: (func $keepalive (type $3) (result i32)
;; CHECK-NEXT: (struct.get $A 1
;; CHECK-NEXT: (global.get $a)
;; CHECK-NEXT: )
@@ -504,14 +504,14 @@
)
)
-;; CHECK: (func $start (type $none_=>_none)
+;; CHECK: (func $start (type $2)
;; CHECK-NEXT: (struct.set $A 0
;; CHECK-NEXT: (global.get $ctor-eval$global_8)
;; CHECK-NEXT: (global.get $ctor-eval$global_7)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
-;; CHECK: (func $test_3 (type $none_=>_none)
+;; CHECK: (func $test_3 (type $2)
;; CHECK-NEXT: (local $a (ref $A))
;; CHECK-NEXT: (local $b (ref $B))
;; CHECK-NEXT: (nop)
@@ -532,9 +532,9 @@
(global $b (mut (ref null $B)) (ref.null $B))
- ;; CHECK: (type $none_=>_none (func))
+ ;; CHECK: (type $2 (func))
- ;; CHECK: (type $none_=>_i32 (func (result i32)))
+ ;; CHECK: (type $3 (func (result i32)))
;; CHECK: (global $ctor-eval$global_8 (ref $A) (struct.new $A
;; CHECK-NEXT: (ref.null none)
@@ -580,7 +580,7 @@
;; CHECK: (start $start)
- ;; CHECK: (func $keepalive (type $none_=>_i32) (result i32)
+ ;; CHECK: (func $keepalive (type $3) (result i32)
;; CHECK-NEXT: (struct.get $A 1
;; CHECK-NEXT: (global.get $a)
;; CHECK-NEXT: )
@@ -592,14 +592,14 @@
)
)
-;; CHECK: (func $start (type $none_=>_none)
+;; CHECK: (func $start (type $2)
;; CHECK-NEXT: (struct.set $A 0
;; CHECK-NEXT: (global.get $ctor-eval$global_8)
;; CHECK-NEXT: (global.get $ctor-eval$global_7)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
-;; CHECK: (func $test_3 (type $none_=>_none)
+;; CHECK: (func $test_3 (type $2)
;; CHECK-NEXT: (local $a (ref $A))
;; CHECK-NEXT: (local $b (ref $B))
;; CHECK-NEXT: (nop)
@@ -610,9 +610,9 @@
;; CHECK: (type $A (struct (field (mut (ref null $A))) (field i32)))
(type $A (struct (field (mut (ref null $A))) (field i32)))
- ;; CHECK: (type $none_=>_none (func))
+ ;; CHECK: (type $1 (func))
- ;; CHECK: (type $none_=>_i32 (func (result i32)))
+ ;; CHECK: (type $2 (func (result i32)))
;; CHECK: (global $ctor-eval$global_13 (ref $A) (struct.new $A
;; CHECK-NEXT: (ref.null none)
@@ -676,7 +676,7 @@
;; CHECK: (start $start)
- ;; CHECK: (func $keepalive (type $none_=>_i32) (result i32)
+ ;; CHECK: (func $keepalive (type $2) (result i32)
;; CHECK-NEXT: (struct.get $A 1
;; CHECK-NEXT: (global.get $a)
;; CHECK-NEXT: )
@@ -688,7 +688,7 @@
)
)
-;; CHECK: (func $start (type $none_=>_none)
+;; CHECK: (func $start (type $1)
;; CHECK-NEXT: (struct.set $A 0
;; CHECK-NEXT: (global.get $ctor-eval$global_13)
;; CHECK-NEXT: (global.get $ctor-eval$global_14)
@@ -699,7 +699,7 @@
;; CHECK-NEXT: )
;; CHECK-NEXT: )
-;; CHECK: (func $test_3 (type $none_=>_none)
+;; CHECK: (func $test_3 (type $1)
;; CHECK-NEXT: (local $a (ref $A))
;; CHECK-NEXT: (local $b (ref $A))
;; CHECK-NEXT: (local $c (ref $A))
@@ -725,9 +725,9 @@
(global $b (mut (ref null $B)) (ref.null $B))
- ;; CHECK: (type $none_=>_none (func))
+ ;; CHECK: (type $3 (func))
- ;; CHECK: (type $none_=>_i32 (func (result i32)))
+ ;; CHECK: (type $4 (func (result i32)))
;; CHECK: (global $ctor-eval$global_14 (ref $A) (struct.new $A
;; CHECK-NEXT: (ref.null none)
@@ -795,7 +795,7 @@
;; CHECK: (start $start)
- ;; CHECK: (func $keepalive (type $none_=>_i32) (result i32)
+ ;; CHECK: (func $keepalive (type $4) (result i32)
;; CHECK-NEXT: (struct.get $A 1
;; CHECK-NEXT: (global.get $a)
;; CHECK-NEXT: )
@@ -807,14 +807,14 @@
)
)
-;; CHECK: (func $start (type $none_=>_none)
+;; CHECK: (func $start (type $3)
;; CHECK-NEXT: (struct.set $A 0
;; CHECK-NEXT: (global.get $ctor-eval$global_14)
;; CHECK-NEXT: (global.get $ctor-eval$global_12)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
-;; CHECK: (func $test_3 (type $none_=>_none)
+;; CHECK: (func $test_3 (type $3)
;; CHECK-NEXT: (local $a (ref $A))
;; CHECK-NEXT: (local $b (ref $B))
;; CHECK-NEXT: (local $c (ref $C))
@@ -833,9 +833,9 @@
(type $C (array (mut (ref any))))
)
- ;; CHECK: (type $none_=>_none (func))
+ ;; CHECK: (type $3 (func))
- ;; CHECK: (type $none_=>_i32 (func (result i32)))
+ ;; CHECK: (type $4 (func (result i32)))
;; CHECK: (global $ctor-eval$global_14 (ref $A) (struct.new $A
;; CHECK-NEXT: (ref.null none)
@@ -907,7 +907,7 @@
;; CHECK: (start $start)
- ;; CHECK: (func $keepalive (type $none_=>_i32) (result i32)
+ ;; CHECK: (func $keepalive (type $4) (result i32)
;; CHECK-NEXT: (struct.get $A 1
;; CHECK-NEXT: (global.get $a)
;; CHECK-NEXT: )
@@ -919,14 +919,14 @@
)
)
-;; CHECK: (func $start (type $none_=>_none)
+;; CHECK: (func $start (type $3)
;; CHECK-NEXT: (struct.set $A 0
;; CHECK-NEXT: (global.get $ctor-eval$global_14)
;; CHECK-NEXT: (global.get $ctor-eval$global_12)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
-;; CHECK: (func $test_3 (type $none_=>_none)
+;; CHECK: (func $test_3 (type $3)
;; CHECK-NEXT: (local $a (ref $A))
;; CHECK-NEXT: (local $b (ref $B))
;; CHECK-NEXT: (local $c (ref $C))
@@ -944,9 +944,9 @@
(type $B (array (ref null $A)))
)
- ;; CHECK: (type $none_=>_none (func))
+ ;; CHECK: (type $2 (func))
- ;; CHECK: (type $none_=>_anyref (func (result anyref)))
+ ;; CHECK: (type $3 (func (result anyref)))
;; CHECK: (global $ctor-eval$global_16 (ref $A) (struct.new $A
;; CHECK-NEXT: (ref.null none)
@@ -1014,7 +1014,7 @@
;; CHECK: (start $start)
- ;; CHECK: (func $keepalive (type $none_=>_anyref) (result anyref)
+ ;; CHECK: (func $keepalive (type $3) (result anyref)
;; CHECK-NEXT: (struct.get $A 1
;; CHECK-NEXT: (global.get $a)
;; CHECK-NEXT: )
@@ -1026,7 +1026,7 @@
)
)
-;; CHECK: (func $start (type $none_=>_none)
+;; CHECK: (func $start (type $2)
;; CHECK-NEXT: (struct.set $A 0
;; CHECK-NEXT: (global.get $ctor-eval$global_16)
;; CHECK-NEXT: (global.get $ctor-eval$global_17)
@@ -1041,7 +1041,7 @@
;; CHECK-NEXT: )
;; CHECK-NEXT: )
-;; CHECK: (func $test_3 (type $none_=>_none)
+;; CHECK: (func $test_3 (type $2)
;; CHECK-NEXT: (local $a (ref $A))
;; CHECK-NEXT: (nop)
;; CHECK-NEXT: )
@@ -1056,9 +1056,9 @@
(type $B (array (mut (ref null $A))))
)
- ;; CHECK: (type $none_=>_none (func))
+ ;; CHECK: (type $2 (func))
- ;; CHECK: (type $none_=>_anyref (func (result anyref)))
+ ;; CHECK: (type $3 (func (result anyref)))
;; CHECK: (global $ctor-eval$global_16 (ref $B) (array.new_fixed $B 3
;; CHECK-NEXT: (ref.null none)
@@ -1127,7 +1127,7 @@
;; CHECK: (start $start)
- ;; CHECK: (func $keepalive (type $none_=>_anyref) (result anyref)
+ ;; CHECK: (func $keepalive (type $3) (result anyref)
;; CHECK-NEXT: (struct.get $A 1
;; CHECK-NEXT: (global.get $a)
;; CHECK-NEXT: )
@@ -1139,7 +1139,7 @@
)
)
-;; CHECK: (func $start (type $none_=>_none)
+;; CHECK: (func $start (type $2)
;; CHECK-NEXT: (array.set $B
;; CHECK-NEXT: (global.get $ctor-eval$global_16)
;; CHECK-NEXT: (i32.const 0)
@@ -1157,7 +1157,7 @@
;; CHECK-NEXT: )
;; CHECK-NEXT: )
-;; CHECK: (func $test_3 (type $none_=>_none)
+;; CHECK: (func $test_3 (type $2)
;; CHECK-NEXT: (local $b (ref $B))
;; CHECK-NEXT: (nop)
;; CHECK-NEXT: )
@@ -1167,9 +1167,9 @@
;; CHECK: (type $A (struct (field (mut (ref null $A))) (field i32)))
(type $A (struct (field (mut (ref null $A))) (field i32)))
- ;; CHECK: (type $none_=>_none (func))
+ ;; CHECK: (type $1 (func))
- ;; CHECK: (type $none_=>_i32 (func (result i32)))
+ ;; CHECK: (type $2 (func (result i32)))
;; CHECK: (global $ctor-eval$global_4 (ref $A) (struct.new $A
;; CHECK-NEXT: (ref.null none)
@@ -1205,7 +1205,7 @@
)
)
- ;; CHECK: (func $keepalive (type $none_=>_i32) (result i32)
+ ;; CHECK: (func $keepalive (type $2) (result i32)
;; CHECK-NEXT: (i32.add
;; CHECK-NEXT: (struct.get $A 1
;; CHECK-NEXT: (global.get $a)
@@ -1226,7 +1226,7 @@
)
)
- ;; CHECK: (func $start (type $none_=>_none)
+ ;; CHECK: (func $start (type $1)
;; CHECK-NEXT: (struct.set $A 0
;; CHECK-NEXT: (global.get $ctor-eval$global_4)
;; CHECK-NEXT: (global.get $ctor-eval$global_4)
@@ -1242,7 +1242,7 @@
)
)
-;; CHECK: (func $test_3 (type $none_=>_none)
+;; CHECK: (func $test_3 (type $1)
;; CHECK-NEXT: (local $a (ref $A))
;; CHECK-NEXT: (nop)
;; CHECK-NEXT: )
@@ -1250,11 +1250,11 @@
;; CHECK: (type $A (struct (field (mut (ref null $A)))))
(type $A (struct (field (mut (ref null $A)))))
- ;; CHECK: (type $none_=>_none (func))
+ ;; CHECK: (type $1 (func))
- ;; CHECK: (type $anyref_=>_none (func (param anyref)))
+ ;; CHECK: (type $2 (func (param anyref)))
- ;; CHECK: (import "a" "b" (func $import (type $anyref_=>_none) (param anyref)))
+ ;; CHECK: (import "a" "b" (func $import (type $2) (param anyref)))
(import "a" "b" (func $import (param anyref)))
(func $test (export "test")
@@ -1283,14 +1283,14 @@
;; CHECK: (start $start)
-;; CHECK: (func $start (type $none_=>_none)
+;; CHECK: (func $start (type $1)
;; CHECK-NEXT: (struct.set $A 0
;; CHECK-NEXT: (global.get $ctor-eval$global)
;; CHECK-NEXT: (global.get $ctor-eval$global)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
-;; CHECK: (func $test_3 (type $none_=>_none)
+;; CHECK: (func $test_3 (type $1)
;; CHECK-NEXT: (call $import
;; CHECK-NEXT: (global.get $ctor-eval$global)
;; CHECK-NEXT: )
diff --git a/test/lit/ctor-eval/high_memory.wast b/test/lit/ctor-eval/high_memory.wast
index edcfe2446..86e3827f4 100644
--- a/test/lit/ctor-eval/high_memory.wast
+++ b/test/lit/ctor-eval/high_memory.wast
@@ -2,7 +2,7 @@
;; RUN: wasm-ctor-eval %s --ctors=test1,test2 --kept-exports=test1,test2 --quiet -all -S -o - | filecheck %s
(module
- ;; CHECK: (type $none_=>_none (func))
+ ;; CHECK: (type $0 (func))
;; CHECK: (memory $0 1616)
(memory $0 1616) ;; 101 MB
@@ -30,13 +30,13 @@
;; CHECK: (export "test2" (func $1))
-;; CHECK: (func $1 (type $none_=>_none)
+;; CHECK: (func $1 (type $0)
;; CHECK-NEXT: (i32.store8
;; CHECK-NEXT: (i32.const 104857600)
;; CHECK-NEXT: (i32.const 43)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
-;; CHECK: (func $0_2 (type $none_=>_none)
+;; CHECK: (func $0_2 (type $0)
;; CHECK-NEXT: (nop)
;; CHECK-NEXT: )
diff --git a/test/lit/ctor-eval/multivalue-local.wast b/test/lit/ctor-eval/multivalue-local.wast
index 5ae72afa2..f83d3ea86 100644
--- a/test/lit/ctor-eval/multivalue-local.wast
+++ b/test/lit/ctor-eval/multivalue-local.wast
@@ -2,11 +2,11 @@
;; RUN: wasm-ctor-eval %s --ctors=multivalue-local --quiet -all -S -o - | filecheck %s
(module
- ;; CHECK: (type $none_=>_none (func))
+ ;; CHECK: (type $0 (func))
- ;; CHECK: (type $none_=>_i32 (func (result i32)))
+ ;; CHECK: (type $1 (func (result i32)))
- ;; CHECK: (import "a" "b" (func $import (type $none_=>_none)))
+ ;; CHECK: (import "a" "b" (func $import (type $0)))
(import "a" "b" (func $import))
(func $multivalue-local (export "multivalue-local") (result i32)
@@ -43,7 +43,7 @@
)
;; CHECK: (export "multivalue-local" (func $multivalue-local_2))
-;; CHECK: (func $multivalue-local_2 (type $none_=>_i32) (result i32)
+;; CHECK: (func $multivalue-local_2 (type $1) (result i32)
;; CHECK-NEXT: (local $0 i32)
;; CHECK-NEXT: (local $1 (i32 i32))
;; CHECK-NEXT: (local.set $0
diff --git a/test/lit/ctor-eval/partial-global.wat b/test/lit/ctor-eval/partial-global.wat
index fdd196d02..42c4d03ee 100644
--- a/test/lit/ctor-eval/partial-global.wat
+++ b/test/lit/ctor-eval/partial-global.wat
@@ -2,7 +2,7 @@
;; RUN: wasm-ctor-eval %s --ctors=test --kept-exports=test --quiet -all -S -o - | filecheck %s
(module
- ;; CHECK: (type $none_=>_none (func))
+ ;; CHECK: (type $0 (func))
;; CHECK: (global $global (mut i32) (i32.const 0))
(global $global (mut i32) (i32.const 0))
@@ -31,7 +31,7 @@
;; CHECK: (export "test" (func $test_1))
-;; CHECK: (func $test_1 (type $none_=>_none)
+;; CHECK: (func $test_1 (type $0)
;; CHECK-NEXT: (global.set $global
;; CHECK-NEXT: (i32.const 999)
;; CHECK-NEXT: )
diff --git a/test/lit/ctor-eval/v128.wast b/test/lit/ctor-eval/v128.wast
index af194bc87..03a7bb9d8 100644
--- a/test/lit/ctor-eval/v128.wast
+++ b/test/lit/ctor-eval/v128.wast
@@ -2,9 +2,9 @@
;; RUN: wasm-ctor-eval %s --ctors=v128 --kept-exports=v128 --quiet -all -S -o - | filecheck %s
(module
- ;; CHECK: (type $i32_=>_i32 (func (param i32) (result i32)))
+ ;; CHECK: (type $0 (func (param i32) (result i32)))
- ;; CHECK: (type $none_=>_v128 (func (result v128)))
+ ;; CHECK: (type $1 (func (result v128)))
;; CHECK: (memory $0 (shared 16 17))
(memory $0 (shared 16 17))
@@ -26,7 +26,7 @@
)
)
- ;; CHECK: (func $keepalive (type $i32_=>_i32) (param $x i32) (result i32)
+ ;; CHECK: (func $keepalive (type $0) (param $x i32) (result i32)
;; CHECK-NEXT: (i32.load
;; CHECK-NEXT: (local.get $x)
;; CHECK-NEXT: )
@@ -38,6 +38,6 @@
)
)
)
-;; CHECK: (func $v128_2 (type $none_=>_v128) (result v128)
+;; CHECK: (func $v128_2 (type $1) (result v128)
;; CHECK-NEXT: (v128.const i32x4 0x4ec0ffe0 0xfe00008e 0x81120001 0x90fffd85)
;; CHECK-NEXT: )