More test updates

aheejin · aheejin · commit feec9c90c24e · 2025-08-18T21:19:37.000Z
diff --git a/test/lit/passes/asyncify-wasm64.wast b/test/lit/passes/asyncify-wasm64.wast
@@ -1209,7 +1209,7 @@
   ;; CHECK-NEXT:         )
   ;; CHECK-NEXT:        )
   ;; CHECK-NEXT:        (then
-  ;; CHECK-NEXT:         (call_indirect (type $f)
+  ;; CHECK-NEXT:         (call_indirect $0 (type $f)
   ;; CHECK-NEXT:          (local.get $2)
   ;; CHECK-NEXT:          (local.get $3)
   ;; CHECK-NEXT:         )
diff --git a/test/lit/passes/asyncify.wast b/test/lit/passes/asyncify.wast
@@ -1206,7 +1206,7 @@
   ;; CHECK-NEXT:         )
   ;; CHECK-NEXT:        )
   ;; CHECK-NEXT:        (then
-  ;; CHECK-NEXT:         (call_indirect (type $f)
+  ;; CHECK-NEXT:         (call_indirect $t (type $f)
   ;; CHECK-NEXT:          (local.get $2)
   ;; CHECK-NEXT:          (local.get $3)
   ;; CHECK-NEXT:         )
diff --git a/test/lit/passes/asyncify_pass-arg=asyncify-addlist@foo_pass-arg=asyncify-ignore-indirect.wast b/test/lit/passes/asyncify_pass-arg=asyncify-addlist@foo_pass-arg=asyncify-ignore-indirect.wast
@@ -99,7 +99,7 @@
   ;; CHECK-NEXT:         )
   ;; CHECK-NEXT:        )
   ;; CHECK-NEXT:        (then
-  ;; CHECK-NEXT:         (call_indirect (type $t)
+  ;; CHECK-NEXT:         (call_indirect $0 (type $t)
   ;; CHECK-NEXT:          (i32.const 0)
   ;; CHECK-NEXT:         )
   ;; CHECK-NEXT:         (if
@@ -146,7 +146,7 @@
   )
   ;; CHECK:      (func $bar
   ;; CHECK-NEXT:  (call $nothing)
-  ;; CHECK-NEXT:  (call_indirect (type $t)
+  ;; CHECK-NEXT:  (call_indirect $0 (type $t)
   ;; CHECK-NEXT:   (i32.const 0)
   ;; CHECK-NEXT:  )
   ;; CHECK-NEXT: )
diff --git a/test/lit/passes/asyncify_pass-arg=asyncify-asserts_pass-arg=asyncify-onlylist@waka.wast b/test/lit/passes/asyncify_pass-arg=asyncify-asserts_pass-arg=asyncify-onlylist@waka.wast
@@ -132,7 +132,7 @@
   ;; CHECK-NEXT:   (global.get $__asyncify_state)
   ;; CHECK-NEXT:  )
   ;; CHECK-NEXT:  (block
-  ;; CHECK-NEXT:   (call_indirect (type $f)
+  ;; CHECK-NEXT:   (call_indirect $0 (type $f)
   ;; CHECK-NEXT:    (local.get $x)
   ;; CHECK-NEXT:   )
   ;; CHECK-NEXT:   (if
diff --git a/test/lit/passes/asyncify_pass-arg=asyncify-ignore-imports.wast b/test/lit/passes/asyncify_pass-arg=asyncify-ignore-imports.wast
@@ -164,7 +164,7 @@
   ;; CHECK-NEXT:         )
   ;; CHECK-NEXT:        )
   ;; CHECK-NEXT:        (then
-  ;; CHECK-NEXT:         (call_indirect (type $f)
+  ;; CHECK-NEXT:         (call_indirect $0 (type $f)
   ;; CHECK-NEXT:          (local.get $1)
   ;; CHECK-NEXT:         )
   ;; CHECK-NEXT:         (if
diff --git a/test/lit/passes/asyncify_pass-arg=asyncify-ignore-indirect.wast b/test/lit/passes/asyncify_pass-arg=asyncify-ignore-indirect.wast
@@ -509,7 +509,7 @@
     )
   )
   ;; CHECK:      (func $calls-indirect (param $x i32)
-  ;; CHECK-NEXT:  (call_indirect (type $f)
+  ;; CHECK-NEXT:  (call_indirect $0 (type $f)
   ;; CHECK-NEXT:   (local.get $x)
   ;; CHECK-NEXT:  )
   ;; CHECK-NEXT: )
diff --git a/test/lit/passes/duplicate-function-elimination_optimize-level=1.wast b/test/lit/passes/duplicate-function-elimination_optimize-level=1.wast
@@ -842,7 +842,7 @@
   ;; CHECK:      (elem $0 (i32.const 0) $erase $erase)
 
   ;; CHECK:      (func $erase
-  ;; CHECK-NEXT:  (call_indirect (type $T)
+  ;; CHECK-NEXT:  (call_indirect $0 (type $T)
   ;; CHECK-NEXT:   (i32.const 0)
   ;; CHECK-NEXT:  )
   ;; CHECK-NEXT: )
@@ -870,7 +870,7 @@
   ;; CHECK:      (elem $0 (i32.const 0) $keep2 $other)
 
   ;; CHECK:      (func $keep2
-  ;; CHECK-NEXT:  (call_indirect (type $T)
+  ;; CHECK-NEXT:  (call_indirect $0 (type $T)
   ;; CHECK-NEXT:   (i32.const 0)
   ;; CHECK-NEXT:  )
   ;; CHECK-NEXT: )
@@ -880,7 +880,7 @@
     )
   )
   ;; CHECK:      (func $other
-  ;; CHECK-NEXT:  (call_indirect (type $T)
+  ;; CHECK-NEXT:  (call_indirect $0 (type $T)
   ;; CHECK-NEXT:   (i32.const 1)
   ;; CHECK-NEXT:  )
   ;; CHECK-NEXT: )
@@ -904,7 +904,7 @@
   ;; CHECK:      (elem $0 (i32.const 0) $keep2 $keep2)
 
   ;; CHECK:      (func $keep2
-  ;; CHECK-NEXT:  (call_indirect (type $T)
+  ;; CHECK-NEXT:  (call_indirect $0 (type $T)
   ;; CHECK-NEXT:   (i32.const 0)
   ;; CHECK-NEXT:  )
   ;; CHECK-NEXT: )
diff --git a/test/lit/passes/duplicate-function-elimination_optimize-level=2.wast b/test/lit/passes/duplicate-function-elimination_optimize-level=2.wast
@@ -839,7 +839,7 @@
   ;; CHECK:      (elem $0 (i32.const 0) $erase $erase)
 
   ;; CHECK:      (func $erase
-  ;; CHECK-NEXT:  (call_indirect (type $T)
+  ;; CHECK-NEXT:  (call_indirect $0 (type $T)
   ;; CHECK-NEXT:   (i32.const 0)
   ;; CHECK-NEXT:  )
   ;; CHECK-NEXT: )
@@ -867,7 +867,7 @@
   ;; CHECK:      (elem $0 (i32.const 0) $keep2 $other)
 
   ;; CHECK:      (func $keep2
-  ;; CHECK-NEXT:  (call_indirect (type $T)
+  ;; CHECK-NEXT:  (call_indirect $0 (type $T)
   ;; CHECK-NEXT:   (i32.const 0)
   ;; CHECK-NEXT:  )
   ;; CHECK-NEXT: )
@@ -877,7 +877,7 @@
     )
   )
   ;; CHECK:      (func $other
-  ;; CHECK-NEXT:  (call_indirect (type $T)
+  ;; CHECK-NEXT:  (call_indirect $0 (type $T)
   ;; CHECK-NEXT:   (i32.const 1)
   ;; CHECK-NEXT:  )
   ;; CHECK-NEXT: )
@@ -901,7 +901,7 @@
   ;; CHECK:      (elem $0 (i32.const 0) $keep2 $keep2)
 
   ;; CHECK:      (func $keep2
-  ;; CHECK-NEXT:  (call_indirect (type $T)
+  ;; CHECK-NEXT:  (call_indirect $0 (type $T)
   ;; CHECK-NEXT:   (i32.const 0)
   ;; CHECK-NEXT:  )
   ;; CHECK-NEXT: )
diff --git a/test/lit/passes/extract-function.wast b/test/lit/passes/extract-function.wast
@@ -71,7 +71,7 @@
   (export "foo" (func $foo))
 
   ;; CHECK:      (func $foo
-  ;; CHECK-NEXT:  (call_indirect (type $none)
+  ;; CHECK-NEXT:  (call_indirect $t (type $none)
   ;; CHECK-NEXT:   (i32.const 10)
   ;; CHECK-NEXT:  )
   ;; CHECK-NEXT: )
diff --git a/test/lit/passes/fpcast-emu.wast b/test/lit/passes/fpcast-emu.wast
@@ -28,7 +28,7 @@
 
   ;; CHECK:      (func $a (param $x i32) (param $y i64) (param $z f32) (param $w f64)
   ;; CHECK-NEXT:  (drop
-  ;; CHECK-NEXT:   (call_indirect (type $0)
+  ;; CHECK-NEXT:   (call_indirect $0 (type $0)
   ;; CHECK-NEXT:    (i64.extend_i32_u
   ;; CHECK-NEXT:     (i32.const 1)
   ;; CHECK-NEXT:    )
@@ -67,7 +67,7 @@
     )
   )
   ;; CHECK:      (func $b (param $x i32) (param $y i32) (result i64)
-  ;; CHECK-NEXT:  (call_indirect (type $0)
+  ;; CHECK-NEXT:  (call_indirect $0 (type $0)
   ;; CHECK-NEXT:   (i64.extend_i32_u
   ;; CHECK-NEXT:    (i32.const 1)
   ;; CHECK-NEXT:   )
@@ -101,7 +101,7 @@
   ;; CHECK:      (func $c (param $x i64) (param $y i64) (result f32)
   ;; CHECK-NEXT:  (f32.reinterpret_i32
   ;; CHECK-NEXT:   (i32.wrap_i64
-  ;; CHECK-NEXT:    (call_indirect (type $0)
+  ;; CHECK-NEXT:    (call_indirect $0 (type $0)
   ;; CHECK-NEXT:     (i64.const 1)
   ;; CHECK-NEXT:     (i64.const 2)
   ;; CHECK-NEXT:     (i64.const 0)
@@ -132,7 +132,7 @@
   )
   ;; CHECK:      (func $d (param $x f32) (param $y f32) (result f64)
   ;; CHECK-NEXT:  (f64.reinterpret_i64
-  ;; CHECK-NEXT:   (call_indirect (type $0)
+  ;; CHECK-NEXT:   (call_indirect $0 (type $0)
   ;; CHECK-NEXT:    (i64.extend_i32_u
   ;; CHECK-NEXT:     (i32.reinterpret_f32
   ;; CHECK-NEXT:      (f32.const 1)
@@ -170,7 +170,7 @@
   )
   ;; CHECK:      (func $e (param $x f64) (param $y f64) (result i32)
   ;; CHECK-NEXT:  (i32.wrap_i64
-  ;; CHECK-NEXT:   (call_indirect (type $0)
+  ;; CHECK-NEXT:   (call_indirect $0 (type $0)
   ;; CHECK-NEXT:    (i64.reinterpret_f64
   ;; CHECK-NEXT:     (f64.const 1)
   ;; CHECK-NEXT:    )
@@ -312,7 +312,7 @@
  ;; CHECK-NEXT:    (global.set $global$0
  ;; CHECK-NEXT:     (i32.const 0)
  ;; CHECK-NEXT:    )
- ;; CHECK-NEXT:    (call_indirect (type $2)
+ ;; CHECK-NEXT:    (call_indirect $0 (type $2)
  ;; CHECK-NEXT:     (br $label$1
  ;; CHECK-NEXT:      (i64.const 4294967295)
  ;; CHECK-NEXT:     )
diff --git a/test/lit/passes/generate-dyncalls-wasm64.wast b/test/lit/passes/generate-dyncalls-wasm64.wast
@@ -35,13 +35,13 @@
  )
 )
 ;; CHECK:      (func $dynCall_i (param $fptr i64) (result i32)
-;; CHECK-NEXT:  (call_indirect (type $0)
+;; CHECK-NEXT:  (call_indirect $t (type $0)
 ;; CHECK-NEXT:   (local.get $fptr)
 ;; CHECK-NEXT:  )
 ;; CHECK-NEXT: )
 
 ;; CHECK:      (func $dynCall_ji (param $fptr i64) (param $0 i32) (result i64)
-;; CHECK-NEXT:  (call_indirect (type $1)
+;; CHECK-NEXT:  (call_indirect $t (type $1)
 ;; CHECK-NEXT:   (local.get $0)
 ;; CHECK-NEXT:   (local.get $fptr)
 ;; CHECK-NEXT:  )
diff --git a/test/lit/passes/generate-i64-dyncalls.wast b/test/lit/passes/generate-i64-dyncalls.wast
@@ -32,7 +32,7 @@
  (elem (i32.const 0) $f1 $f2)
 )
 ;; CHECK:      (func $dynCall_ji (param $fptr i32) (param $0 i32) (result i64)
-;; CHECK-NEXT:  (call_indirect (type $0)
+;; CHECK-NEXT:  (call_indirect $0 (type $0)
 ;; CHECK-NEXT:   (local.get $0)
 ;; CHECK-NEXT:   (local.get $fptr)
 ;; CHECK-NEXT:  )
diff --git a/test/lit/passes/inlining-optimizing_optimize-level=3.wast b/test/lit/passes/inlining-optimizing_optimize-level=3.wast
@@ -543,7 +543,7 @@
  ;; CHECK-NEXT:        (local.get $10)
  ;; CHECK-NEXT:        (then
  ;; CHECK-NEXT:         (drop
- ;; CHECK-NEXT:          (call_indirect (type $FUNCSIG$iiii)
+ ;; CHECK-NEXT:          (call_indirect $timport$0 (type $FUNCSIG$iiii)
  ;; CHECK-NEXT:           (local.get $0)
  ;; CHECK-NEXT:           (i32.const 0)
  ;; CHECK-NEXT:           (i32.const 0)
@@ -2834,7 +2834,7 @@
  ;; CHECK-NEXT:    )
  ;; CHECK-NEXT:    (then
  ;; CHECK-NEXT:     (local.set $3
- ;; CHECK-NEXT:      (call_indirect (type $FUNCSIG$iiii)
+ ;; CHECK-NEXT:      (call_indirect $timport$0 (type $FUNCSIG$iiii)
  ;; CHECK-NEXT:       (local.get $2)
  ;; CHECK-NEXT:       (local.get $0)
  ;; CHECK-NEXT:       (local.get $1)
@@ -2899,7 +2899,7 @@
  ;; CHECK-NEXT:       )
  ;; CHECK-NEXT:       (br_if $label$break$L5
  ;; CHECK-NEXT:        (i32.lt_u
- ;; CHECK-NEXT:         (call_indirect (type $FUNCSIG$iiii)
+ ;; CHECK-NEXT:         (call_indirect $timport$0 (type $FUNCSIG$iiii)
  ;; CHECK-NEXT:          (local.get $2)
  ;; CHECK-NEXT:          (local.get $0)
  ;; CHECK-NEXT:          (local.get $3)
@@ -3949,7 +3949,7 @@
  ;; CHECK-NEXT:      )
  ;; CHECK-NEXT:     )
  ;; CHECK-NEXT:     (drop
- ;; CHECK-NEXT:      (call_indirect (type $FUNCSIG$iiii)
+ ;; CHECK-NEXT:      (call_indirect $timport$0 (type $FUNCSIG$iiii)
  ;; CHECK-NEXT:       (local.get $0)
  ;; CHECK-NEXT:       (i32.const 0)
  ;; CHECK-NEXT:       (i32.const 0)
@@ -3998,7 +3998,7 @@
  ;; CHECK-NEXT:     )
  ;; CHECK-NEXT:     (then
  ;; CHECK-NEXT:      (drop
- ;; CHECK-NEXT:       (call_indirect (type $FUNCSIG$iiii)
+ ;; CHECK-NEXT:       (call_indirect $timport$0 (type $FUNCSIG$iiii)
  ;; CHECK-NEXT:        (local.get $0)
  ;; CHECK-NEXT:        (i32.sub
  ;; CHECK-NEXT:         (local.get $4)
@@ -32739,7 +32739,7 @@
   )
  )
  ;; CHECK:      (func $dynCall_ii (param $0 i32) (param $1 i32) (result i32)
- ;; CHECK-NEXT:  (call_indirect (type $FUNCSIG$ii)
+ ;; CHECK-NEXT:  (call_indirect $timport$0 (type $FUNCSIG$ii)
  ;; CHECK-NEXT:   (local.get $1)
  ;; CHECK-NEXT:   (i32.and
  ;; CHECK-NEXT:    (local.get $0)
@@ -32757,7 +32757,7 @@
   )
  )
  ;; CHECK:      (func $dynCall_iiii (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32) (result i32)
- ;; CHECK-NEXT:  (call_indirect (type $FUNCSIG$iiii)
+ ;; CHECK-NEXT:  (call_indirect $timport$0 (type $FUNCSIG$iiii)
  ;; CHECK-NEXT:   (local.get $1)
  ;; CHECK-NEXT:   (local.get $2)
  ;; CHECK-NEXT:   (local.get $3)
@@ -32785,7 +32785,7 @@
   )
  )
  ;; CHECK:      (func $dynCall_vi (param $0 i32) (param $1 i32)
- ;; CHECK-NEXT:  (call_indirect (type $FUNCSIG$vi)
+ ;; CHECK-NEXT:  (call_indirect $timport$0 (type $FUNCSIG$vi)
  ;; CHECK-NEXT:   (local.get $1)
  ;; CHECK-NEXT:   (i32.add
  ;; CHECK-NEXT:    (i32.and
diff --git a/test/lit/passes/inlining_enable-tail-call.wast b/test/lit/passes/inlining_enable-tail-call.wast
@@ -377,7 +377,7 @@
 
  ;; CHECK:      (func $0
  ;; CHECK-NEXT:  (block $__inlined_func$1
- ;; CHECK-NEXT:   (call_indirect (type $T)
+ ;; CHECK-NEXT:   (call_indirect $0 (type $T)
  ;; CHECK-NEXT:    (if
  ;; CHECK-NEXT:     (i32.const 0)
  ;; CHECK-NEXT:     (then
@@ -1241,7 +1241,7 @@
  ;; CHECK-NEXT:  (drop
  ;; CHECK-NEXT:   (block $__inlined_func$callee (result i32)
  ;; CHECK-NEXT:    (br $__inlined_func$callee
- ;; CHECK-NEXT:     (call_indirect (type $T)
+ ;; CHECK-NEXT:     (call_indirect $0 (type $T)
  ;; CHECK-NEXT:      (i32.const 42)
  ;; CHECK-NEXT:      (i32.const 0)
  ;; CHECK-NEXT:     )
@@ -1273,7 +1273,7 @@
  ;; CHECK-NEXT:       )
  ;; CHECK-NEXT:      )
  ;; CHECK-NEXT:     )
- ;; CHECK-NEXT:     (call_indirect (type $T)
+ ;; CHECK-NEXT:     (call_indirect $0 (type $T)
  ;; CHECK-NEXT:      (i32.const 42)
  ;; CHECK-NEXT:      (i32.const 0)
  ;; CHECK-NEXT:     )
@@ -1308,7 +1308,7 @@
  ;; CHECK:      (func $caller
  ;; CHECK-NEXT:  (block $__inlined_func$callee
  ;; CHECK-NEXT:   (block
- ;; CHECK-NEXT:    (call_indirect (type $T)
+ ;; CHECK-NEXT:    (call_indirect $0 (type $T)
  ;; CHECK-NEXT:     (i32.const 42)
  ;; CHECK-NEXT:     (i32.const 0)
  ;; CHECK-NEXT:    )
@@ -1336,7 +1336,7 @@
  ;; CHECK-NEXT:     )
  ;; CHECK-NEXT:     (br $__inlined_func$callee-2$1)
  ;; CHECK-NEXT:    )
- ;; CHECK-NEXT:    (call_indirect (type $T)
+ ;; CHECK-NEXT:    (call_indirect $0 (type $T)
  ;; CHECK-NEXT:     (i32.const 42)
  ;; CHECK-NEXT:     (i32.const 0)
  ;; CHECK-NEXT:    )
diff --git a/test/lld/duplicate_imports.wat.out b/test/lld/duplicate_imports.wat.out
@@ -36,14 +36,14 @@
  (func $__wasm_call_ctors
  )
  (func $dynCall_ffd (param $fptr i32) (param $0 f32) (param $1 f64) (result f32)
-  (call_indirect (type $8)
+  (call_indirect $0 (type $8)
    (local.get $0)
    (local.get $1)
    (local.get $fptr)
   )
  )
  (func $dynCall_fdd (param $fptr i32) (param $0 f64) (param $1 f64) (result f32)
-  (call_indirect (type $9)
+  (call_indirect $0 (type $9)
    (local.get $0)
    (local.get $1)
    (local.get $fptr)
diff --git a/test/lld/em_asm_pthread.wasm.out b/test/lld/em_asm_pthread.wasm.out
diff --git a/test/lld/em_asm_table.wat.out b/test/lld/em_asm_table.wat.out
diff --git a/test/lld/longjmp.wat.out b/test/lld/longjmp.wat.out
diff --git a/test/lld/main_module_table_5.wat.out b/test/lld/main_module_table_5.wat.out
diff --git a/test/lld/reserved_func_ptr.wat.out b/test/lld/reserved_func_ptr.wat.out
diff --git a/test/lld/shared_longjmp.wat.out b/test/lld/shared_longjmp.wat.out

Original file line number	Diff line number	Diff line change
`@@ -509,7 +509,7 @@`
`509`	`509`	`)`
`510`	`510`	`)`
`511`	`511`	`;; CHECK: (func $calls-indirect (param $x i32)`
`512`		`- ;; CHECK-NEXT: (call_indirect (type $f)`
	`512`	`+ ;; CHECK-NEXT: (call_indirect $0 (type $f)`
`513`	`513`	`;; CHECK-NEXT: (local.get $x)`
`514`	`514`	`;; CHECK-NEXT: )`
`515`	`515`	`;; CHECK-NEXT: )`