Change print order of top-level module components (#751)

In wast files, the spec and WABT require imports to appear before any
non-import definitions (see also
https://github.com/WebAssembly/wabt/issues/152). This patch re-orders
visitModule in the wast printer to meet this requirement, and more or
less match the order of the binary sections. Also remove extraneous
whitespace around table definitions.

52 files changed, 96 insertions, 146 deletions

diff --git a/test/llvm_autogenerated/byval.wast b/test/llvm_autogenerated/byval.wast
index f7787011e..440ec7bf4 100644
--- a/test/llvm_autogenerated/byval.wast
+++ b/test/llvm_autogenerated/byval.wast
@@ -1,6 +1,4 @@
 (module
-  (memory $0 1)
-  (data (i32.const 4) "\10\04\00\00")
   (type $FUNCSIG$vi (func (param i32)))
   (type $FUNCSIG$iiii (func (param i32 i32 i32) (result i32)))
   (import "env" "big_byval_callee" (func $big_byval_callee (param i32)))
@@ -11,6 +9,9 @@
   (import "env" "ext_func" (func $ext_func (param i32)))
   (import "env" "ext_func_empty" (func $ext_func_empty (param i32)))
   (import "env" "memcpy" (func $memcpy (param i32 i32 i32) (result i32)))
+  (table 0 anyfunc)
+  (memory $0 1)
+  (data (i32.const 4) "\10\04\00\00")
   (export "memory" (memory $0))
   (export "byval_arg" (func $byval_arg))
   (export "byval_arg_align8" (func $byval_arg_align8))
@@ -19,8 +20,6 @@
   (export "byval_empty_caller" (func $byval_empty_caller))
   (export "byval_empty_callee" (func $byval_empty_callee))
   (export "big_byval" (func $big_byval))
-  (table 0 anyfunc)
-  
   (func $byval_arg (param $0 i32)
     (local $1 i32)
     (i32.store offset=4
diff --git a/test/llvm_autogenerated/call.wast b/test/llvm_autogenerated/call.wast
index c4ee58910..1fca6c4ab 100644
--- a/test/llvm_autogenerated/call.wast
+++ b/test/llvm_autogenerated/call.wast
@@ -1,6 +1,4 @@
 (module
-  (memory $0 1)
-  (data (i32.const 4) "\10\04\00\00")
   (type $FUNCSIG$v (func))
   (type $FUNCSIG$i (func (result i32)))
   (type $FUNCSIG$ii (func (param i32) (result i32)))
@@ -15,6 +13,9 @@
   (import "env" "i32_unary" (func $i32_unary (param i32) (result i32)))
   (import "env" "i64_nullary" (func $i64_nullary (result i64)))
   (import "env" "void_nullary" (func $void_nullary))
+  (table 0 anyfunc)
+  (memory $0 1)
+  (data (i32.const 4) "\10\04\00\00")
   (export "memory" (memory $0))
   (export "call_i32_nullary" (func $call_i32_nullary))
   (export "call_i64_nullary" (func $call_i64_nullary))
@@ -28,8 +29,6 @@
   (export "tail_call_void_nullary" (func $tail_call_void_nullary))
   (export "fastcc_tail_call_void_nullary" (func $fastcc_tail_call_void_nullary))
   (export "coldcc_tail_call_void_nullary" (func $coldcc_tail_call_void_nullary))
-  (table 0 anyfunc)
-  
   (func $call_i32_nullary (result i32)
     (return
       (call $i32_nullary)
diff --git a/test/llvm_autogenerated/cfg-stackify.wast b/test/llvm_autogenerated/cfg-stackify.wast
index de3fbba9c..6f97cb08d 100644
--- a/test/llvm_autogenerated/cfg-stackify.wast
+++ b/test/llvm_autogenerated/cfg-stackify.wast
@@ -1,6 +1,4 @@
 (module
-  (memory $0 1)
-  (data (i32.const 4) "\10\04\00\00")
   (type $FUNCSIG$v (func))
   (type $FUNCSIG$i (func (result i32)))
   (import "env" "a" (func $a (result i32)))
@@ -8,6 +6,9 @@
   (import "env" "something" (func $something))
   (import "env" "test15_callee0" (func $test15_callee0))
   (import "env" "test15_callee1" (func $test15_callee1))
+  (table 0 anyfunc)
+  (memory $0 1)
+  (data (i32.const 4) "\10\04\00\00")
   (export "memory" (memory $0))
   (export "test0" (func $test0))
   (export "test1" (func $test1))
@@ -34,8 +35,6 @@
   (export "test13" (func $test13))
   (export "test14" (func $test14))
   (export "test15" (func $test15))
-  (table 0 anyfunc)
-  
   (func $test0 (param $0 i32)
     (local $1 i32)
     (set_local $1
diff --git a/test/llvm_autogenerated/comparisons_f32.wast b/test/llvm_autogenerated/comparisons_f32.wast
index ec48c00a3..7a8c1d2dd 100644
--- a/test/llvm_autogenerated/comparisons_f32.wast
+++ b/test/llvm_autogenerated/comparisons_f32.wast
@@ -1,4 +1,5 @@
 (module
+  (table 0 anyfunc)
   (memory $0 1)
   (data (i32.const 4) "\10\04\00\00")
   (export "memory" (memory $0))
@@ -16,8 +17,6 @@
   (export "ule_f32" (func $ule_f32))
   (export "ugt_f32" (func $ugt_f32))
   (export "uge_f32" (func $uge_f32))
-  (table 0 anyfunc)
-  
   (func $ord_f32 (param $0 f32) (param $1 f32) (result i32)
     (return
       (i32.and
diff --git a/test/llvm_autogenerated/comparisons_f64.wast b/test/llvm_autogenerated/comparisons_f64.wast
index a6cc35839..ae750dd92 100644
--- a/test/llvm_autogenerated/comparisons_f64.wast
+++ b/test/llvm_autogenerated/comparisons_f64.wast
@@ -1,4 +1,5 @@
 (module
+  (table 0 anyfunc)
   (memory $0 1)
   (data (i32.const 4) "\10\04\00\00")
   (export "memory" (memory $0))
@@ -16,8 +17,6 @@
   (export "ule_f64" (func $ule_f64))
   (export "ugt_f64" (func $ugt_f64))
   (export "uge_f64" (func $uge_f64))
-  (table 0 anyfunc)
-  
   (func $ord_f64 (param $0 f64) (param $1 f64) (result i32)
     (return
       (i32.and
diff --git a/test/llvm_autogenerated/comparisons_i32.wast b/test/llvm_autogenerated/comparisons_i32.wast
index fc64fad81..1ee0c02e7 100644
--- a/test/llvm_autogenerated/comparisons_i32.wast
+++ b/test/llvm_autogenerated/comparisons_i32.wast
@@ -1,4 +1,5 @@
 (module
+  (table 0 anyfunc)
   (memory $0 1)
   (data (i32.const 4) "\10\04\00\00")
   (export "memory" (memory $0))
@@ -12,8 +13,6 @@
   (export "sge_i32" (func $sge_i32))
   (export "ugt_i32" (func $ugt_i32))
   (export "uge_i32" (func $uge_i32))
-  (table 0 anyfunc)
-  
   (func $eq_i32 (param $0 i32) (param $1 i32) (result i32)
     (return
       (i32.eq
diff --git a/test/llvm_autogenerated/comparisons_i64.wast b/test/llvm_autogenerated/comparisons_i64.wast
index 82c491ae3..f04f1eedb 100644
--- a/test/llvm_autogenerated/comparisons_i64.wast
+++ b/test/llvm_autogenerated/comparisons_i64.wast
@@ -1,4 +1,5 @@
 (module
+  (table 0 anyfunc)
   (memory $0 1)
   (data (i32.const 4) "\10\04\00\00")
   (export "memory" (memory $0))
@@ -12,8 +13,6 @@
   (export "sge_i64" (func $sge_i64))
   (export "ugt_i64" (func $ugt_i64))
   (export "uge_i64" (func $uge_i64))
-  (table 0 anyfunc)
-  
   (func $eq_i64 (param $0 i64) (param $1 i64) (result i32)
     (return
       (i64.eq
diff --git a/test/llvm_autogenerated/conv.wast b/test/llvm_autogenerated/conv.wast
index 28b10fbfd..a1673e25b 100644
--- a/test/llvm_autogenerated/conv.wast
+++ b/test/llvm_autogenerated/conv.wast
@@ -1,4 +1,5 @@
 (module
+  (table 0 anyfunc)
   (memory $0 1)
   (data (i32.const 4) "\10\04\00\00")
   (export "memory" (memory $0))
@@ -28,8 +29,6 @@
   (export "bitcast_float_to_i32" (func $bitcast_float_to_i32))
   (export "bitcast_i64_to_double" (func $bitcast_i64_to_double))
   (export "bitcast_double_to_i64" (func $bitcast_double_to_i64))
-  (table 0 anyfunc)
-  
   (func $i32_wrap_i64 (param $0 i64) (result i32)
     (return
       (i32.wrap/i64
diff --git a/test/llvm_autogenerated/copysign-casts.wast b/test/llvm_autogenerated/copysign-casts.wast
index e6e62fe34..43cd8a908 100644
--- a/test/llvm_autogenerated/copysign-casts.wast
+++ b/test/llvm_autogenerated/copysign-casts.wast
@@ -1,13 +1,12 @@
 (module
-  (memory $0 1)
-  (data (i32.const 4) "\10\04\00\00")
   (type $FUNCSIG$ddd (func (param f64 f64) (result f64)))
   (type $FUNCSIG$fff (func (param f32 f32) (result f32)))
+  (table 0 anyfunc)
+  (memory $0 1)
+  (data (i32.const 4) "\10\04\00\00")
   (export "memory" (memory $0))
   (export "fold_promote" (func $fold_promote))
   (export "fold_demote" (func $fold_demote))
-  (table 0 anyfunc)
-  
   (func $fold_promote (param $0 f64) (param $1 f32) (result f64)
     (f64.copysign
       (get_local $0)
diff --git a/test/llvm_autogenerated/cpus.wast b/test/llvm_autogenerated/cpus.wast
index d528c58fd..cdef27ee8 100644
--- a/test/llvm_autogenerated/cpus.wast
+++ b/test/llvm_autogenerated/cpus.wast
@@ -1,10 +1,9 @@
 (module
+  (table 0 anyfunc)
   (memory $0 1)
   (data (i32.const 4) "\10\04\00\00")
   (export "memory" (memory $0))
   (export "f" (func $f))
-  (table 0 anyfunc)
-  
   (func $f (param $0 i32) (result i32)
     (get_local $0)
   )
diff --git a/test/llvm_autogenerated/dead-vreg.wast b/test/llvm_autogenerated/dead-vreg.wast
index f6d440bc3..b41745078 100644
--- a/test/llvm_autogenerated/dead-vreg.wast
+++ b/test/llvm_autogenerated/dead-vreg.wast
@@ -1,10 +1,9 @@
 (module
+  (table 0 anyfunc)
   (memory $0 1)
   (data (i32.const 4) "\10\04\00\00")
   (export "memory" (memory $0))
   (export "foo" (func $foo))
-  (table 0 anyfunc)
-  
   (func $foo (param $0 i32) (param $1 i32) (param $2 i32)
     (local $3 i32)
     (local $4 i32)
diff --git a/test/llvm_autogenerated/divrem-constant.wast b/test/llvm_autogenerated/divrem-constant.wast
index 8c985e436..2d8af57f7 100644
--- a/test/llvm_autogenerated/divrem-constant.wast
+++ b/test/llvm_autogenerated/divrem-constant.wast
@@ -1,4 +1,5 @@
 (module
+  (table 0 anyfunc)
   (memory $0 1)
   (data (i32.const 4) "\10\04\00\00")
   (export "memory" (memory $0))
@@ -10,8 +11,6 @@
   (export "test_urem_5" (func $test_urem_5))
   (export "test_srem_2" (func $test_srem_2))
   (export "test_srem_5" (func $test_srem_5))
-  (table 0 anyfunc)
-  
   (func $test_udiv_2 (param $0 i32) (result i32)
     (i32.shr_u
       (get_local $0)
diff --git a/test/llvm_autogenerated/f32.wast b/test/llvm_autogenerated/f32.wast
index dfbe7fc0c..2f4811361 100644
--- a/test/llvm_autogenerated/f32.wast
+++ b/test/llvm_autogenerated/f32.wast
@@ -1,8 +1,9 @@
 (module
-  (memory $0 1)
-  (data (i32.const 4) "\10\04\00\00")
   (type $FUNCSIG$ffff (func (param f32 f32 f32) (result f32)))
   (import "env" "fmaf" (func $fmaf (param f32 f32 f32) (result f32)))
+  (table 0 anyfunc)
+  (memory $0 1)
+  (data (i32.const 4) "\10\04\00\00")
   (export "memory" (memory $0))
   (export "fadd32" (func $fadd32))
   (export "fsub32" (func $fsub32))
@@ -20,8 +21,6 @@
   (export "fmin32" (func $fmin32))
   (export "fmax32" (func $fmax32))
   (export "fma32" (func $fma32))
-  (table 0 anyfunc)
-  
   (func $fadd32 (param $0 f32) (param $1 f32) (result f32)
     (return
       (f32.add
diff --git a/test/llvm_autogenerated/f64.wast b/test/llvm_autogenerated/f64.wast
index 4350d5dc7..9d4ed937b 100644
--- a/test/llvm_autogenerated/f64.wast
+++ b/test/llvm_autogenerated/f64.wast
@@ -1,8 +1,9 @@
 (module
-  (memory $0 1)
-  (data (i32.const 4) "\10\04\00\00")
   (type $FUNCSIG$dddd (func (param f64 f64 f64) (result f64)))
   (import "env" "fma" (func $fma (param f64 f64 f64) (result f64)))
+  (table 0 anyfunc)
+  (memory $0 1)
+  (data (i32.const 4) "\10\04\00\00")
   (export "memory" (memory $0))
   (export "fadd64" (func $fadd64))
   (export "fsub64" (func $fsub64))
@@ -20,8 +21,6 @@
   (export "fmin64" (func $fmin64))
   (export "fmax64" (func $fmax64))
   (export "fma64" (func $fma64))
-  (table 0 anyfunc)
-  
   (func $fadd64 (param $0 f64) (param $1 f64) (result f64)
     (return
       (f64.add
diff --git a/test/llvm_autogenerated/fast-isel-noreg.wast b/test/llvm_autogenerated/fast-isel-noreg.wast
index c336591a6..eaaa78ebb 100644
--- a/test/llvm_autogenerated/fast-isel-noreg.wast
+++ b/test/llvm_autogenerated/fast-isel-noreg.wast
@@ -1,12 +1,11 @@
 (module
+  (table 0 anyfunc)
   (memory $0 1)
   (data (i32.const 4) "\10\04\00\00")
   (export "memory" (memory $0))
   (export "a" (func $a))
   (export "b" (func $b))
   (export "c" (func $c))
-  (table 0 anyfunc)
-  
   (func $a (result i32)
     (return
       (i32.const 0)
diff --git a/test/llvm_autogenerated/fast-isel.wast b/test/llvm_autogenerated/fast-isel.wast
index 285f649a4..54701dae3 100644
--- a/test/llvm_autogenerated/fast-isel.wast
+++ b/test/llvm_autogenerated/fast-isel.wast
@@ -1,4 +1,5 @@
 (module
+  (table 0 anyfunc)
   (memory $0 1)
   (data (i32.const 4) "\10\04\00\00")
   (export "memory" (memory $0))
@@ -8,8 +9,6 @@
   (export "bitcast_f32_i32" (func $bitcast_f32_i32))
   (export "bitcast_i64_f64" (func $bitcast_i64_f64))
   (export "bitcast_f64_i64" (func $bitcast_f64_i64))
-  (table 0 anyfunc)
-  
   (func $immediate_f32 (result f32)
     (f32.const 2.5)
   )
diff --git a/test/llvm_autogenerated/frem.wast b/test/llvm_autogenerated/frem.wast
index 1272ee2e9..01047d9e8 100644
--- a/test/llvm_autogenerated/frem.wast
+++ b/test/llvm_autogenerated/frem.wast
@@ -1,15 +1,14 @@
 (module
-  (memory $0 1)
-  (data (i32.const 4) "\10\04\00\00")
   (type $FUNCSIG$ddd (func (param f64 f64) (result f64)))
   (type $FUNCSIG$fff (func (param f32 f32) (result f32)))
   (import "env" "fmod" (func $fmod (param f64 f64) (result f64)))
   (import "env" "fmodf" (func $fmodf (param f32 f32) (result f32)))
+  (table 0 anyfunc)
+  (memory $0 1)
+  (data (i32.const 4) "\10\04\00\00")
   (export "memory" (memory $0))
   (export "frem32" (func $frem32))
   (export "frem64" (func $frem64))
-  (table 0 anyfunc)
-  
   (func $frem32 (param $0 f32) (param $1 f32) (result f32)
     (return
       (call $fmodf
diff --git a/test/llvm_autogenerated/func.wast b/test/llvm_autogenerated/func.wast
index 06144cab7..5967904b8 100644
--- a/test/llvm_autogenerated/func.wast
+++ b/test/llvm_autogenerated/func.wast
@@ -1,4 +1,5 @@
 (module
+  (table 0 anyfunc)
   (memory $0 1)
   (data (i32.const 4) "\10\04\00\00")
   (export "memory" (memory $0))
@@ -8,8 +9,6 @@
   (export "f3" (func $f3))
   (export "f4" (func $f4))
   (export "f5" (func $f5))
-  (table 0 anyfunc)
-  
   (func $f0
     (return)
   )
diff --git a/test/llvm_autogenerated/global.wast b/test/llvm_autogenerated/global.wast
index c7821455a..459245d7c 100644
--- a/test/llvm_autogenerated/global.wast
+++ b/test/llvm_autogenerated/global.wast
@@ -1,4 +1,7 @@
 (module
+  (type $FUNCSIG$iiii (func (param i32 i32 i32) (result i32)))
+  (import "env" "memcpy" (func $memcpy (param i32 i32 i32) (result i32)))
+  (table 0 anyfunc)
   (memory $0 1)
   (data (i32.const 4) "\b0\08\00\00")
   (data (i32.const 12) "9\05\00\00")
@@ -13,13 +16,9 @@
   (data (i32.const 136) "\00\00\00\00\00\00\00@")
   (data (i32.const 656) "\e0\00\00\00")
   (data (i32.const 1192) "\a4\04\00\00")
-  (type $FUNCSIG$iiii (func (param i32 i32 i32) (result i32)))
-  (import "env" "memcpy" (func $memcpy (param i32 i32 i32) (result i32)))
   (export "memory" (memory $0))
   (export "foo" (func $foo))
   (export "call_memcpy" (func $call_memcpy))
-  (table 0 anyfunc)
-  
   (func $foo (result i32)
     (return
       (i32.load offset=32
diff --git a/test/llvm_autogenerated/globl.wast b/test/llvm_autogenerated/globl.wast
index f628844f7..ccdba4ae8 100644
--- a/test/llvm_autogenerated/globl.wast
+++ b/test/llvm_autogenerated/globl.wast
@@ -1,10 +1,9 @@
 (module
+  (table 0 anyfunc)
   (memory $0 1)
   (data (i32.const 4) "\10\04\00\00")
   (export "memory" (memory $0))
   (export "foo" (func $foo))
-  (table 0 anyfunc)
-  
   (func $foo
   )
 )
diff --git a/test/llvm_autogenerated/i128.wast b/test/llvm_autogenerated/i128.wast
index eedabe170..2cd971e19 100644
--- a/test/llvm_autogenerated/i128.wast
+++ b/test/llvm_autogenerated/i128.wast
@@ -1,6 +1,4 @@
 (module
-  (memory $0 1)
-  (data (i32.const 4) "\10\04\00\00")
   (type $FUNCSIG$vijji (func (param i32 i64 i64 i32)))
   (type $FUNCSIG$vijjjj (func (param i32 i64 i64 i64 i64)))
   (import "env" "__ashlti3" (func $__ashlti3 (param i32 i64 i64 i32)))
@@ -11,6 +9,9 @@
   (import "env" "__multi3" (func $__multi3 (param i32 i64 i64 i64 i64)))
   (import "env" "__udivti3" (func $__udivti3 (param i32 i64 i64 i64 i64)))
   (import "env" "__umodti3" (func $__umodti3 (param i32 i64 i64 i64 i64)))
+  (table 0 anyfunc)
+  (memory $0 1)
+  (data (i32.const 4) "\10\04\00\00")
   (export "memory" (memory $0))
   (export "add128" (func $add128))
   (export "sub128" (func $sub128))
@@ -35,8 +36,6 @@
   (export "masked_rotl" (func $masked_rotl))
   (export "rotr" (func $rotr))
   (export "masked_rotr" (func $masked_rotr))
-  (table 0 anyfunc)
-  
   (func $add128 (param $0 i32) (param $1 i64) (param $2 i64) (param $3 i64) (param $4 i64)
     (local $5 i64)
     (i64.store
diff --git a/test/llvm_autogenerated/i32-load-store-alignment.wast b/test/llvm_autogenerated/i32-load-store-alignment.wast
index 85dcdaeb6..59f57a0b2 100644
--- a/test/llvm_autogenerated/i32-load-store-alignment.wast
+++ b/test/llvm_autogenerated/i32-load-store-alignment.wast
@@ -1,4 +1,5 @@
 (module
+  (table 0 anyfunc)
   (memory $0 1)
   (data (i32.const 4) "\10\04\00\00")
   (export "memory" (memory $0))
@@ -22,8 +23,6 @@
   (export "sti16_a1" (func $sti16_a1))
   (export "sti16_a2" (func $sti16_a2))
   (export "sti16_a4" (func $sti16_a4))
-  (table 0 anyfunc)
-  
   (func $ldi32_a1 (param $0 i32) (result i32)
     (return
       (i32.load align=1
diff --git a/test/llvm_autogenerated/i32.wast b/test/llvm_autogenerated/i32.wast
index e0bd84c93..2afbfb70b 100644
--- a/test/llvm_autogenerated/i32.wast
+++ b/test/llvm_autogenerated/i32.wast
@@ -1,4 +1,5 @@
 (module
+  (table 0 anyfunc)
   (memory $0 1)
   (data (i32.const 4) "\10\04\00\00")
   (export "memory" (memory $0))
@@ -25,8 +26,6 @@
   (export "masked_rotl" (func $masked_rotl))
   (export "rotr" (func $rotr))
   (export "masked_rotr" (func $masked_rotr))
-  (table 0 anyfunc)
-  
   (func $add32 (param $0 i32) (param $1 i32) (result i32)
     (return
       (i32.add
diff --git a/test/llvm_autogenerated/i64-load-store-alignment.wast b/test/llvm_autogenerated/i64-load-store-alignment.wast
index 929f68618..538d1a465 100644
--- a/test/llvm_autogenerated/i64-load-store-alignment.wast
+++ b/test/llvm_autogenerated/i64-load-store-alignment.wast
@@ -1,4 +1,5 @@
 (module
+  (table 0 anyfunc)
   (memory $0 1)
   (data (i32.const 4) "\10\04\00\00")
   (export "memory" (memory $0))
@@ -32,8 +33,6 @@
   (export "sti32_a2" (func $sti32_a2))
   (export "sti32_a4" (func $sti32_a4))
   (export "sti32_a8" (func $sti32_a8))
-  (table 0 anyfunc)
-  
   (func $ldi64_a1 (param $0 i32) (result i64)
     (return
       (i64.load align=1
diff --git a/test/llvm_autogenerated/i64.wast b/test/llvm_autogenerated/i64.wast
index 6cd4766e5..d04dcadc4 100644
--- a/test/llvm_autogenerated/i64.wast
+++ b/test/llvm_autogenerated/i64.wast
@@ -1,4 +1,5 @@
 (module
+  (table 0 anyfunc)
   (memory $0 1)
   (data (i32.const 4) "\10\04\00\00")
   (export "memory" (memory $0))
@@ -25,8 +26,6 @@
   (export "masked_rotl" (func $masked_rotl))
   (export "rotr" (func $rotr))
   (export "masked_rotr" (func $masked_rotr))
-  (table 0 anyfunc)
-  
   (func $add64 (param $0 i64) (param $1 i64) (result i64)
     (return
       (i64.add
diff --git a/test/llvm_autogenerated/ident.wast b/test/llvm_autogenerated/ident.wast
index 42d1df53e..4290c684e 100644
--- a/test/llvm_autogenerated/ident.wast
+++ b/test/llvm_autogenerated/ident.wast
@@ -1,8 +1,7 @@
 (module
+  (table 0 anyfunc)
   (memory $0 1)
   (data (i32.const 4) "\10\04\00\00")
   (export "memory" (memory $0))
-  (table 0 anyfunc)
-  
 )
 ;; METADATA: { "asmConsts": {},"staticBump": 1040, "initializers": [] }
diff --git a/test/llvm_autogenerated/immediates.wast b/test/llvm_autogenerated/immediates.wast
index e10d21b06..c1e2fdaf4 100644
--- a/test/llvm_autogenerated/immediates.wast
+++ b/test/llvm_autogenerated/immediates.wast
@@ -1,4 +1,5 @@
 (module
+  (table 0 anyfunc)
   (memory $0 1)
   (data (i32.const 4) "\10\04\00\00")
   (export "memory" (memory $0))
@@ -30,8 +31,6 @@
   (export "neginf_f64" (func $neginf_f64))
   (export "custom_nan_f64" (func $custom_nan_f64))
   (export "custom_nans_f64" (func $custom_nans_f64))
-  (table 0 anyfunc)
-  
   (func $zero_i32 (result i32)
     (return
       (i32.const 0)
diff --git a/test/llvm_autogenerated/indirect-import.wast b/test/llvm_autogenerated/indirect-import.wast
index a6fb24641..0af1cf1b0 100644
--- a/test/llvm_autogenerated/indirect-import.wast
+++ b/test/llvm_autogenerated/indirect-import.wast
@@ -1,6 +1,4 @@
 (module
-  (memory $0 1)
-  (data (i32.const 4) "\10\04\00\00")
   (type $FUNCSIG$fd (func (param f64) (result f32)))
   (type $FUNCSIG$vj (func (param i64)))
   (type $FUNCSIG$v (func))
@@ -13,13 +11,15 @@
   (import "env" "extern_fd" (func $extern_fd (param f64) (result f32)))
   (import "env" "extern_struct" (func $extern_struct (param i32)))
   (import "env" "extern_sret" (func $extern_sret (param i32)))
+  (table 7 7 anyfunc)
+  (elem (i32.const 0) $__wasm_nullptr $__importThunk_extern_fd $__importThunk_extern_vj $__importThunk_extern_v $__importThunk_extern_ijidf $__importThunk_extern_struct $__importThunk_extern_sret)
+  (memory $0 1)
+  (data (i32.const 4) "\10\04\00\00")
   (export "memory" (memory $0))
   (export "bar" (func $bar))
   (export "dynCall_fd" (func $dynCall_fd))
   (export "dynCall_v" (func $dynCall_v))
   (export "dynCall_vi" (func $dynCall_vi))
-  (table 7 7 anyfunc)
-  (elem (i32.const 0) $__wasm_nullptr $__importThunk_extern_fd $__importThunk_extern_vj $__importThunk_extern_v $__importThunk_extern_ijidf $__importThunk_extern_struct $__importThunk_extern_sret)
   (func $bar (result i32)
     (local $0 i32)
     (local $1 i32)
diff --git a/test/llvm_autogenerated/irreducible-cfg.wast b/test/llvm_autogenerated/irreducible-cfg.wast
index 783922490..223cf1ae9 100644
--- a/test/llvm_autogenerated/irreducible-cfg.wast
+++ b/test/llvm_autogenerated/irreducible-cfg.wast
@@ -1,11 +1,10 @@
 (module
+  (table 0 anyfunc)
   (memory $0 1)
   (data (i32.const 4) "\10\04\00\00")
   (export "memory" (memory $0))
   (export "test0" (func $test0))
   (export "test1" (func $test1))
-  (table 0 anyfunc)
-  
   (func $test0 (param $0 i32) (param $1 i32) (param $2 i32) (param $3 i32)
     (local $4 f64)
     (local $5 i32)
diff --git a/test/llvm_autogenerated/legalize.wast b/test/llvm_autogenerated/legalize.wast
index 3473859e1..e5d5887bf 100644
--- a/test/llvm_autogenerated/legalize.wast
+++ b/test/llvm_autogenerated/legalize.wast
@@ -1,9 +1,10 @@
 (module
-  (memory $0 1)
-  (data (i32.const 4) "\10\04\00\00")
   (type $FUNCSIG$vijji (func (param i32 i64 i64 i32)))
   (import "env" "__ashlti3" (func $__ashlti3 (param i32 i64 i64 i32)))
   (import "env" "__lshrti3" (func $__lshrti3 (param i32 i64 i64 i32)))
+  (table 0 anyfunc)
+  (memory $0 1)
+  (data (i32.const 4) "\10\04\00\00")
   (export "memory" (memory $0))
   (export "shl_i3" (func $shl_i3))
   (export "shl_i53" (func $shl_i53))
@@ -11,8 +12,6 @@
   (export "fpext_f32_f64" (func $fpext_f32_f64))
   (export "fpconv_f64_f32" (func $fpconv_f64_f32))
   (export "bigshift" (func $bigshift))
-  (table 0 anyfunc)
-  
   (func $shl_i3 (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
     (return
       (i32.shl
diff --git a/test/llvm_autogenerated/load-ext.wast b/test/llvm_autogenerated/load-ext.wast
index d28332dd0..f2ebe1943 100644
--- a/test/llvm_autogenerated/load-ext.wast
+++ b/test/llvm_autogenerated/load-ext.wast
@@ -1,4 +1,5 @@
 (module
+  (table 0 anyfunc)
   (memory $0 1)
   (data (i32.const 4) "\10\04\00\00")
   (export "memory" (memory $0))
@@ -12,8 +13,6 @@
   (export "zext_i16_i64" (func $zext_i16_i64))
   (export "sext_i32_i64" (func $sext_i32_i64))
   (export "zext_i32_i64" (func $zext_i32_i64))
-  (table 0 anyfunc)
-  
   (func $sext_i8_i32 (param $0 i32) (result i32)
     (return
       (i32.load8_s
diff --git a/test/llvm_autogenerated/load-store-i1.wast b/test/llvm_autogenerated/load-store-i1.wast
index 45d34dceb..adfb032a1 100644
--- a/test/llvm_autogenerated/load-store-i1.wast
+++ b/test/llvm_autogenerated/load-store-i1.wast
@@ -1,4 +1,5 @@
 (module
+  (table 0 anyfunc)
   (memory $0 1)
   (data (i32.const 4) "\10\04\00\00")
   (export "memory" (memory $0))
@@ -8,8 +9,6 @@
   (export "load_s_i1_i64" (func $load_s_i1_i64))
   (export "store_i32_i1" (func $store_i32_i1))
   (export "store_i64_i1" (func $store_i64_i1))
-  (table 0 anyfunc)
-  
   (func $load_u_i1_i32 (param $0 i32) (result i32)
     (return
       (i32.load8_u
diff --git a/test/llvm_autogenerated/load.wast b/test/llvm_autogenerated/load.wast
index 4574857d6..22bd0d5f6 100644
--- a/test/llvm_autogenerated/load.wast
+++ b/test/llvm_autogenerated/load.wast
@@ -1,4 +1,5 @@
 (module
+  (table 0 anyfunc)
   (memory $0 1)
   (data (i32.const 4) "\10\04\00\00")
   (export "memory" (memory $0))
@@ -6,8 +7,6 @@
   (export "ldi64" (func $ldi64))
   (export "ldf32" (func $ldf32))
   (export "ldf64" (func $ldf64))
-  (table 0 anyfunc)
-  
   (func $ldi32 (param $0 i32) (result i32)
     (return
       (i32.load
diff --git a/test/llvm_autogenerated/lower-em-ehsjlj-options.wast b/test/llvm_autogenerated/lower-em-ehsjlj-options.wast
index a312038ce..e2c020a1e 100644
--- a/test/llvm_autogenerated/lower-em-ehsjlj-options.wast
+++ b/test/llvm_autogenerated/lower-em-ehsjlj-options.wast
@@ -1,9 +1,4 @@
 (module
-  (memory $0 1)
-  (data (i32.const 4) " \04\00\00")
-  (data (i32.const 12) "\00\00\00\00")
-  (data (i32.const 16) "\00\00\00\00")
-  (data (i32.const 20) "\00\00\00\00")
   (type $FUNCSIG$v (func))
   (type $FUNCSIG$i (func (result i32)))
   (type $FUNCSIG$ii (func (param i32) (result i32)))
@@ -16,14 +11,19 @@
   (import "env" "longjmp" (func $longjmp (param i32 i32)))
   (import "env" "setjmp" (func $setjmp (param i32) (result i32)))
   (import "env" "foo" (func $foo))
+  (table 2 2 anyfunc)
+  (elem (i32.const 0) $__wasm_nullptr $__importThunk_foo)
+  (memory $0 1)
+  (data (i32.const 4) " \04\00\00")
+  (data (i32.const 12) "\00\00\00\00")
+  (data (i32.const 16) "\00\00\00\00")
+  (data (i32.const 20) "\00\00\00\00")
   (export "memory" (memory $0))
   (export "exception" (func $exception))
   (export "setjmp_longjmp" (func $setjmp_longjmp))
   (export "setThrew" (func $setThrew))
   (export "setTempRet0" (func $setTempRet0))
   (export "dynCall_v" (func $dynCall_v))
-  (table 2 2 anyfunc)
-  (elem (i32.const 0) $__wasm_nullptr $__importThunk_foo)
   (func $exception
     (local $0 i32)
     (i32.store offset=12
diff --git a/test/llvm_autogenerated/mem-intrinsics.wast b/test/llvm_autogenerated/mem-intrinsics.wast
index 7fc5edf51..d0a1996e2 100644
--- a/test/llvm_autogenerated/mem-intrinsics.wast
+++ b/test/llvm_autogenerated/mem-intrinsics.wast
@@ -1,6 +1,4 @@
 (module
-  (memory $0 1)
-  (data (i32.const 4) "\10\04\00\00")
   (type $FUNCSIG$i (func (result i32)))
   (type $FUNCSIG$v (func))
   (type $FUNCSIG$iiii (func (param i32 i32 i32) (result i32)))
@@ -9,6 +7,9 @@
   (import "env" "memcpy" (func $memcpy (param i32 i32 i32) (result i32)))
   (import "env" "memmove" (func $memmove (param i32 i32 i32) (result i32)))
   (import "env" "memset" (func $memset (param i32 i32 i32) (result i32)))
+  (table 0 anyfunc)
+  (memory $0 1)
+  (data (i32.const 4) "\10\04\00\00")
   (export "memory" (memory $0))
   (export "copy_yes" (func $copy_yes))
   (export "copy_no" (func $copy_no))
@@ -19,8 +20,6 @@
   (export "frame_index" (func $frame_index))
   (export "drop_result" (func $drop_result))
   (export "tail_dup_to_reuse_result" (func $tail_dup_to_reuse_result))
-  (table 0 anyfunc)
-  
   (func $copy_yes (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
     (return
       (call $memcpy
diff --git a/test/llvm_autogenerated/memory-addr32.wast b/test/llvm_autogenerated/memory-addr32.wast
index 96934599a..b6aeb2d76 100644
--- a/test/llvm_autogenerated/memory-addr32.wast
+++ b/test/llvm_autogenerated/memory-addr32.wast
@@ -1,11 +1,10 @@
 (module
+  (table 0 anyfunc)
   (memory $0 1)
   (data (i32.const 4) "\10\04\00\00")
   (export "memory" (memory $0))
   (export "current_memory" (func $current_memory))
   (export "grow_memory" (func $grow_memory))
-  (table 0 anyfunc)
-  
   (func $current_memory (result i32)
     (return
       (current_memory)
diff --git a/test/llvm_autogenerated/negative-base-reg.wast b/test/llvm_autogenerated/negative-base-reg.wast
index 05d7d5488..5d55462ce 100644
--- a/test/llvm_autogenerated/negative-base-reg.wast
+++ b/test/llvm_autogenerated/negative-base-reg.wast
@@ -1,10 +1,9 @@
 (module
+  (table 0 anyfunc)
   (memory $0 1)
   (data (i32.const 4) "\90\04\00\00")
   (export "memory" (memory $0))
   (export "main" (func $main))
-  (table 0 anyfunc)
-  
   (func $main (result i32)
     (local $0 i32)
     (set_local $0
diff --git a/test/llvm_autogenerated/non-executable-stack.wast b/test/llvm_autogenerated/non-executable-stack.wast
index 42d1df53e..4290c684e 100644
--- a/test/llvm_autogenerated/non-executable-stack.wast
+++ b/test/llvm_autogenerated/non-executable-stack.wast
@@ -1,8 +1,7 @@
 (module
+  (table 0 anyfunc)
   (memory $0 1)
   (data (i32.const 4) "\10\04\00\00")
   (export "memory" (memory $0))
-  (table 0 anyfunc)
-  
 )
 ;; METADATA: { "asmConsts": {},"staticBump": 1040, "initializers": [] }
diff --git a/test/llvm_autogenerated/offset.wast b/test/llvm_autogenerated/offset.wast
index 44a60305b..6996812ed 100644
--- a/test/llvm_autogenerated/offset.wast
+++ b/test/llvm_autogenerated/offset.wast
@@ -1,4 +1,5 @@
 (module
+  (table 0 anyfunc)
   (memory $0 1)
   (data (i32.const 4) "\10\04\00\00")
   (data (i32.const 12) "\00\00\00\00")
@@ -38,8 +39,6 @@
   (export "aggregate_load_store" (func $aggregate_load_store))
   (export "aggregate_return" (func $aggregate_return))
   (export "aggregate_return_without_merge" (func $aggregate_return_without_merge))
-  (table 0 anyfunc)
-  
   (func $load_i32_with_folded_offset (param $0 i32) (result i32)
     (i32.load offset=24
       (get_local $0)
diff --git a/test/llvm_autogenerated/phi.wast b/test/llvm_autogenerated/phi.wast
index 710a3fdc4..7adfce863 100644
--- a/test/llvm_autogenerated/phi.wast
+++ b/test/llvm_autogenerated/phi.wast
@@ -1,11 +1,10 @@
 (module
+  (table 0 anyfunc)
   (memory $0 1)
   (data (i32.const 4) "\10\04\00\00")
   (export "memory" (memory $0))
   (export "test0" (func $test0))
   (export "test1" (func $test1))
-  (table 0 anyfunc)
-  
   (func $test0 (param $0 i32) (result i32)
     (block $label$0
       (br_if $label$0
diff --git a/test/llvm_autogenerated/reg-stackify.wast b/test/llvm_autogenerated/reg-stackify.wast
index 80dc657ac..c05846045 100644
--- a/test/llvm_autogenerated/reg-stackify.wast
+++ b/test/llvm_autogenerated/reg-stackify.wast
@@ -1,7 +1,4 @@
 (module
-  (memory $0 1)
-  (data (i32.const 4) "\10\04\00\00")
-  (data (i32.const 12) "\00\00\00\00")
   (type $FUNCSIG$i (func (result i32)))
   (type $FUNCSIG$ii (func (param i32) (result i32)))
   (type $FUNCSIG$v (func))
@@ -20,6 +17,10 @@
   (import "env" "use_a" (func $use_a (param i32)))
   (import "env" "use_b" (func $use_b (param i32)))
   (import "env" "use_memory" (func $use_memory (param i32) (result i32)))
+  (table 0 anyfunc)
+  (memory $0 1)
+  (data (i32.const 4) "\10\04\00\00")
+  (data (i32.const 12) "\00\00\00\00")
   (export "memory" (memory $0))
   (export "no0" (func $no0))
   (export "no1" (func $no1))
@@ -45,8 +46,6 @@
   (export "no_stackify_past_epilogue" (func $no_stackify_past_epilogue))
   (export "stackify_indvar" (func $stackify_indvar))
   (export "stackpointer_dependency" (func $stackpointer_dependency))
-  (table 0 anyfunc)
-  
   (func $no0 (param $0 i32) (param $1 i32) (result i32)
     (set_local $1
       (i32.load
diff --git a/test/llvm_autogenerated/return-int32.wast b/test/llvm_autogenerated/return-int32.wast
index b9bd266ec..961c4ec4a 100644
--- a/test/llvm_autogenerated/return-int32.wast
+++ b/test/llvm_autogenerated/return-int32.wast
@@ -1,11 +1,10 @@
 (module
+  (table 0 anyfunc)
   (memory $0 1)
   (data (i32.const 4) "\10\04\00\00")
   (export "memory" (memory $0))
   (export "return_i32" (func $return_i32))
   (export "return_i32_twice" (func $return_i32_twice))
-  (table 0 anyfunc)
-  
   (func $return_i32 (param $0 i32) (result i32)
     (get_local $0)
   )
diff --git a/test/llvm_autogenerated/return-void.wast b/test/llvm_autogenerated/return-void.wast
index eb61d6fbd..2a4e5fc5a 100644
--- a/test/llvm_autogenerated/return-void.wast
+++ b/test/llvm_autogenerated/return-void.wast
@@ -1,11 +1,10 @@
 (module
+  (table 0 anyfunc)
   (memory $0 1)
   (data (i32.const 4) "\10\04\00\00")
   (export "memory" (memory $0))
   (export "return_void" (func $return_void))
   (export "return_void_twice" (func $return_void_twice))
-  (table 0 anyfunc)
-  
   (func $return_void
   )
   (func $return_void_twice (param $0 i32)
diff --git a/test/llvm_autogenerated/select.wast b/test/llvm_autogenerated/select.wast
index 3de8bbf43..73a480309 100644
--- a/test/llvm_autogenerated/select.wast
+++ b/test/llvm_autogenerated/select.wast
@@ -1,4 +1,5 @@
 (module
+  (table 0 anyfunc)
   (memory $0 1)
   (data (i32.const 4) "\10\04\00\00")
   (export "memory" (memory $0))
@@ -14,8 +15,6 @@
   (export "select_f64_bool" (func $select_f64_bool))
   (export "select_f64_eq" (func $select_f64_eq))
   (export "select_f64_ne" (func $select_f64_ne))
-  (table 0 anyfunc)
-  
   (func $select_i32_bool (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
     (return
       (select
diff --git a/test/llvm_autogenerated/signext-zeroext.wast b/test/llvm_autogenerated/signext-zeroext.wast
index d9db2fef4..436dc05de 100644
--- a/test/llvm_autogenerated/signext-zeroext.wast
+++ b/test/llvm_autogenerated/signext-zeroext.wast
@@ -1,4 +1,5 @@
 (module
+  (table 0 anyfunc)
   (memory $0 1)
   (data (i32.const 4) "\10\04\00\00")
   (export "memory" (memory $0))
@@ -6,8 +7,6 @@
   (export "s2z_func" (func $s2z_func))
   (export "z2s_call" (func $z2s_call))
   (export "s2z_call" (func $s2z_call))
-  (table 0 anyfunc)
-  
   (func $z2s_func (param $0 i32) (result i32)
     (return
       (i32.shr_s
diff --git a/test/llvm_autogenerated/store-trunc.wast b/test/llvm_autogenerated/store-trunc.wast
index 6fd2f9896..f861018c5 100644
--- a/test/llvm_autogenerated/store-trunc.wast
+++ b/test/llvm_autogenerated/store-trunc.wast
@@ -1,4 +1,5 @@
 (module
+  (table 0 anyfunc)
   (memory $0 1)
   (data (i32.const 4) "\10\04\00\00")
   (export "memory" (memory $0))
@@ -7,8 +8,6 @@
   (export "trunc_i8_i64" (func $trunc_i8_i64))
   (export "trunc_i16_i64" (func $trunc_i16_i64))
   (export "trunc_i32_i64" (func $trunc_i32_i64))
-  (table 0 anyfunc)
-  
   (func $trunc_i8_i32 (param $0 i32) (param $1 i32)
     (i32.store8
       (get_local $0)
diff --git a/test/llvm_autogenerated/store.wast b/test/llvm_autogenerated/store.wast
index d24fb0a18..8ff0f023a 100644
--- a/test/llvm_autogenerated/store.wast
+++ b/test/llvm_autogenerated/store.wast
@@ -1,4 +1,5 @@
 (module
+  (table 0 anyfunc)
   (memory $0 1)
   (data (i32.const 4) "\10\04\00\00")
   (export "memory" (memory $0))
@@ -6,8 +7,6 @@
   (export "sti64" (func $sti64))
   (export "stf32" (func $stf32))
   (export "stf64" (func $stf64))
-  (table 0 anyfunc)
-  
   (func $sti32 (param $0 i32) (param $1 i32)
     (i32.store
       (get_local $0)
diff --git a/test/llvm_autogenerated/switch.wast b/test/llvm_autogenerated/switch.wast
index 0fb7d15aa..3a426edd7 100644
--- a/test/llvm_autogenerated/switch.wast
+++ b/test/llvm_autogenerated/switch.wast
@@ -1,6 +1,4 @@
 (module
-  (memory $0 1)
-  (data (i32.const 4) "\10\04\00\00")
   (type $FUNCSIG$v (func))
   (import "env" "foo0" (func $foo0))
   (import "env" "foo1" (func $foo1))
@@ -8,11 +6,12 @@
   (import "env" "foo3" (func $foo3))
   (import "env" "foo4" (func $foo4))
   (import "env" "foo5" (func $foo5))
+  (table 0 anyfunc)
+  (memory $0 1)
+  (data (i32.const 4) "\10\04\00\00")
   (export "memory" (memory $0))
   (export "bar32" (func $bar32))
   (export "bar64" (func $bar64))
-  (table 0 anyfunc)
-  
   (func $bar32 (param $0 i32)
     (block $label$0
       (br_if $label$0
diff --git a/test/llvm_autogenerated/unreachable.wast b/test/llvm_autogenerated/unreachable.wast
index 8d8b57639..30ed5432b 100644
--- a/test/llvm_autogenerated/unreachable.wast
+++ b/test/llvm_autogenerated/unreachable.wast
@@ -1,14 +1,13 @@
 (module
-  (memory $0 1)
-  (data (i32.const 4) "\10\04\00\00")
   (type $FUNCSIG$v (func))
   (import "env" "abort" (func $abort))
+  (table 0 anyfunc)
+  (memory $0 1)
+  (data (i32.const 4) "\10\04\00\00")
   (export "memory" (memory $0))
   (export "f1" (func $f1))
   (export "f2" (func $f2))
   (export "f3" (func $f3))
-  (table 0 anyfunc)
-  
   (func $f1 (result i32)
     (call $abort)
     (unreachable)
diff --git a/test/llvm_autogenerated/unused-argument.wast b/test/llvm_autogenerated/unused-argument.wast
index efb80c29c..22442eb9c 100644
--- a/test/llvm_autogenerated/unused-argument.wast
+++ b/test/llvm_autogenerated/unused-argument.wast
@@ -1,14 +1,13 @@
 (module
-  (memory $0 1)
-  (data (i32.const 4) "\10\04\00\00")
   (type $FUNCSIG$i (func (result i32)))
   (import "env" "return_something" (func $return_something (result i32)))
+  (table 0 anyfunc)
+  (memory $0 1)
+  (data (i32.const 4) "\10\04\00\00")
   (export "memory" (memory $0))
   (export "unused_first" (func $unused_first))
   (export "unused_second" (func $unused_second))
   (export "call_something" (func $call_something))
-  (table 0 anyfunc)
-  
   (func $unused_first (param $0 i32) (param $1 i32) (result i32)
     (return
       (get_local $1)
diff --git a/test/llvm_autogenerated/userstack.wast b/test/llvm_autogenerated/userstack.wast
index 0d7ea4e27..33f45bd40 100644
--- a/test/llvm_autogenerated/userstack.wast
+++ b/test/llvm_autogenerated/userstack.wast
@@ -1,10 +1,11 @@
 (module
-  (memory $0 1)
-  (data (i32.const 4) "\10\04\00\00")
   (type $FUNCSIG$vi (func (param i32)))
   (import "env" "ext_func" (func $ext_func (param i32)))
   (import "env" "ext_func_i32" (func $ext_func_i32 (param i32)))
   (import "env" "use_i8_star" (func $use_i8_star (param i32)))
+  (table 0 anyfunc)
+  (memory $0 1)
+  (data (i32.const 4) "\10\04\00\00")
   (export "memory" (memory $0))
   (export "alloca32" (func $alloca32))
   (export "alloca3264" (func $alloca3264))
@@ -20,8 +21,6 @@
   (export "frameaddress_0" (func $frameaddress_0))
   (export "frameaddress_1" (func $frameaddress_1))
   (export "inline_asm" (func $inline_asm))
-  (table 0 anyfunc)
-  
   (func $alloca32
     (local $0 i32)
     (i32.store offset=4
diff --git a/test/llvm_autogenerated/varargs.wast b/test/llvm_autogenerated/varargs.wast
index 89c014999..cc4396322 100644
--- a/test/llvm_autogenerated/varargs.wast
+++ b/test/llvm_autogenerated/varargs.wast
@@ -1,9 +1,10 @@
 (module
-  (memory $0 1)
-  (data (i32.const 4) "\10\04\00\00")
   (type $FUNCSIG$v (func))
   (type $FUNCSIG$vi (func (param i32)))
   (import "env" "callee" (func $callee (param i32)))
+  (table 0 anyfunc)
+  (memory $0 1)
+  (data (i32.const 4) "\10\04\00\00")
   (export "memory" (memory $0))
   (export "start" (func $start))
   (export "end" (func $end))
@@ -14,8 +15,6 @@
   (export "caller_none" (func $caller_none))
   (export "caller_some" (func $caller_some))
   (export "startbb" (func $startbb))
-  (table 0 anyfunc)
-  
   (func $start (param $0 i32) (param $1 i32)
     (i32.store
       (get_local $0)