1 files changed, 21 insertions, 21 deletions
diff --git a/test/passes/merge-locals_all-features.txt b/test/passes/merge-locals_all-features.txt
index cf11edc91..08e530769 100644
--- a/test/passes/merge-locals_all-features.txt
+++ b/test/passes/merge-locals_all-features.txt
@@ -5,7 +5,7 @@
  (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
  (type $none_=>_none (func))
  (global $global$0 (mut i32) (i32.const 10))
- (func $test (param $x i32) (param $y i32) (result i32)
+ (func $test (type $i32_i32_=>_i32) (param $x i32) (param $y i32) (result i32)
   (drop
    (if (result i32)
     (local.tee $x
@@ -17,7 +17,7 @@
   )
   (local.get $x)
  )
- (func $test2 (param $x i32) (param $y i32) (result i32)
+ (func $test2 (type $i32_i32_=>_i32) (param $x i32) (param $y i32) (result i32)
   (drop
    (if (result i32)
     (local.tee $x
@@ -29,7 +29,7 @@
   )
   (local.get $x)
  )
- (func $test-multiple (param $x i32) (param $y i32) (result i32)
+ (func $test-multiple (type $i32_i32_=>_i32) (param $x i32) (param $y i32) (result i32)
   (drop
    (if (result i32)
     (local.tee $x
@@ -44,7 +44,7 @@
   )
   (local.get $x)
  )
- (func $test-just-some (param $x i32) (param $y i32) (result i32)
+ (func $test-just-some (type $i32_i32_=>_i32) (param $x i32) (param $y i32) (result i32)
   (drop
    (if (result i32)
     (local.tee $x
@@ -62,7 +62,7 @@
   )
   (local.get $y)
  )
- (func $test-just-some2 (param $x i32) (param $y i32) (result i32)
+ (func $test-just-some2 (type $i32_i32_=>_i32) (param $x i32) (param $y i32) (result i32)
   (drop
    (if (result i32)
     (local.tee $x
@@ -83,7 +83,7 @@
   )
   (i32.const 500)
  )
- (func $test-just-some3 (param $x i32) (param $y i32) (result i32)
+ (func $test-just-some3 (type $i32_i32_=>_i32) (param $x i32) (param $y i32) (result i32)
   (drop
    (if (result i32)
     (local.tee $x
@@ -104,7 +104,7 @@
   )
   (local.get $y)
  )
- (func $silly-self (param $x i32) (param $y i32) (result i32)
+ (func $silly-self (type $i32_i32_=>_i32) (param $x i32) (param $y i32) (result i32)
   (drop
    (if (result i32)
     (local.tee $x
@@ -116,7 +116,7 @@
   )
   (local.get $y)
  )
- (func $silly-multi (param $x i32) (param $y i32) (result i32)
+ (func $silly-multi (type $i32_i32_=>_i32) (param $x i32) (param $y i32) (result i32)
   (drop
    (if (result i32)
     (local.tee $x
@@ -130,7 +130,7 @@
   )
   (local.get $y)
  )
- (func $undo-1 (param $var$1 i32) (param $var$2 i32)
+ (func $undo-1 (type $i32_i32_=>_none) (param $var$1 i32) (param $var$2 i32)
   (local $var$5 i32)
   (local.set $var$2
    (local.get $var$1)
@@ -142,7 +142,7 @@
    (local.get $var$1)
   )
  )
- (func $undo-2 (param $var$1 i32) (param $var$2 i32)
+ (func $undo-2 (type $i32_i32_=>_none) (param $var$1 i32) (param $var$2 i32)
   (local $var$5 i32)
   (local.set $var$2
    (local.get $var$1)
@@ -157,7 +157,7 @@
    (local.get $var$1)
   )
  )
- (func $reverse (param $x i32) (param $y i32)
+ (func $reverse (type $i32_i32_=>_none) (param $x i32) (param $y i32)
   (drop
    (if (result i32)
     (local.tee $x
@@ -180,7 +180,7 @@
    (local.get $y)
   )
  )
- (func $reverse-end (param $x i32) (param $y i32)
+ (func $reverse-end (type $i32_i32_=>_none) (param $x i32) (param $y i32)
   (drop
    (if (result i32)
     (local.tee $x
@@ -191,7 +191,7 @@
    )
   )
  )
- (func $reverse-lone-end-2 (param $x i32) (param $y i32)
+ (func $reverse-lone-end-2 (type $i32_i32_=>_none) (param $x i32) (param $y i32)
   (drop
    (if (result i32)
     (local.tee $x
@@ -208,7 +208,7 @@
    (local.get $y)
   )
  )
- (func $reverse-undo (param $x i32) (param $y i32)
+ (func $reverse-undo (type $i32_i32_=>_none) (param $x i32) (param $y i32)
   (drop
    (if (result i32)
     (local.tee $x
@@ -234,7 +234,7 @@
    (local.get $y)
   )
  )
- (func $reverse-undo2 (param $x i32) (param $y i32)
+ (func $reverse-undo2 (type $i32_i32_=>_none) (param $x i32) (param $y i32)
   (drop
    (if (result i32)
     (local.tee $x
@@ -260,7 +260,7 @@
    (local.get $y)
   )
  )
- (func $reverse-undo3-conditional (param $x i32) (param $y i32)
+ (func $reverse-undo3-conditional (type $i32_i32_=>_none) (param $x i32) (param $y i32)
   (drop
    (if (result i32)
     (local.tee $x
@@ -289,7 +289,7 @@
    (local.get $y)
   )
  )
- (func $reverse-undo3-conditional-b (param $x i32) (param $y i32)
+ (func $reverse-undo3-conditional-b (type $i32_i32_=>_none) (param $x i32) (param $y i32)
   (drop
    (if (result i32)
     (local.tee $x
@@ -318,7 +318,7 @@
    (local.get $y)
   )
  )
- (func $reverse-undo3-conditional-c (param $x i32) (param $y i32)
+ (func $reverse-undo3-conditional-c (type $i32_i32_=>_none) (param $x i32) (param $y i32)
   (drop
    (if (result i32)
     (local.tee $x
@@ -355,7 +355,7 @@
    (local.get $y)
   )
  )
- (func $fuzz (param $var$0 i32) (param $var$1 f32) (param $var$2 f32) (result i64)
+ (func $fuzz (type $i32_f32_f32_=>_i64) (param $var$0 i32) (param $var$1 f32) (param $var$2 f32) (result i64)
   (local $var$3 i32)
   (global.set $global$0
    (i32.sub
@@ -439,7 +439,7 @@
    (i64.const -36028797018963968)
   )
  )
- (func $trivial-confusion (param $unused i32) (param $param i32) (param $result i32)
+ (func $trivial-confusion (type $i32_i32_i32_=>_none) (param $unused i32) (param $param i32) (param $result i32)
   (loop $label$1
    (if
     (i32.const 1)
@@ -457,7 +457,7 @@
    )
   )
  )
- (func $subtype-test
+ (func $subtype-test (type $none_=>_none)
   (local $0 anyref)
   (local $1 i31ref)
   (local $2 i31ref)