5 files changed, 24 insertions, 24 deletions
diff --git a/test/lit/ctor-eval/ctor_after_serialization.wat b/test/lit/ctor-eval/ctor_after_serialization.wat
index 7a4871398..46a599002 100644
--- a/test/lit/ctor-eval/ctor_after_serialization.wat
+++ b/test/lit/ctor-eval/ctor_after_serialization.wat
@@ -16,9 +16,9 @@
 
  ;; CHECK:      (global $ctor-eval$global (ref $A) (struct.new_default $A))
 
- ;; CHECK:      (export "new" (func $new_0))
+ ;; CHECK:      (export "new" (func $new_2))
  (export "new" (func $new))
- ;; CHECK:      (export "nop" (func $nop_0))
+ ;; CHECK:      (export "nop" (func $nop_3))
  (export "nop" (func $nop))
 
  (func $new (result (ref any))
@@ -30,11 +30,11 @@
  )
 )
 
-;; CHECK:      (func $new_0 (type $none_=>_ref|any|) (result (ref any))
+;; CHECK:      (func $new_2 (type $none_=>_ref|any|) (result (ref any))
 ;; CHECK-NEXT:  (global.get $ctor-eval$global)
 ;; CHECK-NEXT: )
 
-;; CHECK:      (func $nop_0 (type $none_=>_none)
+;; CHECK:      (func $nop_3 (type $none_=>_none)
 ;; CHECK-NEXT:  (nop)
 ;; CHECK-NEXT: )
 (module
@@ -53,11 +53,11 @@
   (struct.new_default $A)
  )
 
- ;; CHECK:      (global $ctor-eval$global_0 (ref $A) (struct.new_default $A))
+ ;; CHECK:      (global $ctor-eval$global_1 (ref $A) (struct.new_default $A))
 
- ;; CHECK:      (export "new" (func $new_0))
+ ;; CHECK:      (export "new" (func $new_2))
  (export "new" (func $new))
- ;; CHECK:      (export "nop" (func $nop_0))
+ ;; CHECK:      (export "nop" (func $nop_3))
  (export "nop" (func $nop))
 
  (func $new (result (ref any))
@@ -69,10 +69,10 @@
   (global.get $ctor-eval$global)
  )
 )
-;; CHECK:      (func $new_0 (type $none_=>_ref|any|) (result (ref any))
-;; CHECK-NEXT:  (global.get $ctor-eval$global_0)
+;; CHECK:      (func $new_2 (type $none_=>_ref|any|) (result (ref any))
+;; CHECK-NEXT:  (global.get $ctor-eval$global_1)
 ;; CHECK-NEXT: )
 
-;; CHECK:      (func $nop_0 (type $none_=>_anyref) (result anyref)
+;; CHECK:      (func $nop_3 (type $none_=>_anyref) (result anyref)
 ;; CHECK-NEXT:  (global.get $ctor-eval$global)
 ;; CHECK-NEXT: )
diff --git a/test/lit/ctor-eval/extern.wast b/test/lit/ctor-eval/extern.wast
index 462e64290..874b2c00e 100644
--- a/test/lit/ctor-eval/extern.wast
+++ b/test/lit/ctor-eval/extern.wast
@@ -18,7 +18,7 @@
  ;; CHECK-NEXT:  (i32.const 3)
  ;; CHECK-NEXT: ))
 
- ;; CHECK:      (global $ctor-eval$global_0 (ref $struct) (struct.new $struct
+ ;; CHECK:      (global $ctor-eval$global_1 (ref $struct) (struct.new $struct
  ;; CHECK-NEXT:  (extern.externalize
  ;; CHECK-NEXT:   (i31.new
  ;; CHECK-NEXT:    (i32.const 1)
@@ -26,11 +26,11 @@
  ;; CHECK-NEXT:  )
  ;; CHECK-NEXT: ))
 
- ;; CHECK:      (export "test1" (func $test1_0))
+ ;; CHECK:      (export "test1" (func $test1_3))
  (export "test1" (func $test1))
- ;; CHECK:      (export "test2" (func $test2_0))
+ ;; CHECK:      (export "test2" (func $test2_4))
  (export "test2" (func $test2))
- ;; CHECK:      (export "test3" (func $test3_0))
+ ;; CHECK:      (export "test3" (func $test3_5))
  (export "test3" (func $test3))
 
  (func $test1 (result externref)
@@ -70,7 +70,7 @@
  )
 )
 
-;; CHECK:      (func $test1_0 (type $none_=>_externref) (result externref)
+;; CHECK:      (func $test1_3 (type $none_=>_externref) (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_0 (type $none_=>_externref) (result externref)
+;; CHECK:      (func $test2_4 (type $none_=>_externref) (result externref)
 ;; CHECK-NEXT:  (extern.externalize
 ;; CHECK-NEXT:   (global.get $ctor-eval$global)
 ;; CHECK-NEXT:  )
 ;; CHECK-NEXT: )
 
-;; CHECK:      (func $test3_0 (type $none_=>_anyref) (result anyref)
-;; CHECK-NEXT:  (global.get $ctor-eval$global_0)
+;; CHECK:      (func $test3_5 (type $none_=>_anyref) (result anyref)
+;; CHECK-NEXT:  (global.get $ctor-eval$global_1)
 ;; CHECK-NEXT: )
diff --git a/test/lit/ctor-eval/multivalue-local.wast b/test/lit/ctor-eval/multivalue-local.wast
index 56dccd624..ff3daa339 100644
--- a/test/lit/ctor-eval/multivalue-local.wast
+++ b/test/lit/ctor-eval/multivalue-local.wast
@@ -41,9 +41,9 @@
   )
  )
 )
-;; CHECK:      (export "multivalue-local" (func $multivalue-local_0))
+;; CHECK:      (export "multivalue-local" (func $multivalue-local_2))
 
-;; CHECK:      (func $multivalue-local_0 (type $none_=>_i32) (result i32)
+;; CHECK:      (func $multivalue-local_2 (type $none_=>_i32) (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/table.wat b/test/lit/ctor-eval/table.wat
index 76e9a44af..73534f59b 100644
--- a/test/lit/ctor-eval/table.wat
+++ b/test/lit/ctor-eval/table.wat
@@ -14,7 +14,7 @@
 
  ;; CHECK:      (elem declare func $trap)
 
- ;; CHECK:      (export "run" (func $run_0))
+ ;; CHECK:      (export "run" (func $run_3))
  (export "run" (func $run))
 
  (func $run (type $none_=>_none)
@@ -49,7 +49,7 @@
   (unreachable)
  )
 )
-;; CHECK:      (func $run_0 (type $none_=>_none)
+;; CHECK:      (func $run_3 (type $none_=>_none)
 ;; CHECK-NEXT:  (table.set $0
 ;; CHECK-NEXT:   (i32.const 0)
 ;; CHECK-NEXT:   (ref.func $trap)
diff --git a/test/lit/ctor-eval/v128.wast b/test/lit/ctor-eval/v128.wast
index b3b8c98b3..af194bc87 100644
--- a/test/lit/ctor-eval/v128.wast
+++ b/test/lit/ctor-eval/v128.wast
@@ -11,7 +11,7 @@
 
   ;; CHECK:      (data $0 (i32.const 23) "\e0\ff\c0N\8e\00\00\fe\01\00\12\81\85\fd\ff\90")
 
-  ;; CHECK:      (export "v128" (func $v128_0))
+  ;; CHECK:      (export "v128" (func $v128_2))
   (export "v128" (func $v128))
   ;; CHECK:      (export "keepalive" (func $keepalive))
   (export "keepalive" (func $keepalive))
@@ -38,6 +38,6 @@
     )
   )
 )
-;; CHECK:      (func $v128_0 (type $none_=>_v128) (result v128)
+;; CHECK:      (func $v128_2 (type $none_=>_v128) (result v128)
 ;; CHECK-NEXT:  (v128.const i32x4 0x4ec0ffe0 0xfe00008e 0x81120001 0x90fffd85)
 ;; CHECK-NEXT: )