1 files changed, 22 insertions, 21 deletions
diff --git a/test/heap-types.wast.fromBinary.noDebugInfo b/test/heap-types.wast.fromBinary.noDebugInfo
index 53c3b0bd6..e1b90ef4c 100644
--- a/test/heap-types.wast.fromBinary.noDebugInfo
+++ b/test/heap-types.wast.fromBinary.noDebugInfo
@@ -6,13 +6,14 @@
  (type $[mut:ref?|[mut:f64]|] (array (mut (ref null $[mut:f64]))))
  (type $[mut:i8] (array (mut i8)))
  (type ${mut:f32} (struct (field (mut f32))))
- (type ${i32_i64} (struct (field i32) (field i64)))
+ (type ${} (struct ))
+ (type ${i32} (struct_subtype (field i32) ${}))
+ (type ${i32_i64} (struct_subtype (field i32) (field i64) ${i32}))
  (type $anyref_=>_none (func (param anyref)))
  (type $ref?|[mut:f64]|_=>_none (func (param (ref null $[mut:f64]))))
  (type ${mut:ref|{i32}|} (struct (field (mut (ref ${i32})))))
  (type $[mut:i32] (array (mut i32)))
  (type $[mut:ref|{i32}|] (array (mut (ref ${i32}))))
- (type ${i32} (struct (field i32)))
  (type $ref|{i32_f32_f64}|_ref?|{i32_f32_f64}|_ref?|{i32_i64}|_ref?|{mut:f32}|_ref?|{mut:ref|{i32}|}|_=>_ref|{i8_mut:i16_ref|{i32_f32_f64}|_mut:ref|{i32_f32_f64}|}| (func (param (ref ${i32_f32_f64}) (ref null ${i32_f32_f64}) (ref null ${i32_i64}) (ref null ${mut:f32}) (ref null ${mut:ref|{i32}|})) (result (ref ${i8_mut:i16_ref|{i32_f32_f64}|_mut:ref|{i32_f32_f64}|}))))
  (type $ref|[mut:f64]|_ref?|[mut:ref|{i32}|]|_ref?|{i32_i64}|_=>_ref|[mut:ref?|[mut:f64]|]| (func (param (ref $[mut:f64]) (ref null $[mut:ref|{i32}|]) (ref null ${i32_i64})) (result (ref $[mut:ref?|[mut:f64]|]))))
  (type $ref?|{mut:f32}|_=>_none (func (param (ref null ${mut:f32}))))
@@ -20,7 +21,7 @@
  (type $none_=>_ref|[mut:f64]| (func (result (ref $[mut:f64]))))
  (type $none_=>_ref|[mut:i8]| (func (result (ref $[mut:i8]))))
  (global $global$0 (ref ${i32_f32_f64}) (struct.new_default ${i32_f32_f64}))
- (func $0 (param $0 (ref ${i32_f32_f64})) (param $1 (ref null ${i32_f32_f64})) (param $2 (ref null ${i32_i64})) (param $3 (ref null ${mut:f32})) (param $4 (ref null ${mut:ref|{i32}|})) (result (ref ${i8_mut:i16_ref|{i32_f32_f64}|_mut:ref|{i32_f32_f64}|}))
+ (func $0 (type $ref|{i32_f32_f64}|_ref?|{i32_f32_f64}|_ref?|{i32_i64}|_ref?|{mut:f32}|_ref?|{mut:ref|{i32}|}|_=>_ref|{i8_mut:i16_ref|{i32_f32_f64}|_mut:ref|{i32_f32_f64}|}|) (param $0 (ref ${i32_f32_f64})) (param $1 (ref null ${i32_f32_f64})) (param $2 (ref null ${i32_i64})) (param $3 (ref null ${mut:f32})) (param $4 (ref null ${mut:ref|{i32}|})) (result (ref ${i8_mut:i16_ref|{i32_f32_f64}|_mut:ref|{i32_f32_f64}|}))
   (local $5 (ref null ${i32_f32_f64}))
   (local $6 (ref null ${i8_mut:i16_ref|{i32_f32_f64}|_mut:ref|{i32_f32_f64}|}))
   (local $7 (ref null ${mut:f32}))
@@ -113,7 +114,7 @@
   )
   (unreachable)
  )
