7 files changed, 21 insertions, 18 deletions
diff --git a/test/lit/passes/vacuum_all-features.wast b/test/lit/passes/vacuum_all-features.wast
index 5dbbb9386..636814f3d 100644
--- a/test/lit/passes/vacuum_all-features.wast
+++ b/test/lit/passes/vacuum_all-features.wast
@@ -4,7 +4,6 @@
 ;; RUN: foreach %s %t wasm-opt --vacuum --all-features -S -o - | filecheck %s
 
 (module
-  (memory 256 256)
   ;; CHECK:      (type $0 (func))
   (type $0 (func))
   ;; CHECK:      (type $3 (func (result i32)))
@@ -16,14 +15,18 @@
   (type $3 (func (result i32)))
   ;; CHECK:      (type $4 (func (param i32 f64 i32 i32)))
   (type $4 (func (param i32 f64 i32 i32)))
+
   ;; CHECK:      (type $5 (func (param i32) (result i32)))
 
   ;; CHECK:      (type $6 (func (result f64)))
 
   ;; CHECK:      (import "env" "int" (func $int (type $3) (result i32)))
   (import "env" "int" (func $int (result i32)))
+
   ;; CHECK:      (global $Int i32 (i32.const 0))
   (global $Int i32 (i32.const 0))
+
+  (memory 256 256)
   ;; CHECK:      (memory $0 256 256)
 
   ;; CHECK:      (func $b (type $0)
diff --git a/test/lit/validation/closed-world-interface.wast b/test/lit/validation/closed-world-interface.wast
index daedaf990..19b0faa10 100644
--- a/test/lit/validation/closed-world-interface.wast
+++ b/test/lit/validation/closed-world-interface.wast
@@ -39,29 +39,29 @@
 
   (type $private (func (param v128)))
 
-  (func $1 (export "test1") (type $void)
+  ;; Ok even though it is an import instead of an export.
+  (func $1 (import "env" "test5") (type $exported-pair-1))
+
+  (func $2 (export "test1") (type $void)
     (unreachable)
   )
 
   ;; Ok because it only refers to basic heap types
-  (func $2 (export "test2") (type $abstract)
+  (func $3 (export "test2") (type $abstract)
     (unreachable)
   )
 
   ;; Not ok because it refers to $struct.
-  (func $3 (export "test3") (type $concrete)
+  (func $4 (export "test3") (type $concrete)
     (unreachable)
   )
 
   ;; Ok even though it is in a rec group because the rest of the group and the
   ;; types this refers to are on the boundary as well.
-  (func $4 (export "test4") (type $exported-pair-0)
+  (func $5 (export "test4") (type $exported-pair-0)
     (unreachable)
   )
 
-  ;; Ok even though it is an import instead of an export.
-  (func $5 (import "env" "test5") (type $exported-pair-1))
-
   ;; Ok, and we also allow the other type in the group.
   (func $6 (export "test6") (type $partial-pair-0)
     (unreachable)
diff --git a/test/lit/validation/extended-const.wast b/test/lit/validation/extended-const.wast
index 9317f47b7..6b506671f 100644
--- a/test/lit/validation/extended-const.wast
+++ b/test/lit/validation/extended-const.wast
@@ -17,8 +17,8 @@
 ;; EXTENDED: ) "hello world")
 
 (module
-  (memory 1 1)
   (import "env" "global" (global i32))
+  (memory 1 1)
   (global i32 (i32.add (global.get 0) (i32.const 42)))
-  (data (i32.sub (global.get 0) (i32.const 10)) "hello world")
+  (data (offset (i32.sub (global.get 0) (i32.const 10))) "hello world")
 )
diff --git a/test/lit/wasm-split/export-name-already-exists.wast b/test/lit/wasm-split/export-name-already-exists.wast
index 83951795a..a83055da1 100644
--- a/test/lit/wasm-split/export-name-already-exists.wast
+++ b/test/lit/wasm-split/export-name-already-exists.wast
@@ -4,6 +4,6 @@
 ;; CHECK: error: Export foo already exists.
 
 (module
-  (memory 0 0)
-  (export "foo" (memory 0 0))
+  (memory $m 0 0)
+  (export "foo" (memory $m))
 )
diff --git a/test/lit/wasm-split/merge-profiles.wast b/test/lit/wasm-split/merge-profiles.wast
index 2d09fefaa..1bd9c8a4a 100644
--- a/test/lit/wasm-split/merge-profiles.wast
+++ b/test/lit/wasm-split/merge-profiles.wast
@@ -22,8 +22,8 @@
 ;; SPLIT-NEXT: Splitting out functions: qux{{$}}
 
 (module
-  (memory 0 0)
-  (export "memory" (memory 0 0))
+  (memory $m 0 0)
+  (export "memory" (memory $m))
   (export "foo" (func $foo))
   (export "bar" (func $bar))
   (export "baz" (func $baz))
diff --git a/test/lit/wasm-split/mismatched-hashes.wast b/test/lit/wasm-split/mismatched-hashes.wast
index 347fb1746..8f2bd69fe 100644
--- a/test/lit/wasm-split/mismatched-hashes.wast
+++ b/test/lit/wasm-split/mismatched-hashes.wast
@@ -19,6 +19,6 @@
 ;; RUN: wasm-split %s --profile=%t.prof -o1 %t.1.wasm -o2 %t.2.wasm
 
 (module
- (memory 0 0)
- (export "memory" (memory 0 0))
+ (memory $m 0 0)
+ (export "memory" (memory $m))
 )
diff --git a/test/lit/wasm-split/print-profile.wast b/test/lit/wasm-split/print-profile.wast
index cea701629..ec37858bd 100644
--- a/test/lit/wasm-split/print-profile.wast
+++ b/test/lit/wasm-split/print-profile.wast
@@ -15,8 +15,8 @@
 ;; UNESCAPED: - bar(double[3])
 
 (module
-  (memory 0 0)
-  (export "memory" (memory 0 0))
+  (memory $m 0 0)
+  (export "memory" (memory $m))
   (export "foo" (func $foo))
   (export "bar" (func $bar\28double\5b3\5d\29))
   (func $foo