Update lit tests and remove stale checks (#5662)

Remove stale check lines for --nominal mode checks that were removed in #5660
and rerun auto_update_checks.py to ensure the checks are stable.

3 files changed, 6 insertions, 61 deletions

diff --git a/test/lit/heap-types.wast b/test/lit/heap-types.wast
index 9f0e43602..0c3df85e4 100644
--- a/test/lit/heap-types.wast
+++ b/test/lit/heap-types.wast
@@ -106,7 +106,6 @@
 
 (module
   ;; CHECK:      (type $vector (array (mut f64)))
-  ;; NOMNL:      (type $vector (array (mut f64)))
   (type $vector (array (mut f64)))
   ;; CHECK:      (func $test (type $ref|$vector|_i32_f64_i32_=>_none) (param $ref (ref $vector)) (param $index i32) (param $value f64) (param $size i32)
   ;; CHECK-NEXT:  (array.fill $vector
@@ -116,14 +115,6 @@
   ;; CHECK-NEXT:   (local.get $size)
   ;; CHECK-NEXT:  )
   ;; CHECK-NEXT: )
-  ;; NOMNL:      (func $test (type $ref|$vector|_i32_f64_i32_=>_none) (param $ref (ref $vector)) (param $index i32) (param $value f64) (param $size i32)
-  ;; NOMNL-NEXT:  (array.fill $vector
-  ;; NOMNL-NEXT:   (local.get $ref)
-  ;; NOMNL-NEXT:   (local.get $index)
-  ;; NOMNL-NEXT:   (local.get $value)
-  ;; NOMNL-NEXT:   (local.get $size)
-  ;; NOMNL-NEXT:  )
-  ;; NOMNL-NEXT: )
   (func $test (param $ref (ref $vector))
               (param $index i32)
               (param $value f64)
@@ -139,7 +130,6 @@
 
 (module
   ;; CHECK:      (type $vector (array (mut i32)))
-  ;; NOMNL:      (type $vector (array (mut i32)))
   (type $vector (array (mut i32)))
   (data "")
   ;; CHECK:      (func $test (type $ref|$vector|_i32_i32_i32_=>_none) (param $ref (ref $vector)) (param $index i32) (param $offset i32) (param $size i32)
@@ -150,14 +140,6 @@
   ;; CHECK-NEXT:   (local.get $size)
   ;; CHECK-NEXT:  )
   ;; CHECK-NEXT: )
-  ;; NOMNL:      (func $test (type $ref|$vector|_i32_i32_i32_=>_none) (param $ref (ref $vector)) (param $index i32) (param $offset i32) (param $size i32)
-  ;; NOMNL-NEXT:  (array.init_data $vector $0
-  ;; NOMNL-NEXT:   (local.get $ref)
-  ;; NOMNL-NEXT:   (local.get $index)
-  ;; NOMNL-NEXT:   (local.get $offset)
-  ;; NOMNL-NEXT:   (local.get $size)
-  ;; NOMNL-NEXT:  )
-  ;; NOMNL-NEXT: )
   (func $test (param $ref (ref $vector))
               (param $index i32)
               (param $offset i32)
@@ -173,7 +155,6 @@
 
 (module
   ;; CHECK:      (type $vector (array (mut funcref)))
-  ;; NOMNL:      (type $vector (array (mut funcref)))
   (type $vector (array (mut funcref)))
   (elem func)
   ;; CHECK:      (func $test (type $ref|$vector|_i32_i32_i32_=>_none) (param $ref (ref $vector)) (param $index i32) (param $offset i32) (param $size i32)
@@ -184,14 +165,6 @@
   ;; CHECK-NEXT:   (local.get $size)
   ;; CHECK-NEXT:  )
   ;; CHECK-NEXT: )
-  ;; NOMNL:      (func $test (type $ref|$vector|_i32_i32_i32_=>_none) (param $ref (ref $vector)) (param $index i32) (param $offset i32) (param $size i32)
-  ;; NOMNL-NEXT:  (array.init_elem $vector $0
-  ;; NOMNL-NEXT:   (local.get $ref)
-  ;; NOMNL-NEXT:   (local.get $index)
-  ;; NOMNL-NEXT:   (local.get $offset)
-  ;; NOMNL-NEXT:   (local.get $size)
-  ;; NOMNL-NEXT:  )
-  ;; NOMNL-NEXT: )
   (func $test (param $ref (ref $vector))
               (param $index i32)
               (param $offset i32)
diff --git a/test/lit/isorecursive-good.wast b/test/lit/isorecursive-good.wast
index 53631c92b..eea7ec546 100644
--- a/test/lit/isorecursive-good.wast
+++ b/test/lit/isorecursive-good.wast
@@ -7,14 +7,9 @@
   (rec
     ;; HYBRID:      (rec
     ;; HYBRID-NEXT:  (type $super-struct (struct (field i32)))
-    ;; NOMINAL:      (type $super-array (array (ref $super-struct)))
-
-    ;; NOMINAL:      (type $sub-array (array_subtype (ref $sub-struct) $super-array))
-
-    ;; NOMINAL:      (type $super-struct (struct (field i32)))
     (type $super-struct (struct i32))
-    ;; HYBRID:       (type $sub-struct (struct_subtype (field i32) (field i64) $super-struct))
     ;; NOMINAL:      (type $sub-struct (struct_subtype (field i32) (field i64) $super-struct))
+    ;; HYBRID:       (type $sub-struct (struct_subtype (field i32) (field i64) $super-struct))
     (type $sub-struct (sub $super-struct (struct i32 i64)))
   )
 
@@ -29,19 +24,15 @@
   (rec
     ;; HYBRID:      (rec
     ;; HYBRID-NEXT:  (type $super-func (func (param (ref $sub-array)) (result (ref $super-array))))
-    ;; NOMINAL:      (type $super-func (func (param (ref $sub-array)) (result (ref $super-array))))
     (type $super-func (func (param (ref $sub-array)) (result (ref $super-array))))
-    ;; HYBRID:       (type $sub-func (func_subtype (param (ref $super-array)) (result (ref $sub-array)) $super-func))
     ;; NOMINAL:      (type $sub-func (func_subtype (param (ref $super-array)) (result (ref $sub-array)) $super-func))
+    ;; HYBRID:       (type $sub-func (func_subtype (param (ref $super-array)) (result (ref $sub-array)) $super-func))
     (type $sub-func (sub $super-func (func (param (ref $super-array)) (result (ref $sub-array)))))
   )
 
   ;; HYBRID:      (func $make-super-struct (type $none_=>_ref|$super-struct|) (result (ref $super-struct))
   ;; HYBRID-NEXT:  (call $make-sub-struct)
   ;; HYBRID-NEXT: )
-  ;; NOMINAL:      (func $make-super-struct (type $none_=>_ref|$super-struct|) (result (ref $super-struct))
-  ;; NOMINAL-NEXT:  (call $make-sub-struct)
-  ;; NOMINAL-NEXT: )
   (func $make-super-struct (result (ref $super-struct))
     (call $make-sub-struct)
   )
@@ -49,9 +40,6 @@
   ;; HYBRID:      (func $make-sub-struct (type $none_=>_ref|$sub-struct|) (result (ref $sub-struct))
   ;; HYBRID-NEXT:  (unreachable)
   ;; HYBRID-NEXT: )
-  ;; NOMINAL:      (func $make-sub-struct (type $none_=>_ref|$sub-struct|) (result (ref $sub-struct))
-  ;; NOMINAL-NEXT:  (unreachable)
-  ;; NOMINAL-NEXT: )
   (func $make-sub-struct (result (ref $sub-struct))
     (unreachable)
   )
@@ -59,9 +47,6 @@
   ;; HYBRID:      (func $make-super-array (type $none_=>_ref|$super-array|) (result (ref $super-array))
   ;; HYBRID-NEXT:  (call $make-sub-array)
   ;; HYBRID-NEXT: )
-  ;; NOMINAL:      (func $make-super-array (type $none_=>_ref|$super-array|) (result (ref $super-array))
-  ;; NOMINAL-NEXT:  (call $make-sub-array)
-  ;; NOMINAL-NEXT: )
   (func $make-super-array (result (ref $super-array))
     (call $make-sub-array)
   )
@@ -69,9 +54,6 @@
   ;; HYBRID:      (func $make-sub-array (type $none_=>_ref|$sub-array|) (result (ref $sub-array))
   ;; HYBRID-NEXT:  (unreachable)
   ;; HYBRID-NEXT: )
-  ;; NOMINAL:      (func $make-sub-array (type $none_=>_ref|$sub-array|) (result (ref $sub-array))
-  ;; NOMINAL-NEXT:  (unreachable)
-  ;; NOMINAL-NEXT: )
   (func $make-sub-array (result (ref $sub-array))
     (unreachable)
   )
@@ -79,9 +61,6 @@
   ;; HYBRID:      (func $make-super-func (type $none_=>_ref|$super-func|) (result (ref $super-func))
   ;; HYBRID-NEXT:  (call $make-sub-func)
   ;; HYBRID-NEXT: )
-  ;; NOMINAL:      (func $make-super-func (type $none_=>_ref|$super-func|) (result (ref $super-func))
-  ;; NOMINAL-NEXT:  (call $make-sub-func)
-  ;; NOMINAL-NEXT: )
   (func $make-super-func (result (ref $super-func))
     (call $make-sub-func)
   )
@@ -89,9 +68,6 @@
   ;; HYBRID:      (func $make-sub-func (type $none_=>_ref|$sub-func|) (result (ref $sub-func))
   ;; HYBRID-NEXT:  (unreachable)
   ;; HYBRID-NEXT: )
-  ;; NOMINAL:      (func $make-sub-func (type $none_=>_ref|$sub-func|) (result (ref $sub-func))
-  ;; NOMINAL-NEXT:  (unreachable)
-  ;; NOMINAL-NEXT: )
   (func $make-sub-func (result (ref $sub-func))
     (unreachable)
   )
diff --git a/test/lit/subtype-chain.wast b/test/lit/subtype-chain.wast
index 03d0ec81f..5c832ec80 100644
--- a/test/lit/subtype-chain.wast
+++ b/test/lit/subtype-chain.wast
@@ -8,22 +8,18 @@
 
 (module
   ;; CHECK:      (type $root (struct ))
-
-  ;; CHECK:      (type $trunk (struct_subtype (field i32) $root))
-
-  ;; CHECK:      (type $branch (struct_subtype (field i32) (field i64) $trunk))
-
-  ;; CHECK:      (type $twig (struct_subtype (field i32) (field i64) (field f32) $branch))
-
-  ;; CHECK:      (type $leaf (struct_subtype (field i32) (field i64) (field f32) (field f64) $twig))
   (type $root (struct))
 
+  ;; CHECK:      (type $trunk (struct_subtype (field i32) $root))
   (type $trunk (struct_subtype i32 $root))
 
+  ;; CHECK:      (type $branch (struct_subtype (field i32) (field i64) $trunk))
   (type $branch (struct_subtype i32 i64 $trunk))
 
+  ;; CHECK:      (type $twig (struct_subtype (field i32) (field i64) (field f32) $branch))
   (type $twig (struct_subtype i32 i64 f32 $branch))
 
+  ;; CHECK:      (type $leaf (struct_subtype (field i32) (field i64) (field f32) (field f64) $twig))
   (type $leaf (struct_subtype i32 i64 f32 f64 $twig))
 
   ;; CHECK:      (func $make-root (type $ref|$leaf|_=>_ref?|$root|) (param $leaf (ref $leaf)) (result (ref null $root))