- (func $1 (param $0 (ref $[mut:f64])) (param $1 (ref null $[mut:ref|{i32}|])) (param $2 (ref null ${i32_i64})) (result (ref $[mut:ref?|[mut:f64]|]))
+ (func $1 (type $ref|[mut:f64]|_ref?|[mut:ref|{i32}|]|_ref?|{i32_i64}|_=>_ref|[mut:ref?|[mut:f64]|]|) (param $0 (ref $[mut:f64])) (param $1 (ref null $[mut:ref|{i32}|])) (param $2 (ref null ${i32_i64})) (result (ref $[mut:ref?|[mut:f64]|]))
   (local $3 (ref null $[mut:f64]))
   (local $4 (ref null $[mut:ref?|[mut:f64]|]))
   (local $5 (ref null $[mut:i8]))
@@ -172,7 +173,7 @@
   )
   (unreachable)
  )
- (func $2 (param $0 anyref)
+ (func $2 (type $anyref_=>_none) (param $0 anyref)
   (if
    (ref.is_func
     (local.get $0)
@@ -192,7 +193,7 @@
    (unreachable)
   )
  )
- (func $3 (param $0 anyref)
+ (func $3 (type $anyref_=>_none) (param $0 anyref)
   (drop
    (ref.as_non_null
     (local.get $0)
@@ -214,7 +215,7 @@
    )
   )
  )
- (func $4 (param $0 anyref)
+ (func $4 (type $anyref_=>_none) (param $0 anyref)
   (local $1 anyref)
   (local $2 anyref)
   (local $3 funcref)
@@ -296,40 +297,40 @@
    )
   )
  )
- (func $5
+ (func $5 (type $none_=>_none)
   (unreachable)
  )
- (func $6 (param $0 (ref null ${mut:f32}))
+ (func $6 (type $ref?|{mut:f32}|_=>_none) (param $0 (ref null ${mut:f32}))
   (drop
    (local.get $0)
   )
   (unreachable)
  )
- (func $7
+ (func $7 (type $none_=>_none)
   (unreachable)
  )
- (func $8
+ (func $8 (type $none_=>_none)
   (unreachable)
  )
- (func $9
+ (func $9 (type $none_=>_none)
   (unreachable)
  )
- (func $10 (param $0 (ref null $[mut:f64]))
+ (func $10 (type $ref?|[mut:f64]|_=>_none) (param $0 (ref null $[mut:f64]))
   (drop
    (local.get $0)
   )
   (unreachable)
  )
- (func $11
+ (func $11 (type $none_=>_none)
   (unreachable)
  )
- (func $12 (param $0 (ref null $[mut:f64]))
+ (func $12 (type $ref?|[mut:f64]|_=>_none) (param $0 (ref null $[mut:f64]))
   (drop
    (local.get $0)
   )
   (unreachable)
  )
- (func $13 (param $0 (ref null $[mut:f64]))
+ (func $13 (type $ref?|[mut:f64]|_=>_none) (param $0 (ref null $[mut:f64]))
   (drop
    (local.get $0)
   )
@@ -338,10 +339,10 @@
   )
   (unreachable)
  )
- (func $14
+ (func $14 (type $none_=>_none)
   (unreachable)
  )
- (func $15 (param $0 (ref $[mut:f64])) (param $1 (ref null $[mut:f64]))
+ (func $15 (type $ref|[mut:f64]|_ref?|[mut:f64]|_=>_none) (param $0 (ref $[mut:f64])) (param $1 (ref null $[mut:f64]))
   (array.copy $[mut:f64] $[mut:f64]
    (local.get $0)
    (i32.const 11)
@@ -350,7 +351,7 @@
    (i32.const 1337)
   )
  )
- (func $16 (result (ref $[mut:f64]))
+ (func $16 (type $none_=>_ref|[mut:f64]|) (result (ref $[mut:f64]))
   (array.init_static $[mut:f64]
    (f64.const 1)
    (f64.const 2)
@@ -358,14 +359,14 @@
    (f64.const 8)
   )
  )
- (func $17 (result (ref $[mut:i8]))
+ (func $17 (type $none_=>_ref|[mut:i8]|) (result (ref $[mut:i8]))
   (array.init_static $[mut:i8]
    (i32.const 4)
    (i32.const 2)
    (i32.const 1)
   )
  )
- (func $18
+ (func $18 (type $none_=>_none)
   (local $0 (ref null ${i32_f32_f64}))
   (local $1 (ref null ${i8_mut:i16_ref|{i32_f32_f64}|_mut:ref|{i32_f32_f64}|}))
   (drop