Update lit tests to parse with the new parser (#6290)

Get as many of the lit tests as possible to parse with the new parser, mostly by
moving declared module items to be after imports. Also fix a bug in the new
parser's pop validation to allow supertypes of the expected type.

The two big issues that still prevent some lit tests from working correctly
under the new parser are missing support for symbolic field names and missing
support for source map annotations.

3 files changed, 19 insertions, 19 deletions

diff --git a/test/lit/basic/multi-table.wast b/test/lit/basic/multi-table.wast
index 3a464dca1..64de79df0 100644
--- a/test/lit/basic/multi-table.wast
+++ b/test/lit/basic/multi-table.wast
@@ -15,17 +15,16 @@
   (type $none_=>_none (func))
   (type $A (struct))
   ;; CHECK-TEXT:      (import "a" "b" (table $t1 1 10 funcref))
-
-  ;; CHECK-TEXT:      (global $g1 (ref null $none_=>_none) (ref.func $f))
   ;; CHECK-BIN:      (import "a" "b" (table $t1 1 10 funcref))
+  (import "a" "b" (table $t1 1 10 funcref))
 
+  ;; CHECK-TEXT:      (global $g1 (ref null $none_=>_none) (ref.func $f))
   ;; CHECK-BIN:      (global $g1 (ref null $none_=>_none) (ref.func $f))
   (global $g1 (ref null $none_=>_none) (ref.func $f))
   ;; CHECK-TEXT:      (global $g2 i32 (i32.const 0))
   ;; CHECK-BIN:      (global $g2 i32 (i32.const 0))
   (global $g2 i32 (i32.const 0))
 
-  (import "a" "b" (table $t1 1 10 funcref))
   ;; CHECK-TEXT:      (table $t2 3 3 funcref)
   ;; CHECK-BIN:      (table $t2 3 3 funcref)
   (table $t2 3 3 funcref)
diff --git a/test/lit/basic/reference-types.wast b/test/lit/basic/reference-types.wast
index 75d5f313f..212230ca3 100644
--- a/test/lit/basic/reference-types.wast
+++ b/test/lit/basic/reference-types.wast
@@ -43,6 +43,19 @@
   ;; CHECK-TEXT:      (import "env" "import_global" (global $import_global eqref))
 
   ;; CHECK-TEXT:      (import "env" "import_func" (func $import_func (type $8) (param eqref) (result funcref)))
+  ;; CHECK-BIN:      (type $5 (func))
+
+  ;; CHECK-BIN:      (type $6 (func (result eqref)))
+
+  ;; CHECK-BIN:      (type $7 (func (param i32)))
+
+  ;; CHECK-BIN:      (type $8 (func (param eqref) (result funcref)))
+
+  ;; CHECK-BIN:      (import "env" "import_global" (global $import_global eqref))
+
+  ;; CHECK-BIN:      (import "env" "import_func" (func $import_func (type $8) (param eqref) (result funcref)))
+  (import "env" "import_func" (func $import_func (param eqref) (result funcref)))
+  (import "env" "import_global" (global $import_global eqref))
 
   ;; CHECK-TEXT:      (global $global_eqref (mut eqref) (ref.null none))
 
@@ -69,18 +82,6 @@
   ;; CHECK-TEXT:      (func $take_eqref (type $sig_eqref) (param $0 eqref)
   ;; CHECK-TEXT-NEXT:  (nop)
   ;; CHECK-TEXT-NEXT: )
-  ;; CHECK-BIN:      (type $5 (func))
-
-  ;; CHECK-BIN:      (type $6 (func (result eqref)))
-
-  ;; CHECK-BIN:      (type $7 (func (param i32)))
-
-  ;; CHECK-BIN:      (type $8 (func (param eqref) (result funcref)))
-
-  ;; CHECK-BIN:      (import "env" "import_global" (global $import_global eqref))
-
-  ;; CHECK-BIN:      (import "env" "import_func" (func $import_func (type $8) (param eqref) (result funcref)))
-
   ;; CHECK-BIN:      (global $global_eqref (mut eqref) (ref.null none))
 
   ;; CHECK-BIN:      (global $global_funcref (mut funcref) (ref.null nofunc))
@@ -172,8 +173,6 @@
   ;; CHECK-BIN-NODEBUG:      (elem declare func $23 $3)
   (elem declare func $ref-taken-but-not-in-table)
 
-  (import "env" "import_func" (func $import_func (param eqref) (result funcref)))
-  (import "env" "import_global" (global $import_global eqref))
   (export "export_func" (func $import_func))
   (export "export_global" (global $import_global))
 
diff --git a/test/lit/basic/tags.wast b/test/lit/basic/tags.wast
index 5fbc0b811..8e314af0b 100644
--- a/test/lit/basic/tags.wast
+++ b/test/lit/basic/tags.wast
@@ -12,7 +12,11 @@
 ;; Test tags
 
 (module
+  (tag $e-import (import "env" "im0") (param i32))
+  (import "env" "im1" (tag (param i32 f32)))
+
   (tag (param i32))
+
   ;; CHECK-TEXT:      (type $0 (func (param i32 f32)))
 
   ;; CHECK-TEXT:      (type $1 (func (param i32)))
@@ -54,9 +58,7 @@
   ;; CHECK-TEXT:      (tag $e-export (param i32))
   ;; CHECK-BIN:      (tag $e-export (param i32))
   (tag $e-export (export "ex0") (param i32))
-  (tag $e-import (import "env" "im0") (param i32))
 
-  (import "env" "im1" (tag (param i32 f32)))
   ;; CHECK-TEXT:      (export "ex0" (tag $e-export))
 
   ;; CHECK-TEXT:      (export "ex1" (tag $e))