1 files changed, 18 insertions, 18 deletions
diff --git a/test/passes/remove-unused-names_merge-blocks_enable-threads.txt b/test/passes/remove-unused-names_merge-blocks_enable-threads.txt
index b60d01957..74cce687a 100644
--- a/test/passes/remove-unused-names_merge-blocks_enable-threads.txt
+++ b/test/passes/remove-unused-names_merge-blocks_enable-threads.txt
@@ -3,8 +3,8 @@
  (type $ii (func (param i32 i32)))
  (type $iii (func (param i32 i32 i32)))
  (type $3 (func))
- (type $4 (func (result i32)))
- (type $5 (func (result f64)))
+ (type $FUNCSIG$i (func (result i32)))
+ (type $FUNCSIG$d (func (result f64)))
  (memory $0 (shared 256 256))
  (table $0 1 1 funcref)
  (elem (i32.const 0) $call-i)
@@ -828,7 +828,7 @@
    )
   )
  )
- (func $return-different-type (; 23 ;) (type $4) (result i32)
+ (func $return-different-type (; 23 ;) (type $FUNCSIG$i) (result i32)
   (drop
    (f64.abs
     (block
@@ -843,7 +843,7 @@
   )
   (unreachable)
  )
- (func $drop-unreachable (; 24 ;) (type $4) (result i32)
+ (func $drop-unreachable (; 24 ;) (type $FUNCSIG$i) (result i32)
   (local $0 i32)
   (drop
    (block (result i32)
@@ -852,7 +852,7 @@
   )
   (unreachable)
  )
- (func $concrete_finale_in_unreachable (; 25 ;) (type $5) (result f64)
+ (func $concrete_finale_in_unreachable (; 25 ;) (type $FUNCSIG$d) (result f64)
   (drop
    (block (result f64)
     (unreachable)
@@ -911,7 +911,7 @@
    )
   )
  )
- (func $merging-with-unreachable-in-middle (; 30 ;) (type $4) (result i32)
+ (func $merging-with-unreachable-in-middle (; 30 ;) (type $FUNCSIG$i) (result i32)
   (block (result i32)
    (return
     (i32.const 21536)
@@ -1260,7 +1260,7 @@
    (i32.const 2)
   )
  )
- (func $block-tail-value (; 36 ;) (type $4) (result i32)
+ (func $block-tail-value (; 36 ;) (type $FUNCSIG$i) (result i32)
   (block $l1 (result i32)
    (drop
     (i32.const -1)
@@ -1290,7 +1290,7 @@
    (br $l1)
   )
  )
- (func $block-tail-unreachable (; 39 ;) (type $4) (result i32)
+ (func $block-tail-unreachable (; 39 ;) (type $FUNCSIG$i) (result i32)
   (block $l1 (result i32)
    (drop
     (i32.const -1)
@@ -1307,7 +1307,7 @@
    (unreachable)
   )
  )
- (func $loop-tail-unreachable (; 40 ;) (type $4) (result i32)
+ (func $loop-tail-unreachable (; 40 ;) (type $FUNCSIG$i) (result i32)
   (loop $l1
    (drop
     (i32.const -1)
@@ -1323,9 +1323,9 @@
  )
 )
 (module
- (type $0 (func (param f64 i32) (result i32)))
- (type $1 (func (result i32)))
- (func $unreachable-in-sub-block (; 0 ;) (type $0) (param $0 f64) (param $1 i32) (result i32)
+ (type $FUNCSIG$idi (func (param f64 i32) (result i32)))
+ (type $FUNCSIG$i (func (result i32)))
+ (func $unreachable-in-sub-block (; 0 ;) (type $FUNCSIG$idi) (param $0 f64) (param $1 i32) (result i32)
   (local $2 i32)
   (local $9 i32)
   (loop $label$1
@@ -1354,13 +1354,13 @@
   (nop)
   (local.get $9)
  )
- (func $trivial (; 1 ;) (type $1) (result i32)
+ (func $trivial (; 1 ;) (type $FUNCSIG$i) (result i32)
   (block
    (unreachable)
    (nop)
   )
  )
- (func $trivial-more (; 2 ;) (type $1) (result i32)
+ (func $trivial-more (; 2 ;) (type $FUNCSIG$i) (result i32)
   (block
    (nop)
    (unreachable)
@@ -1376,8 +1376,8 @@
  )
 )
 (module
- (type $0 (func))
- (func $merge-some-block (; 0 ;) (type $0)
+ (type $FUNCSIG$v (func))
+ (func $merge-some-block (; 0 ;) (type $FUNCSIG$v)
   (drop
    (i32.const 1)
   )
@@ -1454,7 +1454,7 @@
    )
   )
  )
- (func $merge-some-loop (; 1 ;) (type $0)
+ (func $merge-some-loop (; 1 ;) (type $FUNCSIG$v)
   (drop
    (i32.const 1)
   )
@@ -1522,7 +1522,7 @@
    )
   )
  )
- (func $merge-some-loop-taken (; 2 ;) (type $0)
+ (func $merge-some-loop-taken (; 2 ;) (type $FUNCSIG$v)
   (loop $l1
    (block $b1
     (drop