[Parser] Update requirements for implicit type uses (#6665)

As an abbreviation, a `typeuse` can be given as just a list of parameters and
results, in which case it corresponds to the index of the first function type
with the same parameters and results. That function type must also be an MVP
function type, i.e. it cannot have a nontrivial rec group, be non-final, or have
a declared supertype. The parser did not previously implement all of these rules.

3 files changed, 227 insertions, 225 deletions

diff --git a/test/lit/passes/optimize-instructions-gc.wast b/test/lit/passes/optimize-instructions-gc.wast
index ce4f2cedb..14db70f3b 100644
--- a/test/lit/passes/optimize-instructions-gc.wast
+++ b/test/lit/passes/optimize-instructions-gc.wast
@@ -22,13 +22,13 @@
   ;; CHECK:      (type $B (sub $A (struct (field i32) (field i32) (field f32))))
   (type $B (sub $A (struct (field i32) (field i32) (field f32))))
 
-  ;; CHECK:      (type $void (sub (func)))
-
   ;; CHECK:      (type $B-child (sub $B (struct (field i32) (field i32) (field f32) (field i64))))
   (type $B-child (sub $B (struct (field i32) (field i32) (field f32) (field i64))))
 
   (type $empty (struct))
 
+  ;; CHECK:      (type $void (sub (func)))
+
   ;; CHECK:      (type $void2 (sub $void (func)))
 
   ;; CHECK:      (type $C (sub $A (struct (field i32) (field i32) (field f64))))
@@ -50,7 +50,7 @@
 
   ;; These functions test if an `if` with subtyped arms is correctly folded
   ;; 1. if its `ifTrue` and `ifFalse` arms are identical (can fold)
-  ;; CHECK:      (func $if-arms-subtype-fold (type $27) (result anyref)
+  ;; CHECK:      (func $if-arms-subtype-fold (type $28) (result anyref)
   ;; CHECK-NEXT:  (ref.null none)
   ;; CHECK-NEXT: )
   (func $if-arms-subtype-fold (result anyref)
@@ -65,7 +65,7 @@
     )
   )
   ;; 2. if its `ifTrue` and `ifFalse` arms are not identical (cannot fold)
-  ;; CHECK:      (func $if-arms-subtype-nofold (type $28) (param $i31ref i31ref) (result anyref)
+  ;; CHECK:      (func $if-arms-subtype-nofold (type $29) (param $i31ref i31ref) (result anyref)
   ;; CHECK-NEXT:  (if (result anyref)
   ;; CHECK-NEXT:   (i32.const 0)
   ;; CHECK-NEXT:   (then
@@ -122,7 +122,7 @@
   )
 
   ;; Similar, but for arrays.
-  ;; CHECK:      (func $store-trunc2 (type $14) (param $x (ref null $array))
+  ;; CHECK:      (func $store-trunc2 (type $15) (param $x (ref null $array))
   ;; CHECK-NEXT:  (array.set $array
   ;; CHECK-NEXT:   (local.get $x)
   ;; CHECK-NEXT:   (i32.const 0)
@@ -139,7 +139,7 @@
 
   ;; ref.is_null is not needed on a non-nullable value, and if something is
   ;; cast to its own type, we don't need that either, etc.
-  ;; CHECK:      (func $unneeded_test (type $15) (param $struct (ref $struct)) (param $func (ref func)) (param $i31 (ref i31))
+  ;; CHECK:      (func $unneeded_test (type $16) (param $struct (ref $struct)) (param $func (ref func)) (param $i31 (ref i31))
   ;; CHECK-NEXT:  (drop
   ;; CHECK-NEXT:   (block (result i32)
   ;; CHECK-NEXT:    (drop
@@ -182,7 +182,7 @@
 
   ;; similar to $unneeded_is, but the values are nullable. we can at least
   ;; leave just the null check.
-  ;; CHECK:      (func $unneeded_test_null (type $16) (param $struct (ref null $struct)) (param $func funcref) (param $i31 i31ref)
+  ;; CHECK:      (func $unneeded_test_null (type $17) (param $struct (ref null $struct)) (param $func funcref) (param $i31 i31ref)
   ;; CHECK-NEXT:  (drop
   ;; CHECK-NEXT:   (ref.is_null
   ;; CHECK-NEXT:    (local.get $struct)
@@ -223,7 +223,7 @@
 
   ;; ref.as_non_null is not needed on a non-nullable value, and if something is
   ;; a func we don't need that either etc., and can just return the value.
-  ;; CHECK:      (func $unneeded_cast (type $15) (param $struct (ref $struct)) (param $func (ref func)) (param $i31 (ref i31))
+  ;; CHECK:      (func $unneeded_cast (type $16) (param $struct (ref $struct)) (param $func (ref func)) (param $i31 (ref i31))
   ;; CHECK-NEXT:  (drop
   ;; CHECK-NEXT:   (local.get $struct)
   ;; CHECK-NEXT:  )
@@ -251,7 +251,7 @@
 
   ;; similar to $unneeded_cast, but the values are nullable. we can turn the
   ;; more specific things into ref.as_non_null.
-  ;; CHECK:      (func $unneeded_cast_null (type $16) (param $struct (ref null $struct)) (param $func funcref) (param $i31 i31ref)
+  ;; CHECK:      (func $unneeded_cast_null (type $17) (param $struct (ref null $struct)) (param $func funcref) (param $i31 i31ref)
   ;; CHECK-NEXT:  (drop
   ;; CHECK-NEXT:   (ref.as_non_null
   ;; CHECK-NEXT:    (local.get $struct)
@@ -283,7 +283,7 @@
     )
   )
 
-  ;; CHECK:      (func $unneeded_unreachability (type $void)
+  ;; CHECK:      (func $unneeded_unreachability (type $5)
   ;; CHECK-NEXT:  (drop
   ;; CHECK-NEXT:   (ref.test (ref func)
   ;; CHECK-NEXT:    (unreachable)
@@ -308,7 +308,7 @@
     )
   )
 
-  ;; CHECK:      (func $redundant-non-null-casts (type $29) (param $x (ref null $struct)) (param $y (ref null $array)) (param $f (ref null $void))
+  ;; CHECK:      (func $redundant-non-null-casts (type $30) (param $x (ref null $struct)) (param $y (ref null $array)) (param $f (ref null $void))
   ;; CHECK-NEXT:  (drop
   ;; CHECK-NEXT:   (ref.as_non_null
   ;; CHECK-NEXT:    (local.get $x)
@@ -395,7 +395,7 @@
     )
   )
 
-  ;; CHECK:      (func $get-eqref (type $30) (result eqref)
+  ;; CHECK:      (func $get-eqref (type $31) (result eqref)
   ;; CHECK-NEXT:  (unreachable)
   ;; CHECK-NEXT: )
   (func $get-eqref (result eqref)
@@ -471,12 +471,12 @@
     )
   )
 
-  ;; CHECK:      (func $nothing (type $void)
+  ;; CHECK:      (func $nothing (type $5)
   ;; CHECK-NEXT:  (nop)
   ;; CHECK-NEXT: )
   (func $nothing)
 
-  ;; CHECK:      (func $ref-eq-corner-cases (type $5) (param $x eqref)
+  ;; CHECK:      (func $ref-eq-corner-cases (type $4) (param $x eqref)
   ;; CHECK-NEXT:  (drop
   ;; CHECK-NEXT:   (ref.eq
   ;; CHECK-NEXT:    (block (result eqref)
@@ -563,7 +563,7 @@
     )
   )
 
-  ;; CHECK:      (func $ref-eq-ref-cast (type $5) (param $x eqref)
+  ;; CHECK:      (func $ref-eq-ref-cast (type $4) (param $x eqref)
   ;; CHECK-NEXT:  (drop
   ;; CHECK-NEXT:   (ref.eq
   ;; CHECK-NEXT:    (local.get $x)
@@ -586,7 +586,7 @@
     )
   )
 
-  ;; CHECK:      (func $flip-cast-of-as-non-null (type $17) (param $x anyref)
+  ;; CHECK:      (func $flip-cast-of-as-non-null (type $18) (param $x anyref)
   ;; CHECK-NEXT:  (drop
   ;; CHECK-NEXT:   (ref.cast (ref $struct)
   ;; CHECK-NEXT:    (local.get $x)
@@ -639,7 +639,7 @@
       )
     )
   )
-  ;; CHECK:      (func $flip-tee-of-as-non-null (type $17) (param $x anyref)
+  ;; CHECK:      (func $flip-tee-of-as-non-null (type $18) (param $x anyref)
   ;; CHECK-NEXT:  (drop
   ;; CHECK-NEXT:   (ref.as_non_null
   ;; CHECK-NEXT:    (local.tee $x
@@ -659,7 +659,7 @@
     )
   )
 
-  ;; CHECK:      (func $flip-tee-of-as-non-null-non-nullable (type $31) (param $x (ref any)) (param $y anyref)
+  ;; CHECK:      (func $flip-tee-of-as-non-null-non-nullable (type $32) (param $x (ref any)) (param $y anyref)
   ;; CHECK-NEXT:  (drop
   ;; CHECK-NEXT:   (local.tee $x
   ;; CHECK-NEXT:    (ref.as_non_null
@@ -680,7 +680,7 @@
       )
     )
   )
-  ;; CHECK:      (func $ternary-identical-arms (type $32) (param $x i32) (param $y (ref null $struct)) (param $z (ref null $struct))
+  ;; CHECK:      (func $ternary-identical-arms (type $33) (param $x i32) (param $y (ref null $struct)) (param $z (ref null $struct))
   ;; CHECK-NEXT:  (drop
   ;; CHECK-NEXT:   (ref.is_null
   ;; CHECK-NEXT:    (if (result (ref null $struct))
@@ -708,7 +708,7 @@
       )
     )
   )
-  ;; CHECK:      (func $select-identical-arms-but-side-effect (type $18) (param $x (ref null $struct)) (param $y (ref null $struct)) (param $z i32)
+  ;; CHECK:      (func $select-identical-arms-but-side-effect (type $19) (param $x (ref null $struct)) (param $y (ref null $struct)) (param $z i32)
   ;; CHECK-NEXT:  (drop
   ;; CHECK-NEXT:   (select
   ;; CHECK-NEXT:    (struct.get_u $struct $i8
@@ -735,7 +735,7 @@
       )
     )
   )
-  ;; CHECK:      (func $ternary-identical-arms-no-side-effect (type $33) (param $x (ref $struct)) (param $y (ref $struct)) (param $z i32)
+  ;; CHECK:      (func $ternary-identical-arms-no-side-effect (type $34) (param $x (ref $struct)) (param $y (ref $struct)) (param $z i32)
   ;; CHECK-NEXT:  (drop
   ;; CHECK-NEXT:   (struct.get_u $struct $i8
   ;; CHECK-NEXT:    (select (result (ref $struct))
@@ -760,7 +760,7 @@
       )
     )
   )
-  ;; CHECK:      (func $if-identical-arms-with-side-effect (type $18) (param $x (ref null $struct)) (param $y (ref null $struct)) (param $z i32)
+  ;; CHECK:      (func $if-identical-arms-with-side-effect (type $19) (param $x (ref null $struct)) (param $y (ref null $struct)) (param $z i32)
   ;; CHECK-NEXT:  (drop
   ;; CHECK-NEXT:   (struct.get_u $struct $i8
   ;; CHECK-NEXT:    (if (result (ref null $struct))
@@ -795,7 +795,7 @@
     )
   )
 
-  ;; CHECK:      (func $ref-cast-squared (type $5) (param $x eqref)
+  ;; CHECK:      (func $ref-cast-squared (type $4) (param $x eqref)
   ;; CHECK-NEXT:  (drop
   ;; CHECK-NEXT:   (ref.cast (ref null $struct)
   ;; CHECK-NEXT:    (local.get $x)
@@ -812,7 +812,7 @@
       )
     )
   )
-  ;; CHECK:      (func $ref-cast-squared-fallthrough (type $5) (param $x eqref)
+  ;; CHECK:      (func $ref-cast-squared-fallthrough (type $4) (param $x eqref)
   ;; CHECK-NEXT:  (local $1 (ref null $struct))
   ;; CHECK-NEXT:  (drop
   ;; CHECK-NEXT:   (block (result (ref null $struct))
@@ -841,7 +841,7 @@
       )
     )
   )
-  ;; CHECK:      (func $ref-cast-cubed (type $5) (param $x eqref)
+  ;; CHECK:      (func $ref-cast-cubed (type $4) (param $x eqref)
   ;; CHECK-NEXT:  (drop
   ;; CHECK-NEXT:   (ref.cast (ref null $struct)
   ;; CHECK-NEXT:    (local.get $x)
@@ -860,7 +860,7 @@
       )
     )
   )
-  ;; CHECK:      (func $ref-cast-squared-different (type $5) (param $x eqref)
+  ;; CHECK:      (func $ref-cast-squared-different (type $4) (param $x eqref)
   ;; CHECK-NEXT:  (drop
   ;; CHECK-NEXT:   (ref.cast nullref
   ;; CHECK-NEXT:    (local.get $x)
@@ -879,7 +879,7 @@
     )
   )
 
-  ;; CHECK:      (func $ref-eq-null (type $5) (param $x eqref)
+  ;; CHECK:      (func $ref-eq-null (type $4) (param $x eqref)
   ;; CHECK-NEXT:  (drop
   ;; CHECK-NEXT:   (ref.is_null
   ;; CHECK-NEXT:    (local.get $x)
@@ -1087,7 +1087,7 @@
     )
   )
 
-  ;; CHECK:      (func $hoist-LUB-danger (type $34) (param $x i32) (param $b (ref $B)) (param $c (ref $C)) (result i32)
+  ;; CHECK:      (func $hoist-LUB-danger (type $35) (param $x i32) (param $b (ref $B)) (param $c (ref $C)) (result i32)
   ;; CHECK-NEXT:  (if (result i32)
   ;; CHECK-NEXT:   (local.get $x)
   ;; CHECK-NEXT:   (then
@@ -1126,7 +1126,7 @@
     )
   )
 
-  ;; CHECK:      (func $incompatible-cast-of-non-null (type $35) (param $struct (ref $struct))
+  ;; CHECK:      (func $incompatible-cast-of-non-null (type $36) (param $struct (ref $struct))
   ;; CHECK-NEXT:  (drop
   ;; CHECK-NEXT:   (block (result (ref none))
   ;; CHECK-NEXT:    (drop
@@ -1244,7 +1244,7 @@
     )
   )
 
-  ;; CHECK:      (func $subtype-compatible (type $20) (param $A (ref null $A)) (param $B (ref null $B))
+  ;; CHECK:      (func $subtype-compatible (type $21) (param $A (ref null $A)) (param $B (ref null $B))
   ;; CHECK-NEXT:  (drop
   ;; CHECK-NEXT:   (ref.test (ref $B)
   ;; CHECK-NEXT:    (local.get $A)
@@ -1324,7 +1324,7 @@
     )
   )
 
-  ;; CHECK:      (func $compatible-test-separate-fallthrough (type $11) (param $eqref eqref) (result i32)
+  ;; CHECK:      (func $compatible-test-separate-fallthrough (type $12) (param $eqref eqref) (result i32)
   ;; CHECK-NEXT:  (drop
   ;; CHECK-NEXT:   (local.tee $eqref
   ;; CHECK-NEXT:    (block (result eqref)
@@ -1358,7 +1358,7 @@
     )
   )
 
-  ;; CHECK:      (func $improvable-test-separate-fallthrough (type $11) (param $eqref eqref) (result i32)
+  ;; CHECK:      (func $improvable-test-separate-fallthrough (type $12) (param $eqref eqref) (result i32)
   ;; CHECK-NEXT:  (ref.test (ref i31)
   ;; CHECK-NEXT:   (block (result eqref)
   ;; CHECK-NEXT:    (ref.as_non_null
@@ -1379,7 +1379,7 @@
     )
   )
 
-  ;; CHECK:      (func $incompatible-test-separate-fallthrough (type $11) (param $eqref eqref) (result i32)
+  ;; CHECK:      (func $incompatible-test-separate-fallthrough (type $12) (param $eqref eqref) (result i32)
   ;; CHECK-NEXT:  (drop
   ;; CHECK-NEXT:   (local.tee $eqref
   ;; CHECK-NEXT:    (block (result eqref)
@@ -1538,7 +1538,7 @@
     )
   )
 
-  ;; CHECK:      (func $ref.test-unreachable (type $36) (param $A (ref null $A))
+  ;; CHECK:      (func $ref.test-unreachable (type $37) (param $A (ref null $A))
   ;; CHECK-NEXT:  (drop
   ;; CHECK-NEXT:   (ref.test (ref $A)
   ;; CHECK-NEXT:    (unreachable)
@@ -1565,7 +1565,7 @@
     )
   )
 
-  ;; CHECK:      (func $ref-cast-static-null (type $void)
+  ;; CHECK:      (func $ref-cast-static-null (type $5)
   ;; CHECK-NEXT:  (local $a (ref null $A))
   ;; CHECK-NEXT:  (drop
   ;; CHECK-NEXT:   (ref.null none)
@@ -1661,7 +1661,7 @@
     )
   )
 
-  ;; CHECK:      (func $ref-cast-static-general (type $20) (param $a (ref null $A)) (param $b (ref null $B))
+  ;; CHECK:      (func $ref-cast-static-general (type $21) (param $a (ref null $A)) (param $b (ref null $B))
   ;; CHECK-NEXT:  (drop
   ;; CHECK-NEXT:   (local.get $a)
   ;; CHECK-NEXT:  )
@@ -1708,7 +1708,7 @@
     )
   )
 
-  ;; CHECK:      (func $ref-cast-static-squared (type $5) (param $x eqref)
+  ;; CHECK:      (func $ref-cast-static-squared (type $4) (param $x eqref)
   ;; CHECK-NEXT:  (drop
   ;; CHECK-NEXT:   (ref.cast (ref null $A)
   ;; CHECK-NEXT:    (local.get $x)
@@ -1751,7 +1751,7 @@
     )
   )
 
-  ;; CHECK:      (func $ref-cast-static-many (type $5) (param $x eqref)
+  ;; CHECK:      (func $ref-cast-static-many (type $4) (param $x eqref)
   ;; CHECK-NEXT:  (drop
   ;; CHECK-NEXT:   (ref.cast (ref null $B-child)
   ;; CHECK-NEXT:    (local.get $x)
@@ -1842,7 +1842,7 @@
     )
   )
 
-  ;; CHECK:      (func $ref-cast-static-very-many (type $5) (param $x eqref)
+  ;; CHECK:      (func $ref-cast-static-very-many (type $4) (param $x eqref)
   ;; CHECK-NEXT:  (drop
   ;; CHECK-NEXT:   (ref.cast (ref null $B-child)
   ;; CHECK-NEXT:    (local.get $x)
@@ -1880,7 +1880,7 @@
     )
   )
 
-  ;; CHECK:      (func $ref-cast-static-fallthrough-remaining (type $5) (param $x eqref)
+  ;; CHECK:      (func $ref-cast-static-fallthrough-remaining (type $4) (param $x eqref)
   ;; CHECK-NEXT:  (drop
   ;; CHECK-NEXT:   (block (result (ref null $B))
   ;; CHECK-NEXT:    (call $ref-cast-static-fallthrough-remaining
@@ -1915,7 +1915,7 @@
     )
   )
 
-  ;; CHECK:      (func $ref-cast-static-fallthrough-remaining-child (type $5) (param $x eqref)
+  ;; CHECK:      (func $ref-cast-static-fallthrough-remaining-child (type $4) (param $x eqref)
   ;; CHECK-NEXT:  (drop
   ;; CHECK-NEXT:   (ref.cast (ref null $B)
   ;; CHECK-NEXT:    (block (result eqref)
@@ -1947,7 +1947,7 @@
     )
   )
 
-  ;; CHECK:      (func $ref-cast-static-fallthrough-remaining-impossible (type $21) (param $x (ref eq))
+  ;; CHECK:      (func $ref-cast-static-fallthrough-remaining-impossible (type $22) (param $x (ref eq))
   ;; CHECK-NEXT:  (drop
   ;; CHECK-NEXT:   (block
   ;; CHECK-NEXT:    (drop
@@ -1982,7 +1982,7 @@
     )
   )
 
-  ;; CHECK:      (func $ref-cast-static-fallthrough-remaining-nonnull (type $21) (param $x (ref eq))
+  ;; CHECK:      (func $ref-cast-static-fallthrough-remaining-nonnull (type $22) (param $x (ref eq))
   ;; CHECK-NEXT:  (local $1 (ref $B))
   ;; CHECK-NEXT:  (drop
   ;; CHECK-NEXT:   (block (result (ref $B))
@@ -2021,7 +2021,7 @@
     )
   )
 
-  ;; CHECK:      (func $ref-cast-static-squared-impossible (type $5) (param $x eqref)
+  ;; CHECK:      (func $ref-cast-static-squared-impossible (type $4) (param $x eqref)
   ;; CHECK-NEXT:  (drop
   ;; CHECK-NEXT:   (ref.cast nullref
   ;; CHECK-NEXT:    (local.get $x)
@@ -2091,7 +2091,7 @@
     )
   )
 
-  ;; CHECK:      (func $ref-test-static-same-type (type $22) (param $nullable (ref null $A)) (param $non-nullable (ref $A))
+  ;; CHECK:      (func $ref-test-static-same-type (type $23) (param $nullable (ref null $A)) (param $non-nullable (ref $A))
   ;; CHECK-NEXT:  (drop
   ;; CHECK-NEXT:   (i32.eqz
   ;; CHECK-NEXT:    (ref.is_null
@@ -2124,7 +2124,7 @@
     )
   )
 
-  ;; CHECK:      (func $ref-test-static-subtype (type $12) (param $nullable (ref null $B)) (param $non-nullable (ref $B))
+  ;; CHECK:      (func $ref-test-static-subtype (type $13) (param $nullable (ref null $B)) (param $non-nullable (ref $B))
   ;; CHECK-NEXT:  (drop
   ;; CHECK-NEXT:   (i32.eqz
   ;; CHECK-NEXT:    (ref.is_null
@@ -2155,7 +2155,7 @@
     )
   )
 
-  ;; CHECK:      (func $ref-test-static-supertype (type $22) (param $nullable (ref null $A)) (param $non-nullable (ref $A))
+  ;; CHECK:      (func $ref-test-static-supertype (type $23) (param $nullable (ref null $A)) (param $non-nullable (ref $A))
   ;; CHECK-NEXT:  (drop
   ;; CHECK-NEXT:   (ref.test (ref $B)
   ;; CHECK-NEXT:    (local.get $nullable)
@@ -2182,7 +2182,7 @@
     )
   )
 
-  ;; CHECK:      (func $ref-test-static-impossible (type $37) (param $nullable (ref null $array)) (param $non-nullable (ref $array))
+  ;; CHECK:      (func $ref-test-static-impossible (type $38) (param $nullable (ref null $array)) (param $non-nullable (ref $array))
   ;; CHECK-NEXT:  (drop
   ;; CHECK-NEXT:   (block (result i32)
   ;; CHECK-NEXT:    (drop
@@ -2262,14 +2262,14 @@
     )
   )
 
-  ;; CHECK:      (func $impossible (type $38) (result (ref none))
+  ;; CHECK:      (func $impossible (type $39) (result (ref none))
   ;; CHECK-NEXT:  (unreachable)
   ;; CHECK-NEXT: )
   (func $impossible (result (ref none))
     (unreachable)
   )
 
-  ;; CHECK:      (func $bottom-type-accessors (type $39) (param $bot (ref none)) (param $null nullref)
+  ;; CHECK:      (func $bottom-type-accessors (type $40) (param $bot (ref none)) (param $null nullref)
   ;; CHECK-NEXT:  (drop
   ;; CHECK-NEXT:   (unreachable)
   ;; CHECK-NEXT:  )
@@ -2311,7 +2311,7 @@
     )
   )
 
-  ;; CHECK:      (func $ref-cast-heap-type (type $12) (param $null-b (ref null $B)) (param $b (ref $B))
+  ;; CHECK:      (func $ref-cast-heap-type (type $13) (param $null-b (ref null $B)) (param $b (ref $B))
   ;; CHECK-NEXT:  (drop
   ;; CHECK-NEXT:   (local.get $b)
   ;; CHECK-NEXT:  )
@@ -2358,7 +2358,7 @@
     )
   )
 
-  ;; CHECK:      (func $ref-cast-heap-type-incompatible (type $12) (param $null-b (ref null $B)) (param $b (ref $B))
+  ;; CHECK:      (func $ref-cast-heap-type-incompatible (type $13) (param $null-b (ref null $B)) (param $b (ref $B))
   ;; CHECK-NEXT:  (drop
   ;; CHECK-NEXT:   (block (result (ref none))
   ;; CHECK-NEXT:    (drop
@@ -2417,7 +2417,7 @@
     )
   )
 
-  ;; CHECK:      (func $compatible-cast-separate-fallthrough (type $23) (param $eqref eqref) (result (ref i31))
+  ;; CHECK:      (func $compatible-cast-separate-fallthrough (type $24) (param $eqref eqref) (result (ref i31))
   ;; CHECK-NEXT:  (local $1 i31ref)
   ;; CHECK-NEXT:  (drop
   ;; CHECK-NEXT:   (local.tee $eqref
@@ -2457,7 +2457,7 @@
     )
   )
 
-  ;; CHECK:      (func $compatible-cast-fallthrough-null-check (type $23) (param $eqref eqref) (result (ref i31))
+  ;; CHECK:      (func $compatible-cast-fallthrough-null-check (type $24) (param $eqref eqref) (result (ref i31))
   ;; CHECK-NEXT:  (local $1 i31ref)
   ;; CHECK-NEXT:  (drop
   ;; CHECK-NEXT:   (local.tee $eqref
@@ -2489,7 +2489,7 @@
     )
   )
 
-  ;; CHECK:      (func $compatible-cast-separate-fallthrough-multiple-options-1 (type $24) (param $eqref eqref) (result (ref eq))
+  ;; CHECK:      (func $compatible-cast-separate-fallthrough-multiple-options-1 (type $25) (param $eqref eqref) (result (ref eq))
   ;; CHECK-NEXT:  (local $1 i31ref)
   ;; CHECK-NEXT:  (block $outer (result (ref eq))
   ;; CHECK-NEXT:   (block (result (ref i31))
@@ -2547,7 +2547,7 @@
     )
   )
 
-  ;; CHECK:      (func $compatible-cast-separate-fallthrough-multiple-options-2 (type $24) (param $eqref eqref) (result (ref eq))
+  ;; CHECK:      (func $compatible-cast-separate-fallthrough-multiple-options-2 (type $25) (param $eqref eqref) (result (ref eq))
   ;; CHECK-NEXT:  (local $1 (ref i31))
   ;; CHECK-NEXT:  (block $outer (result (ref eq))
   ;; CHECK-NEXT:   (block (result (ref i31))
@@ -2602,7 +2602,7 @@
     )
   )
 
-  ;; CHECK:      (func $incompatible-cast-separate-fallthrough (type $40) (param $eqref eqref) (result structref)
+  ;; CHECK:      (func $incompatible-cast-separate-fallthrough (type $41) (param $eqref eqref) (result structref)
   ;; CHECK-NEXT:  (drop
   ;; CHECK-NEXT:   (local.tee $eqref
   ;; CHECK-NEXT:    (block (result (ref i31))
@@ -2739,7 +2739,7 @@
     )
   )
 
-  ;; CHECK:      (func $as_of_unreachable (type $41) (result (ref $A))
+  ;; CHECK:      (func $as_of_unreachable (type $42) (result (ref $A))
   ;; CHECK-NEXT:  (unreachable)
   ;; CHECK-NEXT: )
   (func $as_of_unreachable (result (ref $A))
@@ -2753,7 +2753,7 @@
     )
   )
 
-  ;; CHECK:      (func $cast-internalized-extern (type $42) (param $externref externref)
+  ;; CHECK:      (func $cast-internalized-extern (type $43) (param $externref externref)
   ;; CHECK-NEXT:  (drop
   ;; CHECK-NEXT:   (ref.cast (ref $A)
   ;; CHECK-NEXT:    (extern.internalize
@@ -2775,7 +2775,7 @@
     )
   )
 
-  ;; CHECK:      (func $struct.set.null.fallthrough (type $void)
+  ;; CHECK:      (func $struct.set.null.fallthrough (type $5)
   ;; CHECK-NEXT:  (local $temp (ref null $struct))
   ;; CHECK-NEXT:  (block ;; (replaces unreachable StructSet we can't emit)
   ;; CHECK-NEXT:   (drop
@@ -2804,7 +2804,7 @@
     )
   )
 
-  ;; CHECK:      (func $set.array.null (type $void)
+  ;; CHECK:      (func $set.array.null (type $5)
   ;; CHECK-NEXT:  (local $temp (ref none))
   ;; CHECK-NEXT:  (block ;; (replaces unreachable ArraySet we can't emit)
   ;; CHECK-NEXT:   (drop
@@ -2862,7 +2862,7 @@
     )
   )
 
-  ;; CHECK:      (func $refinalize.select.arm.flip (type $void)
+  ;; CHECK:      (func $refinalize.select.arm.flip (type $5)
   ;; CHECK-NEXT:  (drop
   ;; CHECK-NEXT:   (ref.cast (ref $void2)
   ;; CHECK-NEXT:    (ref.func $refinalize.select.arm)
@@ -2882,7 +2882,7 @@
     )
   )
 
-  ;; CHECK:      (func $refinalize.select.arm.unknown (type $25) (param $x i32)
+  ;; CHECK:      (func $refinalize.select.arm.unknown (type $26) (param $x i32)
   ;; CHECK-NEXT:  (drop
   ;; CHECK-NEXT:   (ref.cast (ref $void2)
   ;; CHECK-NEXT:    (ref.func $refinalize.select.arm)
@@ -2902,7 +2902,7 @@
     )
   )
 
-  ;; CHECK:      (func $non-null-bottom-ref (type $43) (result (ref func))
+  ;; CHECK:      (func $non-null-bottom-ref (type $44) (result (ref func))
   ;; CHECK-NEXT:  (local $0 funcref)
   ;; CHECK-NEXT:  (drop
   ;; CHECK-NEXT:   (local.tee $0
@@ -2930,7 +2930,7 @@
     )
   )
 
-  ;; CHECK:      (func $non-null-bottom-cast (type $44) (result (ref nofunc))
+  ;; CHECK:      (func $non-null-bottom-cast (type $45) (result (ref nofunc))
   ;; CHECK-NEXT:  (drop
   ;; CHECK-NEXT:   (ref.func $non-null-bottom-cast)
   ;; CHECK-NEXT:  )
@@ -3000,7 +3000,7 @@
     )
   )
 
-  ;; CHECK:      (func $ref.test-fallthrough (type $void)
+  ;; CHECK:      (func $ref.test-fallthrough (type $5)
   ;; CHECK-NEXT:  (local $A (ref $A))
   ;; CHECK-NEXT:  (drop
   ;; CHECK-NEXT:   (ref.test (ref $B)
@@ -3088,7 +3088,7 @@
     )
   )
 
-  ;; CHECK:      (func $gc_to_unreachable_in_added_constants (type $void)
+  ;; CHECK:      (func $gc_to_unreachable_in_added_constants (type $5)
   ;; CHECK-NEXT:  (drop
   ;; CHECK-NEXT:   (i32.wrap_i64
   ;; CHECK-NEXT:    (i64.add
@@ -3129,7 +3129,7 @@
     (unreachable)
   )
 
-  ;; CHECK:      (func $array-copy-non-null (type $14) (param $x (ref null $array))
+  ;; CHECK:      (func $array-copy-non-null (type $15) (param $x (ref null $array))
   ;; CHECK-NEXT:  (block $block
   ;; CHECK-NEXT:   (array.copy $array $array
   ;; CHECK-NEXT:    (ref.as_non_null
@@ -3178,7 +3178,7 @@
     )
   )
 
-  ;; CHECK:      (func $struct.new (type $void)
+  ;; CHECK:      (func $struct.new (type $5)
   ;; CHECK-NEXT:  (drop
   ;; CHECK-NEXT:   (block (result (ref $struct))
   ;; CHECK-NEXT:    (drop
@@ -3263,7 +3263,7 @@
     )
   )
 
-  ;; CHECK:      (func $array.new (type $void)
+  ;; CHECK:      (func $array.new (type $5)
   ;; CHECK-NEXT:  (drop
   ;; CHECK-NEXT:   (block (result (ref $array))
   ;; CHECK-NEXT:    (drop
@@ -3332,7 +3332,7 @@
     )
   )
 
-  ;; CHECK:      (func $array.new_fixed (type $void)
+  ;; CHECK:      (func $array.new_fixed (type $5)
   ;; CHECK-NEXT:  (local $0 i32)
   ;; CHECK-NEXT:  (local $1 i32)
   ;; CHECK-NEXT:  (drop
@@ -3440,7 +3440,7 @@
     )
   )
 
-  ;; CHECK:      (func $array.new_fixed_fallthrough (type $void)
+  ;; CHECK:      (func $array.new_fixed_fallthrough (type $5)
   ;; CHECK-NEXT:  (local $0 i32)
   ;; CHECK-NEXT:  (local $1 i32)
   ;; CHECK-NEXT:  (local $2 i32)
@@ -3556,7 +3556,7 @@
     )
   )
 
-  ;; CHECK:      (func $array.new_fixed_fallthrough_local (type $25) (param $x i32)
+  ;; CHECK:      (func $array.new_fixed_fallthrough_local (type $26) (param $x i32)
   ;; CHECK-NEXT:  (local $1 i32)
   ;; CHECK-NEXT:  (local $2 i32)
   ;; CHECK-NEXT:  (local $3 i32)
diff --git a/test/lit/passes/type-generalizing.wast b/test/lit/passes/type-generalizing.wast
index 604561349..8278549d0 100644
--- a/test/lit/passes/type-generalizing.wast
+++ b/test/lit/passes/type-generalizing.wast
@@ -943,7 +943,9 @@
  (type $mid (sub $top (func (result eqref))))
  (type $bot (sub $mid (func (result i31ref))))
 
- ;; CHECK:      (func $call-ref-no-limit (type $top) (result anyref)
+ ;; CHECK:      (type $1 (func (result anyref)))
+
+ ;; CHECK:      (func $call-ref-no-limit (type $1) (result anyref)
  ;; CHECK-NEXT:  (local $f (ref null $top))
  ;; CHECK-NEXT:  (call_ref $top
  ;; CHECK-NEXT:   (local.get $f)
diff --git a/test/lit/wat-kitchen-sink.wast b/test/lit/wat-kitchen-sink.wast
index 527bfdd05..170c962aa 100644
--- a/test/lit/wat-kitchen-sink.wast
+++ b/test/lit/wat-kitchen-sink.wast
@@ -5,7 +5,7 @@
 (module $parse
  ;; types
 
- ;; CHECK:      (type $void (sub (func)))
+ ;; CHECK:      (type $0 (func))
 
  ;; CHECK:      (type $1 (func (result i32)))
 
@@ -17,19 +17,21 @@
 
   ;; CHECK:      (type $4 (func (result i32 i64)))
 
-  ;; CHECK:      (type $5 (func (param i32 i64)))
+  ;; CHECK:      (type $void (sub (func)))
+
+  ;; CHECK:      (type $6 (func (param i32 i64)))
 
   ;; CHECK:      (type $a2 (array (mut f32)))
 
   ;; CHECK:      (type $a1 (array i64))
 
-  ;; CHECK:      (type $8 (func (param anyref)))
+  ;; CHECK:      (type $9 (func (param anyref)))
 
   ;; CHECK:      (type $simple (func (param i32 i64) (result f32)))
 
   ;; CHECK:      (type $simple-cont (cont $simple))
 
-  ;; CHECK:      (type $11 (func (param i32 i64 v128)))
+  ;; CHECK:      (type $12 (func (param i32 i64 v128)))
 
   ;; CHECK:      (rec
   ;; CHECK-NEXT:  (type $s0 (struct ))
@@ -40,8 +42,6 @@
 
  (rec)
 
- ;; CHECK:      (type $14 (func))
-
  ;; CHECK:      (type $packed-i8 (array (mut i8)))
 
  ;; CHECK:      (type $many (sub (func (param i32 i64 f32 f64) (result anyref (ref func)))))
@@ -296,7 +296,7 @@
  ;; globals
  (global (mut i32) i32.const 0)
 
- ;; CHECK:      (import "mod" "f5" (func $fimport$0 (type $void)))
+ ;; CHECK:      (import "mod" "f5" (func $fimport$0 (type $0)))
 
  ;; CHECK:      (import "mod" "imported-f" (func $fimport$1 (type $4) (result i32 i64)))
 
@@ -474,7 +474,7 @@
  ;; functions
  (func)
 
- ;; CHECK:      (func $2 (type $void)
+ ;; CHECK:      (func $2 (type $0)
  ;; CHECK-NEXT:  (nop)
  ;; CHECK-NEXT: )
 
@@ -500,12 +500,12 @@
  ;; CHECK-NEXT: )
  (func $f4 (type 18) (local i32 i64) (local $l f32))
 
- ;; CHECK:      (func $"[quoted_name]" (type $void)
+ ;; CHECK:      (func $"[quoted_name]" (type $0)
  ;; CHECK-NEXT:  (nop)
  ;; CHECK-NEXT: )
  (func $"[quoted_name]")
 
- ;; CHECK:      (func $nop-skate (type $void)
+ ;; CHECK:      (func $nop-skate (type $0)
  ;; CHECK-NEXT:  (nop)
  ;; CHECK-NEXT:  (nop)
  ;; CHECK-NEXT:  (unreachable)
@@ -520,7 +520,7 @@
   nop
  )
 
- ;; CHECK:      (func $nop-ski (type $void)
+ ;; CHECK:      (func $nop-ski (type $0)
  ;; CHECK-NEXT:  (nop)
  ;; CHECK-NEXT:  (nop)
  ;; CHECK-NEXT:  (nop)
@@ -544,7 +544,7 @@
   (nop)
  )
 
- ;; CHECK:      (func $nop-sled (type $void)
+ ;; CHECK:      (func $nop-sled (type $0)
  ;; CHECK-NEXT:  (nop)
  ;; CHECK-NEXT:  (unreachable)
  ;; CHECK-NEXT:  (nop)
@@ -871,7 +871,7 @@
   unreachable
  )
 
- ;; CHECK:      (func $big-stack (type $void)
+ ;; CHECK:      (func $big-stack (type $0)
  ;; CHECK-NEXT:  (local $scratch f64)
  ;; CHECK-NEXT:  (local $scratch_1 i64)
  ;; CHECK-NEXT:  (local $scratch_2 f32)
@@ -967,7 +967,7 @@
   drop
  )
 
- ;; CHECK:      (func $tuple-locals (type $void)
+ ;; CHECK:      (func $tuple-locals (type $0)
  ;; CHECK-NEXT:  (local $0 (tuple i32 i64))
  ;; CHECK-NEXT:  (local.set $0
  ;; CHECK-NEXT:   (local.tee $0
@@ -991,7 +991,7 @@
   local.set 0
  )
 
- ;; CHECK:      (func $block (type $void)
+ ;; CHECK:      (func $block (type $0)
  ;; CHECK-NEXT:  (nop)
  ;; CHECK-NEXT:  (block $l
  ;; CHECK-NEXT:   (nop)
@@ -1008,7 +1008,7 @@
   end $l
  )
 
- ;; CHECK:      (func $block-folded (type $void)
+ ;; CHECK:      (func $block-folded (type $0)
  ;; CHECK-NEXT:  (nop)
  ;; CHECK-NEXT:  (tuple.drop 2
  ;; CHECK-NEXT:   (block $l (type $ret2) (result i32 i32)
@@ -1029,7 +1029,7 @@
   unreachable
  )
 
- ;; CHECK:      (func $block-mix (type $void)
+ ;; CHECK:      (func $block-mix (type $0)
  ;; CHECK-NEXT:  (local $scratch i32)
  ;; CHECK-NEXT:  (local $scratch_1 (tuple i32 i32))
  ;; CHECK-NEXT:  (local $scratch_2 i32)
@@ -1114,7 +1114,7 @@
   end
  )
 
- ;; CHECK:      (func $if-else (type $void)
+ ;; CHECK:      (func $if-else (type $0)
  ;; CHECK-NEXT:  (if
  ;; CHECK-NEXT:   (i32.const 0)
  ;; CHECK-NEXT:   (then
@@ -1134,7 +1134,7 @@
   end
  )
 
- ;; CHECK:      (func $if-else-empty (type $void)
+ ;; CHECK:      (func $if-else-empty (type $0)
  ;; CHECK-NEXT:  (if
  ;; CHECK-NEXT:   (i32.const 0)
  ;; CHECK-NEXT:   (then
@@ -1152,7 +1152,7 @@
   end
  )
 
- ;; CHECK:      (func $if-else-many (type $void)
+ ;; CHECK:      (func $if-else-many (type $0)
  ;; CHECK-NEXT:  (if
  ;; CHECK-NEXT:   (i32.const 0)
  ;; CHECK-NEXT:   (then
@@ -1176,7 +1176,7 @@
   end
  )
 
- ;; CHECK:      (func $if-else-single-nested (type $void)
+ ;; CHECK:      (func $if-else-single-nested (type $0)
  ;; CHECK-NEXT:  (if
  ;; CHECK-NEXT:   (i32.const 0)
  ;; CHECK-NEXT:   (then
@@ -1202,7 +1202,7 @@
   end
  )
 
- ;; CHECK:      (func $if-else-folded-body (type $void)
+ ;; CHECK:      (func $if-else-folded-body (type $0)
  ;; CHECK-NEXT:  (if
  ;; CHECK-NEXT:   (i32.const 0)
  ;; CHECK-NEXT:   (then
@@ -1230,7 +1230,7 @@
   end
  )
 
- ;; CHECK:      (func $if-else-labeled (type $void)
+ ;; CHECK:      (func $if-else-labeled (type $0)
  ;; CHECK-NEXT:  (block $l
  ;; CHECK-NEXT:   (if
  ;; CHECK-NEXT:    (i32.const 0)
@@ -1252,7 +1252,7 @@
   end $l
  )
 
- ;; CHECK:      (func $if-no-else (type $void)
+ ;; CHECK:      (func $if-no-else (type $0)
  ;; CHECK-NEXT:  (if
  ;; CHECK-NEXT:   (i32.const 0)
  ;; CHECK-NEXT:   (then
@@ -1309,7 +1309,7 @@
   end
  )
 
- ;; CHECK:      (func $if-else-folded (type $void)
+ ;; CHECK:      (func $if-else-folded (type $0)
  ;; CHECK-NEXT:  (if
  ;; CHECK-NEXT:   (i32.const 0)
  ;; CHECK-NEXT:   (then
@@ -1332,7 +1332,7 @@
   )
  )
 
- ;; CHECK:      (func $if-else-folded-empty (type $void)
+ ;; CHECK:      (func $if-else-folded-empty (type $0)
  ;; CHECK-NEXT:  (if
  ;; CHECK-NEXT:   (i32.const 0)
  ;; CHECK-NEXT:   (then
@@ -1351,7 +1351,7 @@
   )
  )
 
- ;; CHECK:      (func $if-else-folded-many (type $void)
+ ;; CHECK:      (func $if-else-folded-many (type $0)
  ;; CHECK-NEXT:  (if
  ;; CHECK-NEXT:   (i32.const 0)
  ;; CHECK-NEXT:   (then
@@ -1378,7 +1378,7 @@
   )
  )
 
- ;; CHECK:      (func $if-else-folded-single-nested (type $void)
+ ;; CHECK:      (func $if-else-folded-single-nested (type $0)
  ;; CHECK-NEXT:  (if
  ;; CHECK-NEXT:   (i32.eqz
  ;; CHECK-NEXT:    (i32.const 0)
@@ -1413,7 +1413,7 @@
   )
  )
 
- ;; CHECK:      (func $if-else-folded-labeled (type $void)
+ ;; CHECK:      (func $if-else-folded-labeled (type $0)
  ;; CHECK-NEXT:  (block $l
  ;; CHECK-NEXT:   (if
  ;; CHECK-NEXT:    (i32.const 0)
@@ -1438,7 +1438,7 @@
   )
  )
 
- ;; CHECK:      (func $if-no-else-folded (type $void)
+ ;; CHECK:      (func $if-no-else-folded (type $0)
  ;; CHECK-NEXT:  (if
  ;; CHECK-NEXT:   (i32.const 0)
  ;; CHECK-NEXT:   (then
@@ -1503,7 +1503,7 @@
   )
  )
 
-;; CHECK:      (func $if-else-atypical-condition (type $void)
+;; CHECK:      (func $if-else-atypical-condition (type $0)
 ;; CHECK-NEXT:  (if
 ;; CHECK-NEXT:   (i32.const 0)
 ;; CHECK-NEXT:   (then
@@ -1531,7 +1531,7 @@
  (if (i32.const 0) (i32.eqz) (then) (else))
 )
 
- ;; CHECK:      (func $if-else-mixed (type $void)
+ ;; CHECK:      (func $if-else-mixed (type $0)
  ;; CHECK-NEXT:  (if
  ;; CHECK-NEXT:   (if (result i32)
  ;; CHECK-NEXT:    (i32.const 0)
@@ -1596,7 +1596,7 @@
   end
  )
 
- ;; CHECK:      (func $if-else-brs (type $void)
+ ;; CHECK:      (func $if-else-brs (type $0)
  ;; CHECK-NEXT:  (block $label
  ;; CHECK-NEXT:   (if
  ;; CHECK-NEXT:    (i32.const 0)
@@ -1646,7 +1646,7 @@
   end
  )
 
- ;; CHECK:      (func $loop (type $void)
+ ;; CHECK:      (func $loop (type $0)
  ;; CHECK-NEXT:  (loop
  ;; CHECK-NEXT:   (nop)
  ;; CHECK-NEXT:  )
@@ -1657,7 +1657,7 @@
   end
  )
 
- ;; CHECK:      (func $loop-empty (type $void)
+ ;; CHECK:      (func $loop-empty (type $0)
  ;; CHECK-NEXT:  (loop
  ;; CHECK-NEXT:   (nop)
  ;; CHECK-NEXT:  )
@@ -1667,7 +1667,7 @@
   end
  )
 
- ;; CHECK:      (func $loop-many (type $void)
+ ;; CHECK:      (func $loop-many (type $0)
  ;; CHECK-NEXT:  (loop
  ;; CHECK-NEXT:   (nop)
  ;; CHECK-NEXT:   (nop)
@@ -1680,7 +1680,7 @@
   end
  )
 
- ;; CHECK:      (func $loop-nested (type $void)
+ ;; CHECK:      (func $loop-nested (type $0)
  ;; CHECK-NEXT:  (loop
  ;; CHECK-NEXT:   (drop
  ;; CHECK-NEXT:    (i32.const 0)
@@ -1694,7 +1694,7 @@
   end
  )
 
- ;; CHECK:      (func $loop-folded-body (type $void)
+ ;; CHECK:      (func $loop-folded-body (type $0)
  ;; CHECK-NEXT:  (loop
  ;; CHECK-NEXT:   (drop
  ;; CHECK-NEXT:    (i32.const 0)
@@ -1709,7 +1709,7 @@
   end
  )
 
- ;; CHECK:      (func $loop-labeled (type $void)
+ ;; CHECK:      (func $loop-labeled (type $0)
  ;; CHECK-NEXT:  (loop $l
  ;; CHECK-NEXT:   (nop)
  ;; CHECK-NEXT:  )
@@ -1742,7 +1742,7 @@
   end $l
  )
 
- ;; CHECK:      (func $loop-folded (type $void)
+ ;; CHECK:      (func $loop-folded (type $0)
  ;; CHECK-NEXT:  (loop
  ;; CHECK-NEXT:   (nop)
  ;; CHECK-NEXT:  )
@@ -1753,7 +1753,7 @@
   )
  )
 
- ;; CHECK:      (func $loop-folded-empty (type $void)
+ ;; CHECK:      (func $loop-folded-empty (type $0)
  ;; CHECK-NEXT:  (loop
  ;; CHECK-NEXT:   (nop)
  ;; CHECK-NEXT:  )
@@ -1762,7 +1762,7 @@
   (loop)
  )
 
- ;; CHECK:      (func $loop-folded-many (type $void)
+ ;; CHECK:      (func $loop-folded-many (type $0)
  ;; CHECK-NEXT:  (loop
  ;; CHECK-NEXT:   (nop)
  ;; CHECK-NEXT:   (nop)
@@ -1775,7 +1775,7 @@
   )
  )
 
- ;; CHECK:      (func $loop-folded-nested (type $void)
+ ;; CHECK:      (func $loop-folded-nested (type $0)
  ;; CHECK-NEXT:  (loop
  ;; CHECK-NEXT:   (drop
  ;; CHECK-NEXT:    (f32.const 0)
@@ -1790,7 +1790,7 @@
   )
  )
 
- ;; CHECK:      (func $loop-folded-labeled (type $void)
+ ;; CHECK:      (func $loop-folded-labeled (type $0)
  ;; CHECK-NEXT:  (loop $l
  ;; CHECK-NEXT:   (nop)
  ;; CHECK-NEXT:  )
@@ -1823,7 +1823,7 @@
   )
  )
 
- ;; CHECK:      (func $try (type $void)
+ ;; CHECK:      (func $try (type $0)
  ;; CHECK-NEXT:  (try
  ;; CHECK-NEXT:   (do
  ;; CHECK-NEXT:    (nop)
@@ -1836,7 +1836,7 @@
   end
  )
 
- ;; CHECK:      (func $try-catch (type $void)
+ ;; CHECK:      (func $try-catch (type $0)
  ;; CHECK-NEXT:  (try
  ;; CHECK-NEXT:   (do
  ;; CHECK-NEXT:    (nop)
@@ -1895,7 +1895,7 @@
   end
  )
 
- ;; CHECK:      (func $try-catch_all (type $void)
+ ;; CHECK:      (func $try-catch_all (type $0)
  ;; CHECK-NEXT:  (try
  ;; CHECK-NEXT:   (do
  ;; CHECK-NEXT:    (nop)
@@ -1911,7 +1911,7 @@
   end
  )
 
- ;; CHECK:      (func $try-catch-catch_all (type $void)
+ ;; CHECK:      (func $try-catch-catch_all (type $0)
  ;; CHECK-NEXT:  (try
  ;; CHECK-NEXT:   (do
  ;; CHECK-NEXT:    (nop)
@@ -1935,7 +1935,7 @@
   end
  )
 
- ;; CHECK:      (func $try-delegate (type $void)
+ ;; CHECK:      (func $try-delegate (type $0)
  ;; CHECK-NEXT:  (try
  ;; CHECK-NEXT:   (do
  ;; CHECK-NEXT:    (nop)
@@ -1948,7 +1948,7 @@
   delegate 0
  )
 
- ;; CHECK:      (func $try-delegate-nested-func-direct (type $void)
+ ;; CHECK:      (func $try-delegate-nested-func-direct (type $0)
  ;; CHECK-NEXT:  (block $l
  ;; CHECK-NEXT:   (try
  ;; CHECK-NEXT:    (do
@@ -1965,7 +1965,7 @@
   end
  )
 
- ;; CHECK:      (func $try-delegate-nested-func-indirect-index (type $void)
+ ;; CHECK:      (func $try-delegate-nested-func-indirect-index (type $0)
  ;; CHECK-NEXT:  (block $l
  ;; CHECK-NEXT:   (try
  ;; CHECK-NEXT:    (do
@@ -1982,7 +1982,7 @@
   end
  )
 
- ;; CHECK:      (func $try-delegate-nested-func-indirect-name (type $void)
+ ;; CHECK:      (func $try-delegate-nested-func-indirect-name (type $0)
  ;; CHECK-NEXT:  (block $l
  ;; CHECK-NEXT:   (try
  ;; CHECK-NEXT:    (do
@@ -1999,7 +1999,7 @@
   end
  )
 
- ;; CHECK:      (func $try-delegate-nested-try-direct-index (type $void)
+ ;; CHECK:      (func $try-delegate-nested-try-direct-index (type $0)
  ;; CHECK-NEXT:  (try $label
  ;; CHECK-NEXT:   (do
  ;; CHECK-NEXT:    (try
@@ -2020,7 +2020,7 @@
   end
  )
 
- ;; CHECK:      (func $try-delegate-nested-try-direct-name (type $void)
+ ;; CHECK:      (func $try-delegate-nested-try-direct-name (type $0)
  ;; CHECK-NEXT:  (try $l
  ;; CHECK-NEXT:   (do
  ;; CHECK-NEXT:    (try
@@ -2041,7 +2041,7 @@
   end
  )
 
- ;; CHECK:      (func $try-delegate-nested-try-indirect-index (type $void)
+ ;; CHECK:      (func $try-delegate-nested-try-indirect-index (type $0)
  ;; CHECK-NEXT:  (try $label
  ;; CHECK-NEXT:   (do
  ;; CHECK-NEXT:    (try
@@ -2062,7 +2062,7 @@
   end
  )
 
- ;; CHECK:      (func $try-delegate-nested-try-indirect-name (type $void)
+ ;; CHECK:      (func $try-delegate-nested-try-indirect-name (type $0)
  ;; CHECK-NEXT:  (try $label
  ;; CHECK-NEXT:   (do
  ;; CHECK-NEXT:    (block $l
@@ -2085,7 +2085,7 @@
   end
  )
 
- ;; CHECK:      (func $try-delegate-nested-try-shadowing (type $void)
+ ;; CHECK:      (func $try-delegate-nested-try-shadowing (type $0)
  ;; CHECK-NEXT:  (try $l
  ;; CHECK-NEXT:   (do
  ;; CHECK-NEXT:    (block $l0
@@ -2108,7 +2108,7 @@
   end $l
  )
 
- ;; CHECK:      (func $try-delegate-nested-catch-shadowing (type $void)
+ ;; CHECK:      (func $try-delegate-nested-catch-shadowing (type $0)
  ;; CHECK-NEXT:  (try $l
  ;; CHECK-NEXT:   (do
  ;; CHECK-NEXT:    (try $l0
@@ -2138,7 +2138,7 @@
   end
  )
 
- ;; CHECK:      (func $try-delegate-nested-catch_all-shadowing (type $void)
+ ;; CHECK:      (func $try-delegate-nested-catch_all-shadowing (type $0)
  ;; CHECK-NEXT:  (try $l
  ;; CHECK-NEXT:   (do
  ;; CHECK-NEXT:    (try $l0
@@ -2168,7 +2168,7 @@
   end
  )
 
- ;; CHECK:      (func $try-br-index (type $void)
+ ;; CHECK:      (func $try-br-index (type $0)
  ;; CHECK-NEXT:  (block $label
  ;; CHECK-NEXT:   (try
  ;; CHECK-NEXT:    (do
@@ -2193,7 +2193,7 @@
   end
  )
 
- ;; CHECK:      (func $try-br-name (type $void)
+ ;; CHECK:      (func $try-br-name (type $0)
  ;; CHECK-NEXT:  (block $label
  ;; CHECK-NEXT:   (try $l
  ;; CHECK-NEXT:    (do
@@ -2218,7 +2218,7 @@
   end $l
  )
 
- ;; CHECK:      (func $try-folded (type $void)
+ ;; CHECK:      (func $try-folded (type $0)
  ;; CHECK-NEXT:  (try
  ;; CHECK-NEXT:   (do
  ;; CHECK-NEXT:    (nop)
@@ -2259,7 +2259,7 @@
   )
  )
 
- ;; CHECK:      (func $try-delegate-folded (type $void)
+ ;; CHECK:      (func $try-delegate-folded (type $0)
  ;; CHECK-NEXT:  (try
  ;; CHECK-NEXT:   (do
  ;; CHECK-NEXT:    (nop)
@@ -2274,7 +2274,7 @@
   )
  )
 
- ;; CHECK:      (func $rethrow (type $void)
+ ;; CHECK:      (func $rethrow (type $0)
  ;; CHECK-NEXT:  (try $label
  ;; CHECK-NEXT:   (do
  ;; CHECK-NEXT:    (nop)
@@ -2291,7 +2291,7 @@
   end
  )
 
- ;; CHECK:      (func $rethrow-named (type $void)
+ ;; CHECK:      (func $rethrow-named (type $0)
  ;; CHECK-NEXT:  (try $l
  ;; CHECK-NEXT:   (do
  ;; CHECK-NEXT:    (nop)
@@ -2308,7 +2308,7 @@
   end
  )
 
- ;; CHECK:      (func $rethrow-nested (type $void)
+ ;; CHECK:      (func $rethrow-nested (type $0)
  ;; CHECK-NEXT:  (try $label
  ;; CHECK-NEXT:   (do
  ;; CHECK-NEXT:    (nop)
@@ -2337,7 +2337,7 @@
   end
  )
 
- ;; CHECK:      (func $rethrow-nested-named (type $void)
+ ;; CHECK:      (func $rethrow-nested-named (type $0)
  ;; CHECK-NEXT:  (try $l
  ;; CHECK-NEXT:   (do
  ;; CHECK-NEXT:    (nop)
@@ -2366,7 +2366,7 @@
   end
  )
 
- ;; CHECK:      (func $rethrow-try-nested (type $void)
+ ;; CHECK:      (func $rethrow-try-nested (type $0)
  ;; CHECK-NEXT:  (try $label
  ;; CHECK-NEXT:   (do
  ;; CHECK-NEXT:    (nop)
@@ -2393,7 +2393,7 @@
   end
  )
 
- ;; CHECK:      (func $rethrow-try-nested-named (type $void)
+ ;; CHECK:      (func $rethrow-try-nested-named (type $0)
  ;; CHECK-NEXT:  (try $l
  ;; CHECK-NEXT:   (do
  ;; CHECK-NEXT:    (nop)
@@ -2418,7 +2418,7 @@
   end
  )
 
- ;; CHECK:      (func $try-table (type $void)
+ ;; CHECK:      (func $try-table (type $0)
  ;; CHECK-NEXT:  (try_table
  ;; CHECK-NEXT:   (nop)
  ;; CHECK-NEXT:  )
@@ -2429,7 +2429,7 @@
   end
  )
 
- ;; CHECK:      (func $try-table-catch (type $void)
+ ;; CHECK:      (func $try-table-catch (type $0)
  ;; CHECK-NEXT:  (block $label
  ;; CHECK-NEXT:   (try_table (catch $empty $label)
  ;; CHECK-NEXT:    (nop)
@@ -2455,7 +2455,7 @@
   end
  )
 
- ;; CHECK:      (func $try-table-catch-all (type $void)
+ ;; CHECK:      (func $try-table-catch-all (type $0)
  ;; CHECK-NEXT:  (block $label
  ;; CHECK-NEXT:   (try_table (catch_all $label)
  ;; CHECK-NEXT:    (nop)
@@ -2481,7 +2481,7 @@
   end
  )
 
- ;; CHECK:      (func $try-table-all (type $void)
+ ;; CHECK:      (func $try-table-all (type $0)
  ;; CHECK-NEXT:  (block $catch
  ;; CHECK-NEXT:   (drop
  ;; CHECK-NEXT:    (block $catch_ref (result exnref)
@@ -2523,7 +2523,7 @@
   end $catch
  )
 
- ;; CHECK:      (func $try-table-folded (type $void)
+ ;; CHECK:      (func $try-table-folded (type $0)
  ;; CHECK-NEXT:  (block $label
  ;; CHECK-NEXT:   (drop
  ;; CHECK-NEXT:    (block $try (result i32)
@@ -2552,7 +2552,7 @@
   throw_ref
  )
 
- ;; CHECK:      (func $label-siblings (type $void)
+ ;; CHECK:      (func $label-siblings (type $0)
  ;; CHECK-NEXT:  (block $l
  ;; CHECK-NEXT:   (br $l)
  ;; CHECK-NEXT:  )
@@ -2581,7 +2581,7 @@
   end
  )
 
- ;; CHECK:      (func $label-shadowed (type $void)
+ ;; CHECK:      (func $label-shadowed (type $0)
  ;; CHECK-NEXT:  (block $l
  ;; CHECK-NEXT:   (br $l)
  ;; CHECK-NEXT:   (loop $l0
@@ -2614,7 +2614,7 @@
   end
  )
 
- ;; CHECK:      (func $label-index (type $void)
+ ;; CHECK:      (func $label-index (type $0)
  ;; CHECK-NEXT:  (block $block1
  ;; CHECK-NEXT:   (block $block
  ;; CHECK-NEXT:    (block $block0
@@ -2643,7 +2643,7 @@
   end
  )
 
- ;; CHECK:      (func $label-func (type $void)
+ ;; CHECK:      (func $label-func (type $0)
  ;; CHECK-NEXT:  (block $label
  ;; CHECK-NEXT:   (br $label)
  ;; CHECK-NEXT:   (block $a
@@ -2728,7 +2728,7 @@
   br 0
  )
 
- ;; CHECK:      (func $br_if (type $void)
+ ;; CHECK:      (func $br_if (type $0)
  ;; CHECK-NEXT:  (block $l
  ;; CHECK-NEXT:   (br_if $l
  ;; CHECK-NEXT:    (i32.const 0)
@@ -2742,7 +2742,7 @@
   end
  )
 
- ;; CHECK:      (func $br_if-index (type $void)
+ ;; CHECK:      (func $br_if-index (type $0)
  ;; CHECK-NEXT:  (block $block
  ;; CHECK-NEXT:   (br_if $block
  ;; CHECK-NEXT:    (i32.const 0)
@@ -2756,7 +2756,7 @@
   end
  )
 
- ;; CHECK:      (func $br_if-return (type $void)
+ ;; CHECK:      (func $br_if-return (type $0)
  ;; CHECK-NEXT:  (block $label
  ;; CHECK-NEXT:   (br_if $label
  ;; CHECK-NEXT:    (i32.const 0)
@@ -2824,7 +2824,7 @@
   end
  )
 
- ;; CHECK:      (func $br-table (type $void)
+ ;; CHECK:      (func $br-table (type $0)
  ;; CHECK-NEXT:  (block $a
  ;; CHECK-NEXT:   (block $b
  ;; CHECK-NEXT:    (block $c
@@ -2850,7 +2850,7 @@
   end
  )
 
- ;; CHECK:      (func $br-table-index (type $void)
+ ;; CHECK:      (func $br-table-index (type $0)
  ;; CHECK-NEXT:  (block $block
  ;; CHECK-NEXT:   (block $l
  ;; CHECK-NEXT:    (block $block1
@@ -2876,7 +2876,7 @@
   end
  )
 
- ;; CHECK:      (func $br-table-return (type $void)
+ ;; CHECK:      (func $br-table-return (type $0)
  ;; CHECK-NEXT:  (block $label
  ;; CHECK-NEXT:   (br_table $label $label $label $label $label $label $label $label
  ;; CHECK-NEXT:    (i32.const 0)
@@ -3073,7 +3073,7 @@
   drop
  )
 
- ;; CHECK:      (func $memory-size (type $void)
+ ;; CHECK:      (func $memory-size (type $0)
  ;; CHECK-NEXT:  (drop
  ;; CHECK-NEXT:   (memory.size $mimport$0)
  ;; CHECK-NEXT:  )
@@ -3093,7 +3093,7 @@
   drop
  )
 
- ;; CHECK:      (func $memory-grow (type $5) (param $0 i32) (param $1 i64)
+ ;; CHECK:      (func $memory-grow (type $6) (param $0 i32) (param $1 i64)
  ;; CHECK-NEXT:  (drop
  ;; CHECK-NEXT:   (memory.grow $mimport$0
  ;; CHECK-NEXT:    (local.get $0)
@@ -3122,7 +3122,7 @@
   drop
  )
 
- ;; CHECK:      (func $globals (type $void)
+ ;; CHECK:      (func $globals (type $0)
  ;; CHECK-NEXT:  (global.set $g-imported
  ;; CHECK-NEXT:   (global.get $i32)
  ;; CHECK-NEXT:  )
@@ -3132,7 +3132,7 @@
   global.set 4
  )
 
- ;; CHECK:      (func $tuple-globals (type $void)
+ ;; CHECK:      (func $tuple-globals (type $0)
  ;; CHECK-NEXT:  (global.set $pair
  ;; CHECK-NEXT:   (global.get $pair)
  ;; CHECK-NEXT:  )
@@ -3151,7 +3151,7 @@
   global.set $pair
  )
 
- ;; CHECK:      (func $load (type $5) (param $0 i32) (param $1 i64)
+ ;; CHECK:      (func $load (type $6) (param $0 i32) (param $1 i64)
  ;; CHECK-NEXT:  (drop
  ;; CHECK-NEXT:   (i32.load $mimport$0 offset=42
  ;; CHECK-NEXT:    (local.get $0)
@@ -3180,7 +3180,7 @@
   drop
  )
 
- ;; CHECK:      (func $store (type $5) (param $0 i32) (param $1 i64)
+ ;; CHECK:      (func $store (type $6) (param $0 i32) (param $1 i64)
  ;; CHECK-NEXT:  (i32.store $mimport$0 offset=42 align=1
  ;; CHECK-NEXT:   (local.get $0)
  ;; CHECK-NEXT:   (i32.const 0)
@@ -3206,7 +3206,7 @@
   f32.store $mem-i64
  )
 
- ;; CHECK:      (func $atomic-rmw (type $5) (param $0 i32) (param $1 i64)
+ ;; CHECK:      (func $atomic-rmw (type $6) (param $0 i32) (param $1 i64)
  ;; CHECK-NEXT:  (drop
  ;; CHECK-NEXT:   (i32.atomic.rmw16.add_u $mimport$0
  ;; CHECK-NEXT:    (local.get $0)
@@ -3231,7 +3231,7 @@
   drop
  )
 
- ;; CHECK:      (func $atomic-cmpxchg (type $5) (param $0 i32) (param $1 i64)
+ ;; CHECK:      (func $atomic-cmpxchg (type $6) (param $0 i32) (param $1 i64)
  ;; CHECK-NEXT:  (drop
  ;; CHECK-NEXT:   (i32.atomic.rmw8.cmpxchg_u $mem
  ;; CHECK-NEXT:    (local.get $0)
@@ -3260,7 +3260,7 @@
   drop
  )
 
- ;; CHECK:      (func $atomic-wait (type $5) (param $0 i32) (param $1 i64)
+ ;; CHECK:      (func $atomic-wait (type $6) (param $0 i32) (param $1 i64)
  ;; CHECK-NEXT:  (drop
  ;; CHECK-NEXT:   (memory.atomic.wait32 $mimport$0
  ;; CHECK-NEXT:    (local.get $0)
@@ -3289,7 +3289,7 @@
   drop
  )
 
- ;; CHECK:      (func $atomic-notify (type $5) (param $0 i32) (param $1 i64)
+ ;; CHECK:      (func $atomic-notify (type $6) (param $0 i32) (param $1 i64)
  ;; CHECK-NEXT:  (drop
  ;; CHECK-NEXT:   (memory.atomic.notify $mimport$0 offset=8
  ;; CHECK-NEXT:    (local.get $0)
@@ -3314,14 +3314,14 @@
   drop
  )
 
- ;; CHECK:      (func $atomic-fence (type $void)
+ ;; CHECK:      (func $atomic-fence (type $0)
  ;; CHECK-NEXT:  (atomic.fence)
  ;; CHECK-NEXT: )
  (func $atomic-fence
   atomic.fence
  )
 
- ;; CHECK:      (func $simd-const (type $void)
+ ;; CHECK:      (func $simd-const (type $0)
  ;; CHECK-NEXT:  (drop
  ;; CHECK-NEXT:   (v128.const i32x4 0x03020100 0x07060504 0x0b0a0908 0x0f0e0d0c)
  ;; CHECK-NEXT:  )
@@ -3416,7 +3416,7 @@
   i8x16.shl
  )
 
- ;; CHECK:      (func $simd-load (type $5) (param $0 i32) (param $1 i64)
+ ;; CHECK:      (func $simd-load (type $6) (param $0 i32) (param $1 i64)
  ;; CHECK-NEXT:  (drop
  ;; CHECK-NEXT:   (v128.load8x8_s $mimport$0 offset=8
  ;; CHECK-NEXT:    (local.get $0)
@@ -3437,7 +3437,7 @@
   drop
  )
 
- ;; CHECK:      (func $simd-load-store-lane (type $11) (param $0 i32) (param $1 i64) (param $2 v128)
+ ;; CHECK:      (func $simd-load-store-lane (type $12) (param $0 i32) (param $1 i64) (param $2 v128)
  ;; CHECK-NEXT:  (drop
  ;; CHECK-NEXT:   (v128.load16_lane $mimport$0 7
  ;; CHECK-NEXT:    (local.get $0)
@@ -3491,7 +3491,7 @@
   memory.init 0
  )
 
- ;; CHECK:      (func $data-drop (type $void)
+ ;; CHECK:      (func $data-drop (type $0)
  ;; CHECK-NEXT:  (data.drop $implicit-data)
  ;; CHECK-NEXT:  (data.drop $passive)
  ;; CHECK-NEXT: )
@@ -3532,7 +3532,7 @@
   memory.copy $mem-i64 5
  )
 
- ;; CHECK:      (func $memory-fill (type $5) (param $0 i32) (param $1 i64)
+ ;; CHECK:      (func $memory-fill (type $6) (param $0 i32) (param $1 i64)
  ;; CHECK-NEXT:  (memory.fill $mimport$0
  ;; CHECK-NEXT:   (local.get $0)
  ;; CHECK-NEXT:   (i32.const 1)
@@ -3564,7 +3564,7 @@
   memory.fill $mem-i64
  )
 
- ;; CHECK:      (func $return-none (type $void)
+ ;; CHECK:      (func $return-none (type $0)
  ;; CHECK-NEXT:  (return)
  ;; CHECK-NEXT: )
  (func $return-none
@@ -3658,7 +3658,7 @@
   ref.is_null
  )
 
- ;; CHECK:      (func $ref-func (type $void)
+ ;; CHECK:      (func $ref-func (type $0)
  ;; CHECK-NEXT:  (drop
  ;; CHECK-NEXT:   (ref.func $ref-func)
  ;; CHECK-NEXT:  )
@@ -3673,7 +3673,7 @@
   drop
  )
 
- ;; CHECK:      (func $throw (type $void)
+ ;; CHECK:      (func $throw (type $0)
  ;; CHECK-NEXT:  (throw $timport$1)
  ;; CHECK-NEXT:  (throw $tag-i32
  ;; CHECK-NEXT:   (i32.const 0)
@@ -3704,7 +3704,7 @@
   ref.eq
  )
 
- ;; CHECK:      (func $table-get (type $void)
+ ;; CHECK:      (func $table-get (type $0)
  ;; CHECK-NEXT:  (drop
  ;; CHECK-NEXT:   (table.get $timport$0
  ;; CHECK-NEXT:    (i32.const 0)
@@ -3733,7 +3733,7 @@
   drop
  )
 
- ;; CHECK:      (func $table-set (type $void)
+ ;; CHECK:      (func $table-set (type $0)
  ;; CHECK-NEXT:  (table.set $timport$0
  ;; CHECK-NEXT:   (i32.const 0)
  ;; CHECK-NEXT:   (ref.null nofunc)
@@ -3759,7 +3759,7 @@
   table.set $table-any
  )
 
- ;; CHECK:      (func $table-size (type $void)
+ ;; CHECK:      (func $table-size (type $0)
  ;; CHECK-NEXT:  (drop
  ;; CHECK-NEXT:   (table.size $timport$0)
  ;; CHECK-NEXT:  )
@@ -3779,7 +3779,7 @@
   drop
  )
 
- ;; CHECK:      (func $table-grow (type $void)
+ ;; CHECK:      (func $table-grow (type $0)
  ;; CHECK-NEXT:  (drop
  ;; CHECK-NEXT:   (table.grow $timport$0
  ;; CHECK-NEXT:    (ref.null nofunc)
@@ -3814,7 +3814,7 @@
   drop
  )
 
- ;; CHECK:      (func $table-fill (type $void)
+ ;; CHECK:      (func $table-fill (type $0)
  ;; CHECK-NEXT:  (table.fill $timport$0
  ;; CHECK-NEXT:   (i32.const 0)
  ;; CHECK-NEXT:   (ref.null nofunc)
@@ -3846,7 +3846,7 @@
   table.fill $table-any
  )
 
- ;; CHECK:      (func $table-copy (type $void)
+ ;; CHECK:      (func $table-copy (type $0)
  ;; CHECK-NEXT:  (table.copy $timport$0 $timport$0
  ;; CHECK-NEXT:   (i32.const 0)
  ;; CHECK-NEXT:   (i32.const 1)
@@ -3900,7 +3900,7 @@
   drop
  )
 
- ;; CHECK:      (func $call-ref (type $void)
+ ;; CHECK:      (func $call-ref (type $0)
  ;; CHECK-NEXT:  (local $0 (ref null $void))
  ;; CHECK-NEXT:  (local $1 (ref null $ret2))
  ;; CHECK-NEXT:  (local $2 (ref null $many))
@@ -3972,7 +3972,7 @@
   drop
  )
 
- ;; CHECK:      (func $ref-test (type $8) (param $0 anyref)
+ ;; CHECK:      (func $ref-test (type $9) (param $0 anyref)
  ;; CHECK-NEXT:  (drop
  ;; CHECK-NEXT:   (ref.test i31ref
  ;; CHECK-NEXT:    (local.get $0)
@@ -3993,7 +3993,7 @@
   drop
  )
 
- ;; CHECK:      (func $ref-cast (type $8) (param $0 anyref)
+ ;; CHECK:      (func $ref-cast (type $9) (param $0 anyref)
  ;; CHECK-NEXT:  (drop
  ;; CHECK-NEXT:   (ref.cast i31ref
  ;; CHECK-NEXT:    (local.get $0)
@@ -4014,7 +4014,7 @@
   drop
  )
 
- ;; CHECK:      (func $br-on-null (type $8) (param $0 anyref)
+ ;; CHECK:      (func $br-on-null (type $9) (param $0 anyref)
  ;; CHECK-NEXT:  (block $label
  ;; CHECK-NEXT:   (drop
  ;; CHECK-NEXT:    (br_on_null $label
@@ -4029,7 +4029,7 @@
   drop
  )
 
- ;; CHECK:      (func $br-on-non-null (type $8) (param $0 anyref)
+ ;; CHECK:      (func $br-on-non-null (type $9) (param $0 anyref)
  ;; CHECK-NEXT:  (drop
  ;; CHECK-NEXT:   (block $block (result (ref any))
  ;; CHECK-NEXT:    (br_on_non_null $block
@@ -4048,7 +4048,7 @@
   drop
  )
 
- ;; CHECK:      (func $br-on-cast (type $8) (param $0 anyref)
+ ;; CHECK:      (func $br-on-cast (type $9) (param $0 anyref)
  ;; CHECK-NEXT:  (drop
  ;; CHECK-NEXT:   (block $block (result i31ref)
  ;; CHECK-NEXT:    (drop
@@ -4073,7 +4073,7 @@
   drop
  )
 
- ;; CHECK:      (func $br-on-cast-fail (type $8) (param $0 anyref)
+ ;; CHECK:      (func $br-on-cast-fail (type $9) (param $0 anyref)
  ;; CHECK-NEXT:  (drop
  ;; CHECK-NEXT:   (block $block (result (ref any))
  ;; CHECK-NEXT:    (drop
@@ -4217,7 +4217,7 @@
   array.new_data $a1 0
  )
 
- ;; CHECK:      (func $array-new-fixed (type $void)
+ ;; CHECK:      (func $array-new-fixed (type $0)
  ;; CHECK-NEXT:  (drop
  ;; CHECK-NEXT:   (array.new_fixed $a0 0)
  ;; CHECK-NEXT:  )
@@ -4365,7 +4365,7 @@
   array.init_elem $any-array $passive-2
  )
 
- ;; CHECK:      (func $ref-as-non-null (type $8) (param $0 anyref)
+ ;; CHECK:      (func $ref-as-non-null (type $9) (param $0 anyref)
  ;; CHECK-NEXT:  (drop
  ;; CHECK-NEXT:   (ref.as_non_null
  ;; CHECK-NEXT:    (local.get $0)
@@ -4391,7 +4391,7 @@
   drop
  )
 
- ;; CHECK:      (func $extern-convert-any (type $8) (param $0 anyref)
+ ;; CHECK:      (func $extern-convert-any (type $9) (param $0 anyref)
  ;; CHECK-NEXT:  (drop
  ;; CHECK-NEXT:   (extern.externalize
  ;; CHECK-NEXT:    (local.get $0)
@@ -4561,14 +4561,14 @@
   return_call $return_call
  )
 
- ;; CHECK:      (func $call-indirect (type $11) (param $0 i32) (param $1 i64) (param $2 v128)
- ;; CHECK-NEXT:  (call_indirect $timport$0 (type $void)
+ ;; CHECK:      (func $call-indirect (type $12) (param $0 i32) (param $1 i64) (param $2 v128)
+ ;; CHECK-NEXT:  (call_indirect $timport$0 (type $0)
  ;; CHECK-NEXT:   (local.get $0)
  ;; CHECK-NEXT:  )
- ;; CHECK-NEXT:  (call_indirect $funcs (type $void)
+ ;; CHECK-NEXT:  (call_indirect $funcs (type $0)
  ;; CHECK-NEXT:   (local.get $0)
  ;; CHECK-NEXT:  )
- ;; CHECK-NEXT:  (call_indirect $funcs (type $void)
+ ;; CHECK-NEXT:  (call_indirect $funcs (type $0)
  ;; CHECK-NEXT:   (local.get $0)
  ;; CHECK-NEXT:  )
  ;; CHECK-NEXT:  (call_indirect $timport$0 (type $void)
@@ -4580,13 +4580,13 @@
  ;; CHECK-NEXT:  (call_indirect $funcs (type $void)
  ;; CHECK-NEXT:   (local.get $0)
  ;; CHECK-NEXT:  )
- ;; CHECK-NEXT:  (call_indirect $timport$0 (type $void)
+ ;; CHECK-NEXT:  (call_indirect $timport$0 (type $0)
  ;; CHECK-NEXT:   (local.get $0)
  ;; CHECK-NEXT:  )
- ;; CHECK-NEXT:  (call_indirect $funcs (type $void)
+ ;; CHECK-NEXT:  (call_indirect $funcs (type $0)
  ;; CHECK-NEXT:   (local.get $0)
  ;; CHECK-NEXT:  )
- ;; CHECK-NEXT:  (call_indirect $funcs (type $void)
+ ;; CHECK-NEXT:  (call_indirect $funcs (type $0)
  ;; CHECK-NEXT:   (local.get $0)
  ;; CHECK-NEXT:  )
  ;; CHECK-NEXT:  (drop
@@ -4623,14 +4623,14 @@
   drop
  )
 
- ;; CHECK:      (func $call-indirect-folded (type $11) (param $0 i32) (param $1 i64) (param $2 v128)
- ;; CHECK-NEXT:  (call_indirect $timport$0 (type $void)
+ ;; CHECK:      (func $call-indirect-folded (type $12) (param $0 i32) (param $1 i64) (param $2 v128)
+ ;; CHECK-NEXT:  (call_indirect $timport$0 (type $0)
  ;; CHECK-NEXT:   (local.get $0)
  ;; CHECK-NEXT:  )
- ;; CHECK-NEXT:  (call_indirect $funcs (type $void)
+ ;; CHECK-NEXT:  (call_indirect $funcs (type $0)
  ;; CHECK-NEXT:   (local.get $0)
  ;; CHECK-NEXT:  )
- ;; CHECK-NEXT:  (call_indirect $funcs (type $void)
+ ;; CHECK-NEXT:  (call_indirect $funcs (type $0)
  ;; CHECK-NEXT:   (local.get $0)
  ;; CHECK-NEXT:  )
  ;; CHECK-NEXT:  (call_indirect $timport$0 (type $void)
@@ -4642,13 +4642,13 @@
  ;; CHECK-NEXT:  (call_indirect $funcs (type $void)
  ;; CHECK-NEXT:   (local.get $0)
  ;; CHECK-NEXT:  )
- ;; CHECK-NEXT:  (call_indirect $timport$0 (type $void)
+ ;; CHECK-NEXT:  (call_indirect $timport$0 (type $0)
  ;; CHECK-NEXT:   (local.get $0)
  ;; CHECK-NEXT:  )
- ;; CHECK-NEXT:  (call_indirect $funcs (type $void)
+ ;; CHECK-NEXT:  (call_indirect $funcs (type $0)
  ;; CHECK-NEXT:   (local.get $0)
  ;; CHECK-NEXT:  )
- ;; CHECK-NEXT:  (call_indirect $funcs (type $void)
+ ;; CHECK-NEXT:  (call_indirect $funcs (type $0)
  ;; CHECK-NEXT:   (local.get $0)
  ;; CHECK-NEXT:  )
  ;; CHECK-NEXT:  (drop
@@ -4696,14 +4696,14 @@
   )
  )
 
- ;; CHECK:      (func $return-call-indirect (type $11) (param $0 i32) (param $1 i64) (param $2 v128)
- ;; CHECK-NEXT:  (return_call_indirect $timport$0 (type $void)
+ ;; CHECK:      (func $return-call-indirect (type $12) (param $0 i32) (param $1 i64) (param $2 v128)
+ ;; CHECK-NEXT:  (return_call_indirect $timport$0 (type $0)
  ;; CHECK-NEXT:   (local.get $0)
  ;; CHECK-NEXT:  )
- ;; CHECK-NEXT:  (return_call_indirect $funcs (type $void)
+ ;; CHECK-NEXT:  (return_call_indirect $funcs (type $0)
  ;; CHECK-NEXT:   (local.get $0)
  ;; CHECK-NEXT:  )
- ;; CHECK-NEXT:  (return_call_indirect $funcs (type $void)
+ ;; CHECK-NEXT:  (return_call_indirect $funcs (type $0)
  ;; CHECK-NEXT:   (local.get $0)
  ;; CHECK-NEXT:  )
  ;; CHECK-NEXT:  (return_call_indirect $timport$0 (type $void)
@@ -4715,13 +4715,13 @@
  ;; CHECK-NEXT:  (return_call_indirect $funcs (type $void)
  ;; CHECK-NEXT:   (local.get $0)
  ;; CHECK-NEXT:  )
- ;; CHECK-NEXT:  (return_call_indirect $timport$0 (type $void)
+ ;; CHECK-NEXT:  (return_call_indirect $timport$0 (type $0)
  ;; CHECK-NEXT:   (local.get $0)
  ;; CHECK-NEXT:  )
- ;; CHECK-NEXT:  (return_call_indirect $funcs (type $void)
+ ;; CHECK-NEXT:  (return_call_indirect $funcs (type $0)
  ;; CHECK-NEXT:   (local.get $0)
  ;; CHECK-NEXT:  )
- ;; CHECK-NEXT:  (return_call_indirect $funcs (type $void)
+ ;; CHECK-NEXT:  (return_call_indirect $funcs (type $0)
  ;; CHECK-NEXT:   (local.get $0)
  ;; CHECK-NEXT:  )
  ;; CHECK-NEXT:  (return_call_indirect $timport$0 (type $31)
@@ -4755,14 +4755,14 @@
   return_call_indirect (param i64 v128)
  )
 
- ;; CHECK:      (func $return-call-indirect-folded (type $11) (param $0 i32) (param $1 i64) (param $2 v128)
- ;; CHECK-NEXT:  (return_call_indirect $timport$0 (type $void)
+ ;; CHECK:      (func $return-call-indirect-folded (type $12) (param $0 i32) (param $1 i64) (param $2 v128)
+ ;; CHECK-NEXT:  (return_call_indirect $timport$0 (type $0)
  ;; CHECK-NEXT:   (local.get $0)
  ;; CHECK-NEXT:  )
- ;; CHECK-NEXT:  (return_call_indirect $funcs (type $void)
+ ;; CHECK-NEXT:  (return_call_indirect $funcs (type $0)
  ;; CHECK-NEXT:   (local.get $0)
  ;; CHECK-NEXT:  )
- ;; CHECK-NEXT:  (return_call_indirect $funcs (type $void)
+ ;; CHECK-NEXT:  (return_call_indirect $funcs (type $0)
  ;; CHECK-NEXT:   (local.get $0)
  ;; CHECK-NEXT:  )
  ;; CHECK-NEXT:  (return_call_indirect $timport$0 (type $void)
@@ -4774,13 +4774,13 @@
  ;; CHECK-NEXT:  (return_call_indirect $funcs (type $void)
  ;; CHECK-NEXT:   (local.get $0)
  ;; CHECK-NEXT:  )
- ;; CHECK-NEXT:  (return_call_indirect $timport$0 (type $void)
+ ;; CHECK-NEXT:  (return_call_indirect $timport$0 (type $0)
  ;; CHECK-NEXT:   (local.get $0)
  ;; CHECK-NEXT:  )
- ;; CHECK-NEXT:  (return_call_indirect $funcs (type $void)
+ ;; CHECK-NEXT:  (return_call_indirect $funcs (type $0)
  ;; CHECK-NEXT:   (local.get $0)
  ;; CHECK-NEXT:  )
- ;; CHECK-NEXT:  (return_call_indirect $funcs (type $void)
+ ;; CHECK-NEXT:  (return_call_indirect $funcs (type $0)
  ;; CHECK-NEXT:   (local.get $0)
  ;; CHECK-NEXT:  )
  ;; CHECK-NEXT:  (return_call_indirect $timport$0 (type $31)
@@ -4899,7 +4899,7 @@
    suspend $tag-pair-to-pair
  )
 
- ;; CHECK:      (func $source-maps (type $void)
+ ;; CHECK:      (func $source-maps (type $0)
  ;; CHECK-NEXT:  ;;@ src.cpp:40:1
  ;; CHECK-NEXT:  (drop
  ;; CHECK-NEXT:   ;;@ src.cpp:30:1
@@ -4960,7 +4960,7 @@
   end
  )
 
- ;; CHECK:      (func $source-map-propagation (type $void)
+ ;; CHECK:      (func $source-map-propagation (type $0)
  ;; CHECK-NEXT:  ;;@ src.cpp:20:1
  ;; CHECK-NEXT:  (drop
  ;; CHECK-NEXT:   (i32.add
@@ -5050,7 +5050,7 @@
   (i32.const 1)
  )
 
- ;; CHECK:      (func $try-br-catch-all-return (type $void)
+ ;; CHECK:      (func $try-br-catch-all-return (type $0)
  ;; CHECK-NEXT:  (block $label
  ;; CHECK-NEXT:   (try
  ;; CHECK-NEXT:    (do
@@ -5073,7 +5073,7 @@
   )
  )
 
- ;; CHECK:      (func $try-br-catch-return (type $void)
+ ;; CHECK:      (func $try-br-catch-return (type $0)
  ;; CHECK-NEXT:  (block $label
  ;; CHECK-NEXT:   (try
  ;; CHECK-NEXT:    (do