4 files changed, 22 insertions, 21 deletions
diff --git a/test/lit/passes/roundtrip-gc.wast b/test/lit/passes/roundtrip-gc.wast
index 57300def5..d2c32542c 100644
--- a/test/lit/passes/roundtrip-gc.wast
+++ b/test/lit/passes/roundtrip-gc.wast
@@ -6,14 +6,14 @@
  ;; CHECK:      (export "export" (func $test))
  (export "export" (func $test))
  ;; CHECK:      (func $test (type $1)
- ;; CHECK-NEXT:  (local $0 (ref $\7bi32\7d))
+ ;; CHECK-NEXT:  (local $scratch (ref $\7bi32\7d))
  ;; CHECK-NEXT:  (call $help
  ;; CHECK-NEXT:   (block (result (ref $\7bi32\7d))
- ;; CHECK-NEXT:    (local.set $0
+ ;; CHECK-NEXT:    (local.set $scratch
  ;; CHECK-NEXT:     (struct.new_default $\7bi32\7d)
  ;; CHECK-NEXT:    )
  ;; CHECK-NEXT:    (call $other)
- ;; CHECK-NEXT:    (local.get $0)
+ ;; CHECK-NEXT:    (local.get $scratch)
  ;; CHECK-NEXT:   )
  ;; CHECK-NEXT:   (i32.const 1)
  ;; CHECK-NEXT:  )
diff --git a/test/lit/passes/roundtrip.wast b/test/lit/passes/roundtrip.wast
index 59e303eaf..21aa1f671 100644
--- a/test/lit/passes/roundtrip.wast
+++ b/test/lit/passes/roundtrip.wast
@@ -5,29 +5,28 @@
  ;; CHECK:      (type $none (func))
  (type $none (func))
  ;; CHECK:      (func $foo (type $none)
- ;; CHECK-NEXT:  (local $0 (tuple funcref (ref $none)))
- ;; CHECK-NEXT:  (local $1 funcref)
- ;; CHECK-NEXT:  (local.set $0
- ;; CHECK-NEXT:   (block $label$1 (type $1) (result funcref (ref $none))
- ;; CHECK-NEXT:    (tuple.make 2
- ;; CHECK-NEXT:     (ref.null nofunc)
- ;; CHECK-NEXT:     (ref.func $foo)
- ;; CHECK-NEXT:    )
- ;; CHECK-NEXT:   )
- ;; CHECK-NEXT:  )
+ ;; CHECK-NEXT:  (local $scratch (tuple funcref (ref $none)))
+ ;; CHECK-NEXT:  (local $scratch_1 funcref)
  ;; CHECK-NEXT:  (drop
  ;; CHECK-NEXT:   (block (result funcref)
- ;; CHECK-NEXT:    (local.set $1
+ ;; CHECK-NEXT:    (local.set $scratch_1
  ;; CHECK-NEXT:     (tuple.extract 2 0
- ;; CHECK-NEXT:      (local.get $0)
+ ;; CHECK-NEXT:      (local.tee $scratch
+ ;; CHECK-NEXT:       (block (type $1) (result funcref (ref $none))
+ ;; CHECK-NEXT:        (tuple.make 2
+ ;; CHECK-NEXT:         (ref.null nofunc)
+ ;; CHECK-NEXT:         (ref.func $foo)
+ ;; CHECK-NEXT:        )
+ ;; CHECK-NEXT:       )
+ ;; CHECK-NEXT:      )
  ;; CHECK-NEXT:     )
  ;; CHECK-NEXT:    )
  ;; CHECK-NEXT:    (drop
  ;; CHECK-NEXT:     (tuple.extract 2 1
- ;; CHECK-NEXT:      (local.get $0)
+ ;; CHECK-NEXT:      (local.get $scratch)
  ;; CHECK-NEXT:     )
  ;; CHECK-NEXT:    )
- ;; CHECK-NEXT:    (local.get $1)
+ ;; CHECK-NEXT:    (local.get $scratch_1)
  ;; CHECK-NEXT:   )
  ;; CHECK-NEXT:  )
  ;; CHECK-NEXT: )
diff --git a/test/lit/passes/signature-refining_gto.wat b/test/lit/passes/signature-refining_gto.wat
index ec2b517b1..c69eeb244 100644
--- a/test/lit/passes/signature-refining_gto.wat
+++ b/test/lit/passes/signature-refining_gto.wat
@@ -17,7 +17,9 @@
  ;; CHECK-NEXT:  (drop
  ;; CHECK-NEXT:   (local.get $0)
  ;; CHECK-NEXT:  )
- ;; CHECK-NEXT:  (unreachable)
+ ;; CHECK-NEXT:  (drop
+ ;; CHECK-NEXT:   (unreachable)
+ ;; CHECK-NEXT:  )
  ;; CHECK-NEXT: )
  (func $struct.get (param $0 (ref $A))
   ;; This function is always called with a null, so the parameter type will be
diff --git a/test/lit/passes/stack-ir-roundtrip-eh-legacy.wast b/test/lit/passes/stack-ir-roundtrip-eh-legacy.wast
index 439681a8f..dbaa2c601 100644
--- a/test/lit/passes/stack-ir-roundtrip-eh-legacy.wast
+++ b/test/lit/passes/stack-ir-roundtrip-eh-legacy.wast
@@ -5,16 +5,16 @@
  ;; CHECK:      (tag $tag (param i32))
  (tag $tag (param i32))
   ;; CHECK:      (func $delegate-child (type $1)
-  ;; CHECK-NEXT:  (try $label$9
+  ;; CHECK-NEXT:  (try
   ;; CHECK-NEXT:   (do
-  ;; CHECK-NEXT:    (try $label$7
+  ;; CHECK-NEXT:    (try
   ;; CHECK-NEXT:     (do
   ;; CHECK-NEXT:     )
   ;; CHECK-NEXT:     (catch $tag
   ;; CHECK-NEXT:      (drop
   ;; CHECK-NEXT:       (pop i32)
   ;; CHECK-NEXT:      )
-  ;; CHECK-NEXT:      (try $label$6
+  ;; CHECK-NEXT:      (try
   ;; CHECK-NEXT:       (do
   ;; CHECK-NEXT:       )
   ;; CHECK-NEXT:       (delegate 2)