1 files changed, 30 insertions, 17 deletions
diff --git a/test/unit.fromasm.no-opts b/test/unit.fromasm.no-opts
index 84dcdf881..14b13d7ed 100644
--- a/test/unit.fromasm.no-opts
+++ b/test/unit.fromasm.no-opts
@@ -1,13 +1,26 @@
 (module
- (type $FUNCSIG$id (func (param f64) (result i32)))
- (type $FUNCSIG$ddd (func (param f64 f64) (result f64)))
- (type $FUNCSIG$vf (func (param f32)))
- (type $FUNCSIG$vi (func (param i32)))
- (type $FUNCSIG$v (func))
- (type $FUNCSIG$idi (func (param f64 i32) (result i32)))
- (type $FUNCSIG$ii (func (param i32) (result i32)))
- (type $FUNCSIG$dd (func (param f64) (result f64)))
- (type $FUNCSIG$i (func (result i32)))
+ (type $none_=>_none (func))
+ (type $i32_=>_none (func (param i32)))
+ (type $none_=>_i32 (func (result i32)))
+ (type $i32_=>_i32 (func (param i32) (result i32)))
+ (type $f32_=>_none (func (param f32)))
+ (type $none_=>_f64 (func (result f64)))
+ (type $i32_i32_=>_i32 (func (param i32 i32) (result i32)))
+ (type $f64_=>_i32 (func (param f64) (result i32)))
+ (type $i32_i32_i32_=>_none (func (param i32 i32 i32)))
+ (type $none_=>_f32 (func (result f32)))
+ (type $i32_=>_f32 (func (param i32) (result f32)))
+ (type $f64_=>_f64 (func (param f64) (result f64)))
+ (type $f64_f64_=>_f64 (func (param f64 f64) (result f64)))
+ (type $i32_i32_=>_none (func (param i32 i32)))
+ (type $i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32)))
+ (type $i32_i32_i32_i32_i32_i32_i32_=>_none (func (param i32 i32 i32 i32 i32 i32 i32)))
+ (type $i32_f32_=>_none (func (param i32 f32)))
+ (type $i32_f64_f32_=>_none (func (param i32 f64 f32)))
+ (type $f32_f64_=>_none (func (param f32 f64)))
+ (type $f64_i32_=>_i32 (func (param f64 i32) (result i32)))
+ (type $f64_f64_f64_=>_i32 (func (param f64 f64 f64) (result i32)))
+ (type $i32_f32_f64_=>_f32 (func (param i32 f32 f64) (result f32)))
  (import "env" "memory" (memory $memory 256 256))
  (import "env" "table" (table $table 25 25 funcref))
  (elem (global.get $__table_base) $v $big_negative $v $v $w $w $importedDoubles $w $z $cneg $z $z $z $z $z $z $vi $vi $vi $vi $vi $vi $vi $vi $ii)
@@ -568,7 +581,7 @@
     (local.get $x)
    )
   )
-  (call_indirect (type $FUNCSIG$vf)
+  (call_indirect (type $f32_=>_none)
    (local.get $x)
    (i32.add
     (i32.and
@@ -580,7 +593,7 @@
   )
  )
  (func $cneg (; 28 ;) (param $x f32)
-  (call_indirect (type $FUNCSIG$vf)
+  (call_indirect (type $f32_=>_none)
    (local.get $x)
    (i32.add
     (i32.and
@@ -630,7 +643,7 @@
   )
  )
  (func $cneg_nosemicolon (; 31 ;)
-  (call_indirect (type $FUNCSIG$vi)
+  (call_indirect (type $i32_=>_none)
    (i32.const 1)
    (i32.add
     (i32.and
@@ -1952,14 +1965,14 @@
   )
  )
  (func $relocatableAndModules (; 70 ;) (result i32)
-  (call_indirect (type $FUNCSIG$v)
+  (call_indirect (type $none_=>_none)
    (i32.const 10)
   )
-  (call_indirect (type $FUNCSIG$v)
+  (call_indirect (type $none_=>_none)
    (i32.const 20)
   )
   (return
-   (call_indirect (type $FUNCSIG$idi)
+   (call_indirect (type $f64_i32_=>_i32)
     (f64.const 1.5)
     (i32.const 200)
     (i32.const 30)
@@ -2039,7 +2052,7 @@
   (local $i1 i32)
   (local.set $i1
    (block (result i32)
-    (call_indirect (type $FUNCSIG$vi)
+    (call_indirect (type $i32_=>_none)
      (i32.const 0)
      (i32.add
       (i32.and
@@ -2055,7 +2068,7 @@
  )
  (func $emterpretify_assertions_safeHeap (; 77 ;)
   (local $i1 i32)
-  (call_indirect (type $FUNCSIG$vi)
+  (call_indirect (type $i32_=>_none)
    (local.get $i1)
    (i32.add
     (i32.and