Support Type names in the Names section (#3615)

1 files changed, 17 insertions, 17 deletions

diff --git a/test/typed-function-references.wast.fromBinary b/test/typed-function-references.wast.fromBinary
index fb13b73c4..b6dfd2a5d 100644
--- a/test/typed-function-references.wast.fromBinary
+++ b/test/typed-function-references.wast.fromBinary
@@ -1,13 +1,13 @@
 (module
  (type $none_=>_none (func))
- (type $none_=>_anyref_f32_anyref_f32 (func (result anyref f32 anyref f32)))
- (type $i32_=>_i32 (func (param i32) (result i32)))
- (type $ref?|i32_->_i32|_=>_i32 (func (param (ref null $i32_=>_i32)) (result i32)))
- (type $none_=>_eqref (func (result eqref)))
+ (type $mixed_results (func (result anyref f32 anyref f32)))
+ (type $i32-i32 (func (param i32) (result i32)))
+ (type $ref?|$i32-i32|_=>_i32 (func (param (ref null $i32-i32)) (result i32)))
+ (type $=>eqref (func (result eqref)))
  (type $none_=>_i32 (func (result i32)))
- (type $none_=>_anyref (func (result anyref)))
- (type $none_=>_i32_ref?|none_->_anyref_f32_anyref_f32|_f64 (func (result i32 (ref null $none_=>_anyref_f32_anyref_f32) f64)))
- (type $f64_=>_ref?|none_->_eqref| (func (param f64) (result (ref null $none_=>_eqref))))
+ (type $=>anyref (func (result anyref)))
+ (type $none_=>_i32_ref?|$mixed_results|_f64 (func (result i32 (ref null $mixed_results) f64)))
+ (type $f64_=>_ref_null<_->_eqref> (func (param f64) (result (ref null $=>eqref))))
  (func $call-ref
   (call_ref
    (ref.func $call-ref)
@@ -24,20 +24,20 @@
    (ref.func $call-ref-more)
   )
  )
- (func $call_from-param (param $f (ref null $i32_=>_i32)) (result i32)
+ (func $call_from-param (param $f (ref null $i32-i32)) (result i32)
   (call_ref
    (i32.const 42)
    (local.get $f)
   )
  )
- (func $call_from-param-null (param $f (ref null $i32_=>_i32)) (result i32)
+ (func $call_from-param-null (param $f (ref null $i32-i32)) (result i32)
   (call_ref
    (i32.const 42)
    (local.get $f)
   )
  )
  (func $call_from-local-null (result i32)
-  (local $f (ref null $i32_=>_i32))
+  (local $f (ref null $i32-i32))
   (local.set $f
    (ref.func $call-ref-more)
   )
@@ -46,21 +46,21 @@
    (local.get $f)
   )
  )
- (func $ref-in-sig (param $0 f64) (result (ref null $none_=>_eqref))
-  (ref.null $none_=>_eqref)
+ (func $ref-in-sig (param $0 f64) (result (ref null $=>eqref))
+  (ref.null $=>eqref)
  )
  (func $type-only-in-tuple-local
   (local $x i32)
   (local $1 f64)
-  (local $2 (ref null $none_=>_anyref))
+  (local $2 (ref null $=>anyref))
   (nop)
  )
  (func $type-only-in-tuple-block
-  (local $0 (i32 (ref null $none_=>_anyref_f32_anyref_f32) f64))
-  (local $1 (ref null $none_=>_anyref_f32_anyref_f32))
+  (local $0 (i32 (ref null $mixed_results) f64))
+  (local $1 (ref null $mixed_results))
   (local $2 i32)
   (local.set $0
-   (block $label$1 (result i32 (ref null $none_=>_anyref_f32_anyref_f32) f64)
+   (block $label$1 (result i32 (ref null $mixed_results) f64)
     (unreachable)
    )
   )
@@ -72,7 +72,7 @@
      )
     )
     (drop
-     (block (result (ref null $none_=>_anyref_f32_anyref_f32))
+     (block (result (ref null $mixed_results))
       (local.set $1
        (tuple.extract 1
         (local.get $0)