1 files changed, 26 insertions, 26 deletions
diff --git a/test/multivalue.wast.fromBinary b/test/multivalue.wast.fromBinary
index 4c79c60bb..5d81b49c5 100644
--- a/test/multivalue.wast.fromBinary
+++ b/test/multivalue.wast.fromBinary
@@ -1,25 +1,25 @@
 (module
- (type $none_=>_i32_i64 (func (result i32 i64)))
- (type $none_=>_none (func))
- (type $none_=>_i32_i64_externref (func (result i32 i64 externref)))
- (type $none_=>_i64 (func (result i64)))
- (type $none_=>_f32_i64_i32 (func (result f32 i64 i32)))
- (type $none_=>_i32_i64_f32 (func (result i32 i64 f32)))
- (type $none_=>_i32 (func (result i32)))
- (type $none_=>_f32 (func (result f32)))
- (import "env" "pair" (func $pair (type $none_=>_i32_i64) (result i32 i64)))
+ (type $0 (func (result i32 i64)))
+ (type $1 (func))
+ (type $2 (func (result i32 i64 externref)))
+ (type $3 (func (result i64)))
+ (type $4 (func (result f32 i64 i32)))
+ (type $5 (func (result i32 i64 f32)))
+ (type $6 (func (result i32)))
+ (type $7 (func (result f32)))
+ (import "env" "pair" (func $pair (type $0) (result i32 i64)))
  (global $g1 (mut i32) (i32.const 0))
  (global $g2 (mut i64) (i64.const 0))
  (global $global$2 i32 (i32.const 0))
  (global $global$3 i64 (i64.const 0))
- (func $triple (type $none_=>_i32_i64_f32) (result i32 i64 f32)
+ (func $triple (type $5) (result i32 i64 f32)
   (tuple.make
    (i32.const 42)
    (i64.const 7)
    (f32.const 13)
   )
  )
- (func $get-first (type $none_=>_i32) (result i32)
+ (func $get-first (type $6) (result i32)
   (local $0 (i32 i64 f32))
   (local $1 i64)
   (local $2 i32)
@@ -50,7 +50,7 @@
    (local.get $2)
   )
  )
- (func $get-second (type $none_=>_i64) (result i64)
+ (func $get-second (type $3) (result i64)
   (local $0 i64)
   (local $1 (i32 i64 f32))
   (local $2 i64)
@@ -85,7 +85,7 @@
   )
   (local.get $0)
  )
- (func $get-third (type $none_=>_f32) (result f32)
+ (func $get-third (type $7) (result f32)
   (local $0 f32)
   (local $1 (i32 i64 f32))
   (local $2 i64)
@@ -120,7 +120,7 @@
   )
   (local.get $0)
  )
- (func $reverse (type $none_=>_f32_i64_i32) (result f32 i64 i32)
+ (func $reverse (type $4) (result f32 i64 i32)
   (local $x i32)
   (local $1 i64)
   (local $2 i64)
@@ -229,7 +229,7 @@
    )
   )
  )
- (func $unreachable (type $none_=>_i64) (result i64)
+ (func $unreachable (type $3) (result i64)
   (drop
    (i32.const 42)
   )
@@ -238,7 +238,7 @@
   )
   (unreachable)
  )
- (func $global (type $none_=>_i32_i64) (result i32 i64)
+ (func $global (type $0) (result i32 i64)
   (local $0 i32)
   (global.set $g1
    (block (result i32)
@@ -256,7 +256,7 @@
    (global.get $global$3)
   )
  )
- (func $drop-call (type $none_=>_none)
+ (func $drop-call (type $1)
   (local $0 (i32 i64))
   (local $1 i32)
   (local.set $0
@@ -278,7 +278,7 @@
    )
   )
  )
- (func $drop-tuple-make (type $none_=>_none)
+ (func $drop-tuple-make (type $1)
   (local $0 i32)
   (drop
    (block (result i32)
@@ -292,7 +292,7 @@
    )
   )
  )
- (func $drop-block (type $none_=>_none)
+ (func $drop-block (type $1)
   (local $0 (i32 i64))
   (local $1 i32)
   (local.set $0
@@ -319,7 +319,7 @@
    )
   )
  )
- (func $mv-return (type $none_=>_i32_i64) (result i32 i64)
+ (func $mv-return (type $0) (result i32 i64)
   (return
    (tuple.make
     (i32.const 42)
@@ -327,7 +327,7 @@
    )
   )
  )
- (func $mv-return-in-block (type $none_=>_i32_i64) (result i32 i64)
+ (func $mv-return-in-block (type $0) (result i32 i64)
   (return
    (tuple.make
     (i32.const 42)
@@ -335,7 +335,7 @@
    )
   )
  )
- (func $mv-block-break (type $none_=>_i32_i64) (result i32 i64)
+ (func $mv-block-break (type $0) (result i32 i64)
   (local $0 (i32 i64))
   (local.set $0
    (block $label$1 (result i32 i64)
@@ -356,7 +356,7 @@
    )
   )
  )
- (func $mv-block-br-if (type $none_=>_i32_i64) (result i32 i64)
+ (func $mv-block-br-if (type $0) (result i32 i64)
   (local $0 (i32 i64))
   (local $1 (i32 i64))
   (local.set $1
@@ -389,7 +389,7 @@
    )
   )
  )
- (func $mv-if (type $none_=>_i32_i64_externref) (result i32 i64 externref)
+ (func $mv-if (type $2) (result i32 i64 externref)
   (local $0 (i32 i64 externref))
   (local.set $0
    (if (result i32 i64 externref)
@@ -418,7 +418,7 @@
    )
   )
  )
- (func $mv-loop (type $none_=>_i32_i64) (result i32 i64)
+ (func $mv-loop (type $0) (result i32 i64)
   (local $0 (i32 i64))
   (local.set $0
    (loop $label$1 (result i32 i64)
@@ -437,7 +437,7 @@
    )
   )
  )
- (func $mv-switch (type $none_=>_i32_i64) (result i32 i64)
+ (func $mv-switch (type $0) (result i32 i64)
   (local $0 (i32 i64))
   (local $1 (i32 i64))
   (local.set $1