1 files changed, 56 insertions, 56 deletions
diff --git a/test/passes/simplify-locals_all-features_disable-exception-handling.txt b/test/passes/simplify-locals_all-features_disable-exception-handling.txt
index 78e2804ac..2fd41b93f 100644
--- a/test/passes/simplify-locals_all-features_disable-exception-handling.txt
+++ b/test/passes/simplify-locals_all-features_disable-exception-handling.txt
@@ -20,7 +20,7 @@
  (import "fuzzing-support" "log-f32" (func $fimport$0 (param f32)))
  (global $global$0 (mut i32) (i32.const 10))
  (memory $0 256 256)
- (func $contrast
+ (func $contrast (type $FUNCSIG$v)
   (local $x i32)
   (local $y i32)
   (local $z i32)
@@ -82,7 +82,7 @@
    )
   )
  )
- (func $b0-yes (param $i1 i32)
+ (func $b0-yes (type $4) (param $i1 i32)
   (local $x i32)
   (local $y i32)
   (local $a i32)
@@ -400,7 +400,7 @@
    )
   )
  )
- (func $Ia (param $a i32) (result i32)
+ (func $Ia (type $5) (param $a i32) (result i32)
   (local $b i32)
   (block $switch$0
    (block $switch-default$6
@@ -411,7 +411,7 @@
    (i32.const 60)
   )
  )
- (func $memories (param $i2 i32) (param $i3 i32) (param $bi2 i32) (param $bi3 i32) (param $ci3 i32) (param $di3 i32)
+ (func $memories (type $6) (param $i2 i32) (param $i3 i32) (param $bi2 i32) (param $bi3 i32) (param $ci3 i32) (param $di3 i32)
   (local $set_with_no_get i32)
   (nop)
   (i32.store8
@@ -441,7 +441,7 @@
   )
   (nop)
  )
- (func $___remdi3 (param $$a$0 i32) (param $$a$1 i32) (param $$b$0 i32) (param $$b$1 i32) (result i32)
+ (func $___remdi3 (type $FUNCSIG$iiiii) (param $$a$0 i32) (param $$a$1 i32) (param $$b$0 i32) (param $$b$1 i32) (result i32)
   (local $$1$1 i32)
   (local $$1$0 i32)
   (local $$rem i32)
@@ -634,7 +634,7 @@
    )
   )
  )
- (func $block-returns
+ (func $block-returns (type $FUNCSIG$v)
   (local $x i32)
   (local.set $x
    (block $out (result i32)
@@ -708,7 +708,7 @@
    )
   )
  )
- (func $multiple (param $s i32) (param $r i32) (param $f i32) (param $p i32) (param $t i32) (param $m i32)
+ (func $multiple (type $6) (param $s i32) (param $r i32) (param $f i32) (param $p i32) (param $t i32) (param $m i32)
   (nop)
   (local.set $r
    (i32.add
@@ -735,7 +735,7 @@
    (local.get $t)
   )
  )
- (func $switch-def (param $i3 i32) (result i32)
+ (func $switch-def (type $5) (param $i3 i32) (result i32)
   (local $i1 i32)
   (local.set $i1
    (i32.const 10)
@@ -754,7 +754,7 @@
    (local.get $i1)
   )
  )
- (func $no-out-of-label (param $x i32) (param $y i32)
+ (func $no-out-of-label (type $i32_i32_=>_none) (param $x i32) (param $y i32)
   (nop)
   (local.set $x
    (loop $moar (result i32)
@@ -781,7 +781,7 @@
    (local.get $y)
   )
  )
- (func $freetype-cd (param $a i32) (result i32)
+ (func $freetype-cd (type $5) (param $a i32) (result i32)
   (local $e i32)
   (nop)
   (local.tee $a
@@ -809,7 +809,7 @@
    )
   )
  )
- (func $drop-if-value (param $x i32) (param $y i32) (param $z i32) (result i32)
+ (func $drop-if-value (type $i32_i32_i32_=>_i32) (param $x i32) (param $y i32) (param $z i32) (result i32)
   (local $temp i32)
   (drop
    (if (result i32)
@@ -837,7 +837,7 @@
    (i32.const 0)
   )
  )
- (func $drop-br_if (param $label i32) (param $$cond2 i32) (param $$$0151 i32) (result i32)
+ (func $drop-br_if (type $i32_i32_i32_=>_i32) (param $label i32) (param $$cond2 i32) (param $$$0151 i32) (result i32)
   (nop)
   (local.tee $label
    (block $label$break$L4 (result i32)
@@ -869,7 +869,7 @@
    )
   )
  )
- (func $drop-tee-unreachable
+ (func $drop-tee-unreachable (type $FUNCSIG$v)
   (local $x i32)
   (local.tee $x
    (unreachable)
@@ -878,7 +878,7 @@
    (local.get $x)
   )
  )
- (func $if-return-but-unreachable (param $var$0 i64)
+ (func $if-return-but-unreachable (type $i64_=>_none) (param $var$0 i64)
   (if
    (unreachable)
    (drop
@@ -889,7 +889,7 @@
    )
   )
  )
- (func $if-one-side (result i32)
+ (func $if-one-side (type $FUNCSIG$i) (result i32)
   (local $x i32)
   (nop)
   (local.tee $x
@@ -903,7 +903,7 @@
    )
   )
  )
- (func $if-one-side-undo (result i32)
+ (func $if-one-side-undo (type $FUNCSIG$i) (result i32)
   (local $x i32)
   (local $y i32)
   (local.set $y
@@ -921,7 +921,7 @@
   )
   (local.get $y)
  )
- (func $if-one-side-multi (param $0 i32) (result i32)
+ (func $if-one-side-multi (type $5) (param $0 i32) (result i32)
   (nop)
   (local.tee $0
    (if (result i32)
@@ -950,7 +950,7 @@
    )
   )
  )
- (func $if-one-side-undo-but-its-a-tee (param $0 i32) (result i32)
+ (func $if-one-side-undo-but-its-a-tee (type $5) (param $0 i32) (result i32)
   (local $1 i32)
   (local $2 i32)
   (local $3 i32)
@@ -1029,7 +1029,7 @@
   )
   (i32.const 0)
  )
- (func $splittable-ifs-multicycle (param $20 i32) (result i32)
+ (func $splittable-ifs-multicycle (type $5) (param $20 i32) (result i32)
   (nop)
   (local.tee $20
    (if (result i32)
@@ -1047,7 +1047,7 @@
    )
   )
  )
- (func $update-getCounter (param $0 i32) (param $1 f64) (param $2 f64) (param $3 f32) (param $4 i32) (result f64)
+ (func $update-getCounter (type $i32_f64_f64_f32_i32_=>_f64) (param $0 i32) (param $1 f64) (param $2 f64) (param $3 f32) (param $4 i32) (result f64)
   (global.set $global$0
    (i32.sub
     (global.get $global$0)
@@ -1131,7 +1131,7 @@
  (import "fuzzing-support" "log3" (func $fimport$2 (param f32)))
  (global $global$0 (mut i32) (i32.const 10))
  (memory $0 (shared 256 256))
- (func $nonatomics (result i32)
+ (func $nonatomics (type $FUNCSIG$i) (result i32)
   (local $x i32)
   (nop)
   (drop
@@ -1143,7 +1143,7 @@
    (i32.const 1024)
   )
  )
- (func $nonatomic-growmem (result i32)
+ (func $nonatomic-growmem (type $FUNCSIG$i) (result i32)
   (local $x i32)
   (local.set $x
    (i32.load
@@ -1159,7 +1159,7 @@
   )
   (local.get $x)
  )
- (func $atomics
+ (func $atomics (type $FUNCSIG$v)
   (local $x i32)
   (local.set $x
    (i32.atomic.load
@@ -1175,7 +1175,7 @@
    (local.get $x)
   )
  )
- (func $one-atomic
+ (func $one-atomic (type $FUNCSIG$v)
   (local $x i32)
   (local.set $x
    (i32.load
@@ -1191,7 +1191,7 @@
    (local.get $x)
   )
  )
- (func $other-atomic
+ (func $other-atomic (type $FUNCSIG$v)
   (local $x i32)
   (local.set $x
    (i32.atomic.load
@@ -1207,7 +1207,7 @@
    (local.get $x)
   )
  )
- (func $atomic-growmem (result i32)
+ (func $atomic-growmem (type $FUNCSIG$i) (result i32)
   (local $x i32)
   (local.set $x
    (i32.load
@@ -1223,7 +1223,7 @@
   )
   (local.get $x)
  )
- (func $atomicrmw
+ (func $atomicrmw (type $FUNCSIG$v)
   (local $x i32)
   (local.set $x
    (i32.atomic.rmw.add
@@ -1240,7 +1240,7 @@
    (local.get $x)
   )
  )
- (func $atomic-cmpxchg
+ (func $atomic-cmpxchg (type $FUNCSIG$v)
   (local $x i32)
   (local.set $x
    (i32.atomic.rmw.cmpxchg
@@ -1258,7 +1258,7 @@
    (local.get $x)
   )
  )
- (func $br-value-reordering (result i32)
+ (func $br-value-reordering (type $FUNCSIG$i) (result i32)
   (local $temp i32)
   (block $outside
    (loop $loop
@@ -1281,7 +1281,7 @@
   )
   (unreachable)
  )
- (func $br-value-reordering-safe (result i32)
+ (func $br-value-reordering-safe (type $FUNCSIG$i) (result i32)
   (local $temp i32)
   (local.set $temp
    (block $outside (result i32)
@@ -1307,7 +1307,7 @@
   )
   (unreachable)
  )
- (func $if-one-side-unreachable
+ (func $if-one-side-unreachable (type $FUNCSIG$v)
   (local $x i32)
   (block $out
    (drop
@@ -1343,7 +1343,7 @@
    )
   )
  )
- (func $if-one-side-unreachable-blocks
+ (func $if-one-side-unreachable-blocks (type $FUNCSIG$v)
   (local $x i32)
   (local $y i32)
   (block $out
@@ -1394,7 +1394,7 @@
    )
   )
  )
- (func $loop-value (param $x i32) (result i32)
+ (func $loop-value (type $5) (param $x i32) (result i32)
   (loop $loopy
    (unreachable)
   )
@@ -1404,7 +1404,7 @@
    (i32.const 1)
   )
  )
- (func $loop-loop-loopy-value (param $x i32) (result i32)
+ (func $loop-loop-loopy-value (type $5) (param $x i32) (result i32)
   (nop)
   (loop $loopy1 (result i32)
    (nop)
@@ -1417,7 +1417,7 @@
    )
   )
  )
- (func $loop-modified-during-main-pass-be-careful-fuzz (result i32)
+ (func $loop-modified-during-main-pass-be-careful-fuzz (type $FUNCSIG$i) (result i32)
   (local $0 i32)
   (nop)
   (if (result i32)
@@ -1434,11 +1434,11 @@
    )
   )
  )
- (func $loop-later (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (param $var$3 i32) (param $var$4 i32) (result i32)
+ (func $loop-later (type $FUNCSIG$iiiiii) (param $var$0 i32) (param $var$1 i32) (param $var$2 i32) (param $var$3 i32) (param $var$4 i32) (result i32)
   (nop)
   (i32.const 0)
  )
- (func $pick
+ (func $pick (type $FUNCSIG$v)
   (local $x i32)
   (local $y i32)
   (local.set $x
@@ -1461,7 +1461,7 @@
    (local.get $y)
   )
  )
- (func $pick-2
+ (func $pick-2 (type $FUNCSIG$v)
   (local $x i32)
   (local $y i32)
   (local.set $y
@@ -1484,7 +1484,7 @@
    (local.get $x)
   )
  )
- (func $many
+ (func $many (type $FUNCSIG$v)
   (local $x i32)
   (local $y i32)
   (local $z i32)
@@ -1555,7 +1555,7 @@
    (local.get $x)
   )
  )
- (func $loop-copies (param $x i32) (param $y i32)
+ (func $loop-copies (type $i32_i32_=>_none) (param $x i32) (param $y i32)
   (loop $loop
    (nop)
    (drop
@@ -1566,7 +1566,7 @@
    )
   )
  )
- (func $proper-type (result f64)
+ (func $proper-type (type $none_=>_f64) (result f64)
   (local $var$0 i32)
   (local $var$2 f64)
   (local.set $var$0
@@ -1578,7 +1578,7 @@
   )
   (local.get $var$2)
  )
- (func $multi-pass-get-equivs-right (param $var$0 i32) (param $var$1 i32) (result f64)
+ (func $multi-pass-get-equivs-right (type $i32_i32_=>_f64) (param $var$0 i32) (param $var$1 i32) (result f64)
   (local $var$2 i32)
   (nop)
   (i32.store
@@ -1591,7 +1591,7 @@
    )
   )
  )
- (func $if-value-structure-equivalent (param $x i32) (result i32)
+ (func $if-value-structure-equivalent (type $5) (param $x i32) (result i32)
   (local $y i32)
   (nop)
   (local.tee $x
@@ -1609,7 +1609,7 @@
    )
   )
  )
- (func $set-tee-need-one-of-them (param $var$0 i32) (param $var$1 i32) (result i32)
+ (func $set-tee-need-one-of-them (type $i32_i32_=>_i32) (param $var$0 i32) (param $var$1 i32) (result i32)
   (local $var$2 i32)
   (local $var$3 i32)
   (local.set $var$2
@@ -1622,7 +1622,7 @@
   )
   (local.get $var$2)
  )
- (func $loop-value-harder (result i32)
+ (func $loop-value-harder (type $FUNCSIG$i) (result i32)
   (local $0 i32)
   (local $1 i32)
   (local $2 i32)
@@ -1675,7 +1675,7 @@
    (i32.const -5417091)
   )
  )
- (func $tee-chain (param $x i32) (param $z i32) (param $t1 i32) (param $t2 i32) (param $t3 i32) (result i32)
+ (func $tee-chain (type $FUNCSIG$iiiiii) (param $x i32) (param $z i32) (param $t1 i32) (param $t2 i32) (param $t3 i32) (result i32)
   (nop)
   (drop
    (i32.const 10)
@@ -1709,7 +1709,7 @@
  (type $none_=>_none (func))
  (memory $0 256 256)
  (data "hello, there!")
- (func $memory-init-load
+ (func $memory-init-load (type $none_=>_none)
   (local $x i32)
   (local.set $x
    (i32.load
@@ -1725,7 +1725,7 @@
    (local.get $x)
   )
  )
- (func $memory-init-store
+ (func $memory-init-store (type $none_=>_none)
   (local $x i32)
   (local.set $x
    (block (result i32)
@@ -1745,7 +1745,7 @@
    (local.get $x)
   )
  )
- (func $memory-copy-load
+ (func $memory-copy-load (type $none_=>_none)
   (local $x i32)
   (local.set $x
    (i32.load
@@ -1761,7 +1761,7 @@
    (local.get $x)
   )
  )
- (func $memory-copy-store
+ (func $memory-copy-store (type $none_=>_none)
   (local $x i32)
   (local.set $x
    (block (result i32)
@@ -1781,7 +1781,7 @@
    (local.get $x)
   )
  )
- (func $memory-fill-load
+ (func $memory-fill-load (type $none_=>_none)
   (local $x i32)
   (local.set $x
    (i32.load
@@ -1797,7 +1797,7 @@
    (local.get $x)
   )
  )
- (func $memory-fill-store
+ (func $memory-fill-store (type $none_=>_none)
   (local $x i32)
   (local.set $x
    (block (result i32)
@@ -1817,7 +1817,7 @@
    (local.get $x)
   )
  )
- (func $data-drop-load
+ (func $data-drop-load (type $none_=>_none)
   (local $x i32)
   (local.set $x
    (i32.load
@@ -1829,7 +1829,7 @@
    (local.get $x)
   )
  )
- (func $data-drop-store
+ (func $data-drop-store (type $none_=>_none)
   (local $x i32)
   (local.set $x
    (block (result i32)
@@ -1845,7 +1845,7 @@
    (local.get $x)
   )
  )
- (func $data-drop-memory-init
+ (func $data-drop-memory-init (type $none_=>_none)
   (local $x i32)
   (local.set $x
    (block (result i32)
@@ -1865,7 +1865,7 @@
 )
 (module
  (type $none_=>_anyref (func (result anyref)))
- (func $subtype-test (result anyref)
+ (func $subtype-test (type $none_=>_anyref) (result anyref)
   (local $0 i31ref)
   (local $1 anyref)
   (local $2 anyref)