Skip to content

Commit dd09242

Browse files
authored
Fix import order in test/lit/merge/types.wat (#6490)
The new parser, not yet enabled, requires that imports precede declared module items except for types.
1 parent dd6bcf5 commit dd09242

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

test/lit/merge/types.wat

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,12 @@
2525
(type $f (sub (func (result anyref))))
2626
(type $g (sub $f (func (result eqref))))
2727

28-
(func (export "f1"))
29-
(func (export "f2") (type $g) (ref.null eq))
30-
(func (export "f3") (type $f) (ref.null eq))
31-
3228
(import "env" "f1" (func $good1))
3329
(import "env" "f2" (func $good2 (type $f)))
3430

3531
(import "env" "f1" (func $bad1 (param (ref eq))))
3632
(import "env" "f3" (func $bad2 (type $g)))
3733

38-
(table (export "t1") 10 100 funcref)
39-
(table (export "t2") 10 funcref)
40-
(table (export "t3") 10 anyref)
41-
4234
(import "env" "t1" (table $good1 10 funcref))
4335
(import "env" "t1" (table $good2 10 100 funcref))
4436
(import "env" "t2" (table $good3 10 funcref))
@@ -49,10 +41,6 @@
4941
(import "env" "t2" (table $bad3 10 100 funcref))
5042
(import "env" "t3" (table $bad4 10 funcref))
5143

52-
(memory (export "m1") 10 100)
53-
(memory (export "m2") 10)
54-
(memory (export "m3") i64 10)
55-
5644
(import "env" "m1" (memory $good1 10))
5745
(import "env" "m1" (memory $good2 10 100))
5846
(import "env" "m2" (memory $good3 10))
@@ -63,9 +51,6 @@
6351
(import "env" "m2" (memory $bad3 10 100))
6452
(import "env" "m3" (memory $bad4 10))
6553

66-
(global (export "g1") eqref (ref.null eq))
67-
(global (export "g2") (mut eqref) (ref.null eq))
68-
6954
(import "env" "g1" (global $good1 anyref))
7055
(import "env" "g2" (global $good2 (mut eqref)))
7156

@@ -75,10 +60,25 @@
7560
(import "env" "g2" (global $bad4 (mut anyref)))
7661
(import "env" "g1" (global $bad5 i31ref))
7762

78-
(tag (export "t") (param eqref))
79-
8063
(import "env" "t" (tag $good1 (param eqref)))
8164

8265
(import "env" "t" (tag $bad1 (param anyref)))
8366
(import "env" "t" (tag $bad2 (param i31ref)))
67+
68+
(func (export "f1"))
69+
(func (export "f2") (type $g) (ref.null eq))
70+
(func (export "f3") (type $f) (ref.null eq))
71+
72+
(table (export "t1") 10 100 funcref)
73+
(table (export "t2") 10 funcref)
74+
(table (export "t3") 10 anyref)
75+
76+
(memory (export "m1") 10 100)
77+
(memory (export "m2") 10)
78+
(memory (export "m3") i64 10)
79+
80+
(global (export "g1") eqref (ref.null eq))
81+
(global (export "g2") (mut eqref) (ref.null eq))
82+
83+
(tag (export "t") (param eqref))
8484
)

0 commit comments

Comments
 (0)