summaryrefslogtreecommitdiff
path: root/test/lit/merge
diff options
context:
space:
mode:
Diffstat (limited to 'test/lit/merge')
-rw-r--r--test/lit/merge/chain.wat6
-rw-r--r--test/lit/merge/cycle.wat14
-rw-r--r--test/lit/merge/export_options.wat4
-rw-r--r--test/lit/merge/fusing.wat20
-rw-r--r--test/lit/merge/renamings.wat24
-rw-r--r--test/lit/merge/start.flip.wat6
-rw-r--r--test/lit/merge/start.wat6
-rw-r--r--test/lit/merge/start3.wat10
-rw-r--r--test/lit/merge/table_elem.wat6
9 files changed, 48 insertions, 48 deletions
diff --git a/test/lit/merge/chain.wat b/test/lit/merge/chain.wat
index f87914931..528b20d0e 100644
--- a/test/lit/merge/chain.wat
+++ b/test/lit/merge/chain.wat
@@ -7,7 +7,7 @@
(module
(func (export "f"))
)
-;; CHECK: (type $none_=>_none (func))
+;; CHECK: (type $0 (func))
;; CHECK: (export "f" (func $0))
@@ -15,10 +15,10 @@
;; CHECK: (export "h" (func $0_2))
-;; CHECK: (func $0 (type $none_=>_none)
+;; CHECK: (func $0 (type $0)
;; CHECK-NEXT: (nop)
;; CHECK-NEXT: )
-;; CHECK: (func $0_2 (type $none_=>_none)
+;; CHECK: (func $0_2 (type $0)
;; CHECK-NEXT: (call $0)
;; CHECK-NEXT: )
diff --git a/test/lit/merge/cycle.wat b/test/lit/merge/cycle.wat
index 9862b3355..c3c009e18 100644
--- a/test/lit/merge/cycle.wat
+++ b/test/lit/merge/cycle.wat
@@ -15,7 +15,7 @@
- ;; CHECK: (type $none_=>_none (func))
+ ;; CHECK: (type $0 (func))
;; CHECK: (export "forward" (func $forward))
@@ -29,7 +29,7 @@
;; CHECK: (export "reverse_5" (func $reverse_12))
- ;; CHECK: (func $forward (type $none_=>_none)
+ ;; CHECK: (func $forward (type $0)
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (i32.const 1)
;; CHECK-NEXT: )
@@ -42,7 +42,7 @@
(call $second.forward)
)
- ;; CHECK: (func $reverse (type $none_=>_none)
+ ;; CHECK: (func $reverse (type $0)
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (i32.const -1)
;; CHECK-NEXT: )
@@ -55,28 +55,28 @@
(call $third.reverse)
)
)
-;; CHECK: (func $forward_6 (type $none_=>_none)
+;; CHECK: (func $forward_6 (type $0)
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (i32.const 2)
;; CHECK-NEXT: )
;; CHECK-NEXT: (call $forward_12)
;; CHECK-NEXT: )
-;; CHECK: (func $reverse_6 (type $none_=>_none)
+;; CHECK: (func $reverse_6 (type $0)
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (i32.const -2)
;; CHECK-NEXT: )
;; CHECK-NEXT: (call $reverse)
;; CHECK-NEXT: )
-;; CHECK: (func $forward_12 (type $none_=>_none)
+;; CHECK: (func $forward_12 (type $0)
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (i32.const 3)
;; CHECK-NEXT: )
;; CHECK-NEXT: (call $forward)
;; CHECK-NEXT: )
-;; CHECK: (func $reverse_12 (type $none_=>_none)
+;; CHECK: (func $reverse_12 (type $0)
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (i32.const -3)
;; CHECK-NEXT: )
diff --git a/test/lit/merge/export_options.wat b/test/lit/merge/export_options.wat
index 26bc9d382..57602972a 100644
--- a/test/lit/merge/export_options.wat
+++ b/test/lit/merge/export_options.wat
@@ -9,7 +9,7 @@
;; RUN: wasm-merge %s first %s.second second --skip-export-conflicts -S -o - | filecheck %s --check-prefix SKIP_C
(module
- ;; RENAME: (type $none_=>_none (func))
+ ;; RENAME: (type $0 (func))
;; RENAME: (export "func" (func $func0))
@@ -22,7 +22,7 @@
;; RENAME-NEXT: (i32.const 0)
;; RENAME-NEXT: )
;; RENAME-NEXT: )
- ;; SKIP_C: (type $none_=>_none (func))
+ ;; SKIP_C: (type $0 (func))
;; SKIP_C: (export "func" (func $func0))
diff --git a/test/lit/merge/fusing.wat b/test/lit/merge/fusing.wat
index 2680889e0..c38f84409 100644
--- a/test/lit/merge/fusing.wat
+++ b/test/lit/merge/fusing.wat
@@ -21,11 +21,11 @@
(import "second" "mem" (memory $other.mem 1))
;; This import will remain unresolved.
- ;; CHECK: (type $none_=>_none (func))
+ ;; CHECK: (type $0 (func))
- ;; CHECK: (type $none_=>_i32 (func (result i32)))
+ ;; CHECK: (type $1 (func (result i32)))
- ;; CHECK: (import "third" "missing" (func $other.missing (type $none_=>_none)))
+ ;; CHECK: (import "third" "missing" (func $other.missing (type $0)))
(import "third" "missing" (func $other.missing))
;; CHECK: (memory $first.mem 2)
@@ -54,7 +54,7 @@
;; CHECK: (export "keepalive3" (func $keepalive3))
- ;; CHECK: (func $first.foo (type $none_=>_none)
+ ;; CHECK: (func $first.foo (type $0)
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (i32.const 1)
;; CHECK-NEXT: )
@@ -67,7 +67,7 @@
(call $other.foo)
)
- ;; CHECK: (func $bar (type $none_=>_none)
+ ;; CHECK: (func $bar (type $0)
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (i32.const 2)
;; CHECK-NEXT: )
@@ -82,7 +82,7 @@
(call $other.missing)
)
- ;; CHECK: (func $keepalive (type $none_=>_i32) (result i32)
+ ;; CHECK: (func $keepalive (type $1) (result i32)
;; CHECK-NEXT: (i32.load $second.mem
;; CHECK-NEXT: (i32.const 10)
;; CHECK-NEXT: )
@@ -100,26 +100,26 @@
(tag $exn (export "exn"))
)
-;; CHECK: (func $second.foo (type $none_=>_none)
+;; CHECK: (func $second.foo (type $0)
;; CHECK-NEXT: (call $first.foo)
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (i32.const 3)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
-;; CHECK: (func $bar_6 (type $none_=>_none)
+;; CHECK: (func $bar_6 (type $0)
;; CHECK-NEXT: (call $bar)
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (i32.const 4)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
-;; CHECK: (func $keepalive2 (type $none_=>_i32) (result i32)
+;; CHECK: (func $keepalive2 (type $1) (result i32)
;; CHECK-NEXT: (i32.load $first.mem
;; CHECK-NEXT: (i32.const 10)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
-;; CHECK: (func $keepalive3 (type $none_=>_none)
+;; CHECK: (func $keepalive3 (type $0)
;; CHECK-NEXT: (throw $exn)
;; CHECK-NEXT: )
diff --git a/test/lit/merge/renamings.wat b/test/lit/merge/renamings.wat
index 32a8fb238..bb49b7ab7 100644
--- a/test/lit/merge/renamings.wat
+++ b/test/lit/merge/renamings.wat
@@ -9,17 +9,17 @@
;; This tag has a conflict in second.wat, and so second.wat's $foo
;; will be renamed.
- ;; CHECK: (type $none_=>_none (func))
+ ;; CHECK: (type $1 (func))
- ;; CHECK: (type $f64_=>_none (func (param f64)))
+ ;; CHECK: (type $2 (func (param f64)))
- ;; CHECK: (type $ref|$array|_=>_none (func (param (ref $array))))
+ ;; CHECK: (type $3 (func (param (ref $array))))
- ;; CHECK: (type $i32_=>_none (func (param i32)))
+ ;; CHECK: (type $4 (func (param i32)))
- ;; CHECK: (type $i64_=>_none (func (param i64)))
+ ;; CHECK: (type $5 (func (param i64)))
- ;; CHECK: (type $f32_=>_none (func (param f32)))
+ ;; CHECK: (type $6 (func (param f32)))
;; CHECK: (import "elsewhere" "some.tag" (tag $imported (param f64)))
@@ -114,7 +114,7 @@
;; CHECK: (export "other-b" (func $other))
- ;; CHECK: (func $foo (type $none_=>_none)
+ ;; CHECK: (func $foo (type $1)
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (i32.const 1)
;; CHECK-NEXT: )
@@ -127,7 +127,7 @@
)
)
- ;; CHECK: (func $bar (type $none_=>_none)
+ ;; CHECK: (func $bar (type $1)
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (i32.const 2)
;; CHECK-NEXT: )
@@ -138,7 +138,7 @@
)
)
- ;; CHECK: (func $uses (type $ref|$array|_=>_none) (param $array (ref $array))
+ ;; CHECK: (func $uses (type $3) (param $array (ref $array))
;; CHECK-NEXT: (try $try
;; CHECK-NEXT: (do
;; CHECK-NEXT: (nop)
@@ -276,19 +276,19 @@
(call $bar)
)
)
-;; CHECK: (func $foo_3 (type $none_=>_none)
+;; CHECK: (func $foo_3 (type $1)
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (i32.const 3)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
-;; CHECK: (func $other (type $none_=>_none)
+;; CHECK: (func $other (type $1)
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (i32.const 4)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
-;; CHECK: (func $uses.second (type $ref|$array|_=>_none) (param $array (ref $array))
+;; CHECK: (func $uses.second (type $3) (param $array (ref $array))
;; CHECK-NEXT: (try $try
;; CHECK-NEXT: (do
;; CHECK-NEXT: (nop)
diff --git a/test/lit/merge/start.flip.wat b/test/lit/merge/start.flip.wat
index cf7d93ca5..558c12e7d 100644
--- a/test/lit/merge/start.flip.wat
+++ b/test/lit/merge/start.flip.wat
@@ -4,14 +4,14 @@
;; Like start, but flipped - now only the first module has a start.
(module
- ;; CHECK: (type $none_=>_none (func))
+ ;; CHECK: (type $0 (func))
;; CHECK: (export "start" (func $start_1))
;; CHECK: (start $start)
(start $start)
- ;; CHECK: (func $start (type $none_=>_none)
+ ;; CHECK: (func $start (type $0)
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: )
@@ -23,7 +23,7 @@
)
)
-;; CHECK: (func $start_1 (type $none_=>_none)
+;; CHECK: (func $start_1 (type $0)
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (i32.const 1)
;; CHECK-NEXT: )
diff --git a/test/lit/merge/start.wat b/test/lit/merge/start.wat
index 19a9bcb91..5a0bf66e3 100644
--- a/test/lit/merge/start.wat
+++ b/test/lit/merge/start.wat
@@ -13,7 +13,7 @@
)
)
)
-;; CHECK: (type $none_=>_none (func))
+;; CHECK: (type $0 (func))
;; CHECK: (export "start" (func $start_1))
@@ -21,13 +21,13 @@
;; CHECK: (start $start_1)
-;; CHECK: (func $start_1 (type $none_=>_none)
+;; CHECK: (func $start_1 (type $0)
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (i32.const 1)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
-;; CHECK: (func $user (type $none_=>_none)
+;; CHECK: (func $user (type $0)
;; CHECK-NEXT: (call $start_1)
;; CHECK-NEXT: (call $start_1)
;; CHECK-NEXT: )
diff --git a/test/lit/merge/start3.wat b/test/lit/merge/start3.wat
index 9918d0164..cba29737c 100644
--- a/test/lit/merge/start3.wat
+++ b/test/lit/merge/start3.wat
@@ -7,7 +7,7 @@
(module
)
-;; CHECK: (type $none_=>_none (func))
+;; CHECK: (type $0 (func))
;; CHECK: (export "start" (func $start))
@@ -15,7 +15,7 @@
;; CHECK: (start $merged.start.old)
-;; CHECK: (func $start (type $none_=>_none)
+;; CHECK: (func $start (type $0)
;; CHECK-NEXT: (local $x i32)
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (local.get $x)
@@ -25,12 +25,12 @@
;; CHECK-NEXT: )
;; CHECK-NEXT: )
-;; CHECK: (func $user (type $none_=>_none)
+;; CHECK: (func $user (type $0)
;; CHECK-NEXT: (call $start)
;; CHECK-NEXT: (call $start)
;; CHECK-NEXT: )
-;; CHECK: (func $merged.start.old (type $none_=>_none)
+;; CHECK: (func $merged.start.old (type $0)
;; CHECK-NEXT: (local $x i32)
;; CHECK-NEXT: (block
;; CHECK-NEXT: (drop
@@ -43,7 +43,7 @@
;; CHECK-NEXT: (call $merged.start.new)
;; CHECK-NEXT: )
-;; CHECK: (func $merged.start.new (type $none_=>_none)
+;; CHECK: (func $merged.start.new (type $0)
;; CHECK-NEXT: (local $x f64)
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (local.get $x)
diff --git a/test/lit/merge/table_elem.wat b/test/lit/merge/table_elem.wat
index 3fec4d865..c7505d0ee 100644
--- a/test/lit/merge/table_elem.wat
+++ b/test/lit/merge/table_elem.wat
@@ -11,7 +11,7 @@
;; CHECK: (type $vec (array funcref))
(type $vec (array funcref))
- ;; CHECK: (type $none_=>_none (func))
+ ;; CHECK: (type $1 (func))
;; CHECK: (table $foo 1 funcref)
(table $foo 1 funcref)
@@ -63,7 +63,7 @@
;; CHECK: (export "keepalive2_1" (func $0_1))
-;; CHECK: (func $0 (type $none_=>_none)
+;; CHECK: (func $0 (type $1)
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (table.get $foo
;; CHECK-NEXT: (i32.const 1)
@@ -88,7 +88,7 @@
;; CHECK-NEXT: )
;; CHECK-NEXT: )
-;; CHECK: (func $0_1 (type $none_=>_none)
+;; CHECK: (func $0_1 (type $1)
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (table.get $foo_2
;; CHECK-NEXT: (i32.const 1)
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-12 17:33:13 +0000