Merge pull request #668 from WebAssembly/tables_n_memories

Tables and memories

92 files changed, 239 insertions, 272 deletions

diff --git a/test/dot_s/alias.wast b/test/dot_s/alias.wast
index 5744f8e8a..8ba469564 100644
--- a/test/dot_s/alias.wast
+++ b/test/dot_s/alias.wast
@@ -1,13 +1,13 @@
 (module
-  (memory 1
-    (segment 16 "\d2\04\00\00\00\00\00\00)\t\00\00")
-  )
+  (memory 1)
+  (data (i32.const 16) "\d2\04\00\00\00\00\00\00)\t\00\00")
   (export "memory" memory)
   (type $FUNCSIG$v (func))
   (export "__exit" $__exit)
   (export "__needs_exit" $__needs_exit)
   (export "dynCall_v" $dynCall_v)
-  (table $__wasm_nullptr $__exit)
+  (table 2 2 anyfunc)
+  (elem (i32.const 0) $__wasm_nullptr $__exit)
   (func $__exit (type $FUNCSIG$v)
     (return
       (i32.add
diff --git a/test/dot_s/asm_const.wast b/test/dot_s/asm_const.wast
index ec9389029..564a565ef 100644
--- a/test/dot_s/asm_const.wast
+++ b/test/dot_s/asm_const.wast
@@ -1,7 +1,6 @@
 (module
-  (memory 1
-    (segment 16 "{ Module.print(\"hello, world!\"); }\00")
-  )
+  (memory 1)
+  (data (i32.const 16) "{ Module.print(\"hello, world!\"); }\00")
   (export "memory" memory)
   (type $FUNCSIG$vi (func (param i32)))
   (import $emscripten_asm_const_vi "env" "emscripten_asm_const_vi" (param i32))
diff --git a/test/dot_s/basics.wast b/test/dot_s/basics.wast
index b93bcd5cc..3562140fb 100644
--- a/test/dot_s/basics.wast
+++ b/test/dot_s/basics.wast
@@ -1,9 +1,8 @@
 (module
-  (memory 1
-    (segment 16 "hello, world!\n\00")
-    (segment 32 "vcq")
-    (segment 48 "\16\00\00\00")
-  )
+  (memory 1)
+  (data (i32.const 16) "hello, world!\n\00")
+  (data (i32.const 32) "vcq")
+  (data (i32.const 48) "\16\00\00\00")
   (export "memory" memory)
   (type $FUNCSIG$vi (func (param i32)))
   (type $FUNCSIG$v (func))
@@ -11,7 +10,8 @@
   (import $puts "env" "puts" (param i32))
   (export "main" $main)
   (export "dynCall_iii" $dynCall_iii)
-  (table $__wasm_nullptr $main)
+  (table 2 2 anyfunc)
+  (elem (i32.const 0) $__wasm_nullptr $main)
   (func $main (type $FUNCSIG$iii) (param $0 i32) (param $1 i32) (result i32)
     (call_import $puts
       (i32.const 16)
diff --git a/test/dot_s/bcp-1.wast b/test/dot_s/bcp-1.wast
index fcbe3b81e..1b76a98af 100644
--- a/test/dot_s/bcp-1.wast
+++ b/test/dot_s/bcp-1.wast
@@ -1,13 +1,12 @@
 (module
-  (memory 1
-    (segment 16 "\01\00\00\00\02\00\00\00\03\00\00\00\04\00\00\00\05\00\00\00\06\00\00\00")
-    (segment 40 "\07\00\00\00\08\00\00\00\t\00\00\00")
-    (segment 52 "\n\00\00\00\0b\00\00\00")
-    (segment 60 "\0c\00\00\00\0d\00\00\00\0e\00\00\00")
-    (segment 72 "\0f\00\00\00\10\00\00\00\11\00\00\00")
-    (segment 96 "hi\00")
-    (segment 100 "\00\00\00\00")
-  )
+  (memory 1)
+  (data (i32.const 16) "\01\00\00\00\02\00\00\00\03\00\00\00\04\00\00\00\05\00\00\00\06\00\00\00")
+  (data (i32.const 40) "\07\00\00\00\08\00\00\00\t\00\00\00")
+  (data (i32.const 52) "\n\00\00\00\0b\00\00\00")
+  (data (i32.const 60) "\0c\00\00\00\0d\00\00\00\0e\00\00\00")
+  (data (i32.const 72) "\0f\00\00\00\10\00\00\00\11\00\00\00")
+  (data (i32.const 96) "hi\00")
+  (data (i32.const 100) "\00\00\00\00")
   (export "memory" memory)
   (type $FUNCSIG$i (func (result i32)))
   (type $FUNCSIG$ii (func (param i32) (result i32)))
@@ -35,7 +34,8 @@
   (export "main" $main)
   (export "dynCall_i" $dynCall_i)
   (export "dynCall_ii" $dynCall_ii)
-  (table $__wasm_nullptr $bad0 $bad1 $bad5 $bad7 $bad8 $bad10 $bad2 $bad3 $bad6 $bad4 $bad9 $good0 $good1 $good2 $opt0 $opt1 $opt2)
+  (table 18 18 anyfunc)
+  (elem (i32.const 0) $__wasm_nullptr $bad0 $bad1 $bad5 $bad7 $bad8 $bad10 $bad2 $bad3 $bad6 $bad4 $bad9 $good0 $good1 $good2 $opt0 $opt1 $opt2)
   (func $bad0 (type $FUNCSIG$i) (result i32)
     (return
       (i32.const 0)
diff --git a/test/dot_s/data-offset-folding.wast b/test/dot_s/data-offset-folding.wast
index e737e04f1..9cdacd60b 100644
--- a/test/dot_s/data-offset-folding.wast
+++ b/test/dot_s/data-offset-folding.wast
@@ -1,8 +1,7 @@
 (module
-  (memory 1
-    (segment 12 "\00\00\00\00")
-    (segment 416 "`\00\00\00")
-  )
+  (memory 1)
+  (data (i32.const 12) "\00\00\00\00")
+  (data (i32.const 416) "`\00\00\00")
   (export "memory" memory)
 )
 ;; METADATA: { "asmConsts": {},"staticBump": 420, "initializers": [] }
diff --git a/test/dot_s/dyncall.wast b/test/dot_s/dyncall.wast
index e284c838d..c6dae687a 100644
--- a/test/dot_s/dyncall.wast
+++ b/test/dot_s/dyncall.wast
@@ -15,7 +15,8 @@
   (export "dynCall_i" $dynCall_i)
   (export "dynCall_if" $dynCall_if)
   (export "dynCall_vd" $dynCall_vd)
-  (table $__wasm_nullptr $i $i_f $vd $ffjjdi $vd2)
+  (table 6 6 anyfunc)
+  (elem (i32.const 0) $__wasm_nullptr $i $i_f $vd $ffjjdi $vd2)
   (func $i (type $FUNCSIG$i) (result i32)
     (i32.const 0)
   )
diff --git a/test/dot_s/function-data-sections.wast b/test/dot_s/function-data-sections.wast
index 82aa6f8c9..43947a3cc 100644
--- a/test/dot_s/function-data-sections.wast
+++ b/test/dot_s/function-data-sections.wast
@@ -1,9 +1,8 @@
 (module
-  (memory 1
-    (segment 12 "\00\00\00\00")
-    (segment 16 "\01\00\00\00")
-    (segment 20 "33\13@")
-  )
+  (memory 1)
+  (data (i32.const 12) "\00\00\00\00")
+  (data (i32.const 16) "\01\00\00\00")
+  (data (i32.const 20) "33\13@")
   (export "memory" memory)
   (export "foo" $foo)
   (export "bar" $bar)
diff --git a/test/dot_s/indidx.wast b/test/dot_s/indidx.wast
index 2a5224d00..6cdb6c4ce 100644
--- a/test/dot_s/indidx.wast
+++ b/test/dot_s/indidx.wast
@@ -1,14 +1,14 @@
 (module
-  (memory 1
-    (segment 16 "\04\00\00\00\02\00\00\00\01\00\00\00\03\00\00\00")
-  )
+  (memory 1)
+  (data (i32.const 16) "\04\00\00\00\02\00\00\00\01\00\00\00\03\00\00\00")
   (export "memory" memory)
   (type $FUNCSIG$i (func (result i32)))
   (type $FUNCSIG$v (func))
   (import $getchar "env" "getchar" (result i32))
   (export "main" $main)
   (export "dynCall_i" $dynCall_i)
-  (table $__wasm_nullptr $c $b $d $a)
+  (table 5 5 anyfunc)
+  (elem (i32.const 0) $__wasm_nullptr $c $b $d $a)
   (func $a (type $FUNCSIG$i) (result i32)
     (i32.const 0)
   )
diff --git a/test/dot_s/indirect-import.wast b/test/dot_s/indirect-import.wast
index 22821a4e0..86c8ded00 100644
--- a/test/dot_s/indirect-import.wast
+++ b/test/dot_s/indirect-import.wast
@@ -17,7 +17,8 @@
   (export "dynCall_fd" $dynCall_fd)
   (export "dynCall_v" $dynCall_v)
   (export "dynCall_vi" $dynCall_vi)
-  (table $__wasm_nullptr $__importThunk_extern_fd $__importThunk_extern_vj $__importThunk_extern_v $__importThunk_extern_ijidf $__importThunk_extern_struct $__importThunk_extern_sret)
+  (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/dot_s/invoke_wrapper.wast b/test/dot_s/invoke_wrapper.wast
index 6aa7a4ce6..d54e94d03 100644
--- a/test/dot_s/invoke_wrapper.wast
+++ b/test/dot_s/invoke_wrapper.wast
@@ -17,7 +17,8 @@
   (export "dynCall_iiii" $dynCall_iiii)
   (export "dynCall_ffd" $dynCall_ffd)
   (export "dynCall_iii" $dynCall_iii)
-  (table $__wasm_nullptr $_Z5func1v $_Z5func2iii $_Z5func3fd $_Z5func4P8mystructS_)
+  (table 5 5 anyfunc)
+  (elem (i32.const 0) $__wasm_nullptr $_Z5func1v $_Z5func2iii $_Z5func3fd $_Z5func4P8mystructS_)
   (func $_Z5func1v (type $FUNCSIG$v)
   )
   (func $_Z5func2iii (type $FUNCSIG$iiii) (param $0 i32) (param $1 i32) (param $2 i32) (result i32)
diff --git a/test/dot_s/lcomm-in-text-segment.wast b/test/dot_s/lcomm-in-text-segment.wast
index 27ebc9b87..e154c6c78 100644
--- a/test/dot_s/lcomm-in-text-segment.wast
+++ b/test/dot_s/lcomm-in-text-segment.wast
@@ -1,7 +1,6 @@
 (module
-  (memory 1
-    (segment 20 "\10\00\00\00")
-  )
+  (memory 1)
+  (data (i32.const 20) "\10\00\00\00")
   (export "memory" memory)
 )
 ;; METADATA: { "asmConsts": {},"staticBump": 24, "initializers": [] }
diff --git a/test/dot_s/macClangMetaData.wast b/test/dot_s/macClangMetaData.wast
index ed41e459c..2d1b5a68f 100644
--- a/test/dot_s/macClangMetaData.wast
+++ b/test/dot_s/macClangMetaData.wast
@@ -1,7 +1,6 @@
 (module
-  (memory 1
-    (segment 16 "Hello, World!\00")
-  )
+  (memory 1)
+  (data (i32.const 16) "Hello, World!\00")
   (export "memory" memory)
   (type $FUNCSIG$ii (func (param i32) (result i32)))
   (import $puts "env" "puts" (param i32) (result i32))
diff --git a/test/dot_s/memops.wast b/test/dot_s/memops.wast
index 07d5caec3..12a13372e 100644
--- a/test/dot_s/memops.wast
+++ b/test/dot_s/memops.wast
@@ -1,7 +1,6 @@
 (module
-  (memory 1
-    (segment 16 "{ Module.print(\"hello, world! \" + HEAP32[8>>2]); }\00")
-  )
+  (memory 1)
+  (data (i32.const 16) "{ Module.print(\"hello, world! \" + HEAP32[8>>2]); }\00")
   (export "memory" memory)
   (type $FUNCSIG$vi (func (param i32)))
   (import $emscripten_asm_const_vi "env" "emscripten_asm_const_vi" (param i32))
diff --git a/test/dot_s/permute.wast b/test/dot_s/permute.wast
index 13abcf66c..a58bc21c8 100644
--- a/test/dot_s/permute.wast
+++ b/test/dot_s/permute.wast
@@ -1,7 +1,6 @@
 (module
-  (memory 1
-    (segment 16 "hE?\8ds\0e7\db[g\8f\955it\c4k\0b\e2\ef\bcld\e0\fd\8c\9e\86&~\d8\94\89+\c8\a4\c2\f2\fb\12\1cej\d99\b7\b3W\c6w\af\ae\caM>\92ub\96\84\b6\b0N\ec;q\11\f7\bf\e31\e6\a7\90\fc\03\e4\aa\d7\cc- \15\83DH\80r\fa\01X\eb:_\00A\cd\e9o`n\ac(\ad\ba0\dcyS#\f4$\"\82\7f}\8e\f6\93L\'\bb\bdZ\ed4\18\f3\c0\cf\ff\a3\f8\07\05\9c\d3\0f\a0\06m%\\\f9^B<\e7\b1\17\98]\0c\dd\c5\f5p\e5\fezJ\ab,F\a5@\08R\85!\b8\1a\ce\d5\04\nI\a6\d1\9f\8a\c9\a9|\97\9aG\be8Y\8b\c1\1b\d4\ea\b9\19\14\9b\9163\d0\1d\d2\df=C\1f\0dc\e1\c7QUv\02\b5aK\b4\tV\c3x\e8\a1\1e\81\de/{\da\d6Pf\10T\f0)\88\16\ee\a8\9d\f1\cbO*\b2\99\132\87.\a2")
-  )
+  (memory 1)
+  (data (i32.const 16) "hE?\8ds\0e7\db[g\8f\955it\c4k\0b\e2\ef\bcld\e0\fd\8c\9e\86&~\d8\94\89+\c8\a4\c2\f2\fb\12\1cej\d99\b7\b3W\c6w\af\ae\caM>\92ub\96\84\b6\b0N\ec;q\11\f7\bf\e31\e6\a7\90\fc\03\e4\aa\d7\cc- \15\83DH\80r\fa\01X\eb:_\00A\cd\e9o`n\ac(\ad\ba0\dcyS#\f4$\"\82\7f}\8e\f6\93L\'\bb\bdZ\ed4\18\f3\c0\cf\ff\a3\f8\07\05\9c\d3\0f\a0\06m%\\\f9^B<\e7\b1\17\98]\0c\dd\c5\f5p\e5\fezJ\ab,F\a5@\08R\85!\b8\1a\ce\d5\04\nI\a6\d1\9f\8a\c9\a9|\97\9aG\be8Y\8b\c1\1b\d4\ea\b9\19\14\9b\9163\d0\1d\d2\df=C\1f\0dc\e1\c7QUv\02\b5aK\b4\tV\c3x\e8\a1\1e\81\de/{\da\d6Pf\10T\f0)\88\16\ee\a8\9d\f1\cbO*\b2\99\132\87.\a2")
   (export "memory" memory)
 )
 ;; METADATA: { "asmConsts": {},"staticBump": 272, "initializers": [] }
diff --git a/test/dot_s/relocation.wast b/test/dot_s/relocation.wast
index 35fcd1562..eb00bac89 100644
--- a/test/dot_s/relocation.wast
+++ b/test/dot_s/relocation.wast
@@ -1,8 +1,7 @@
 (module
-  (memory 1
-    (segment 12 "\10\00\00\00")
-    (segment 16 "\0c\00\00\00")
-  )
+  (memory 1)
+  (data (i32.const 12) "\10\00\00\00")
+  (data (i32.const 16) "\0c\00\00\00")
   (export "memory" memory)
   (export "main" $main)
   (func $main (result i32)
diff --git a/test/dot_s/symbolic-offset.wast b/test/dot_s/symbolic-offset.wast
index 15ec8f1be..51879232a 100644
--- a/test/dot_s/symbolic-offset.wast
+++ b/test/dot_s/symbolic-offset.wast
@@ -1,7 +1,6 @@
 (module
-  (memory 1
-    (segment 12 "\01\00\00\00\00\00\00\00\00\00\00\00")
-  )
+  (memory 1)
+  (data (i32.const 12) "\01\00\00\00\00\00\00\00\00\00\00\00")
   (export "memory" memory)
   (export "f" $f)
   (func $f (param $0 i32) (param $1 i32)
diff --git a/test/emcc_O2_hello_world.fromasm b/test/emcc_O2_hello_world.fromasm
index 828905561..49d63fa8c 100644
--- a/test/emcc_O2_hello_world.fromasm
+++ b/test/emcc_O2_hello_world.fromasm
@@ -42,7 +42,8 @@
   (export "dynCall_ii" $dynCall_ii)
   (export "dynCall_iiii" $dynCall_iiii)
   (export "dynCall_vi" $dynCall_vi)
-  (table $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $b1 $___stdio_write $b1 $b1 $b2 $b2 $b2 $b2 $_cleanup_418 $b2 $b2 $b2)
+  (table 18 18 anyfunc)
+  (elem (i32.const 0) $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $b1 $___stdio_write $b1 $b1 $b2 $b2 $b2 $b2 $_cleanup_418 $b2 $b2 $b2)
   (func $_malloc (param $0 i32) (result i32)
     (local $1 i32)
     (local $2 i32)
diff --git a/test/emcc_O2_hello_world.fromasm.imprecise b/test/emcc_O2_hello_world.fromasm.imprecise
index ede6c05d4..4f0513d28 100644
--- a/test/emcc_O2_hello_world.fromasm.imprecise
+++ b/test/emcc_O2_hello_world.fromasm.imprecise
@@ -41,7 +41,8 @@
   (export "dynCall_ii" $dynCall_ii)
   (export "dynCall_iiii" $dynCall_iiii)
   (export "dynCall_vi" $dynCall_vi)
-  (table $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $b1 $___stdio_write $b1 $b1 $b2 $b2 $b2 $b2 $_cleanup_418 $b2 $b2 $b2)
+  (table 18 18 anyfunc)
+  (elem (i32.const 0) $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $b1 $___stdio_write $b1 $b1 $b2 $b2 $b2 $b2 $_cleanup_418 $b2 $b2 $b2)
   (func $_malloc (param $0 i32) (result i32)
     (local $1 i32)
     (local $2 i32)
diff --git a/test/emcc_O2_hello_world.fromasm.imprecise.no-opts b/test/emcc_O2_hello_world.fromasm.imprecise.no-opts
index d34022a9e..494915489 100644
--- a/test/emcc_O2_hello_world.fromasm.imprecise.no-opts
+++ b/test/emcc_O2_hello_world.fromasm.imprecise.no-opts
@@ -41,7 +41,8 @@
   (export "dynCall_ii" $dynCall_ii)
   (export "dynCall_iiii" $dynCall_iiii)
   (export "dynCall_vi" $dynCall_vi)
-  (table $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $b1 $___stdio_write $b1 $b1 $b2 $b2 $b2 $b2 $_cleanup_418 $b2 $b2 $b2)
+  (table 18 18 anyfunc)
+  (elem (i32.const 0) $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $b1 $___stdio_write $b1 $b1 $b2 $b2 $b2 $b2 $_cleanup_418 $b2 $b2 $b2)
   (func $_malloc (param $i1 i32) (result i32)
     (local $i2 i32)
     (local $i3 i32)
diff --git a/test/emcc_O2_hello_world.fromasm.no-opts b/test/emcc_O2_hello_world.fromasm.no-opts
index f850b8306..e75c5e4b2 100644
--- a/test/emcc_O2_hello_world.fromasm.no-opts
+++ b/test/emcc_O2_hello_world.fromasm.no-opts
@@ -42,7 +42,8 @@
   (export "dynCall_ii" $dynCall_ii)
   (export "dynCall_iiii" $dynCall_iiii)
   (export "dynCall_vi" $dynCall_vi)
-  (table $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $b1 $___stdio_write $b1 $b1 $b2 $b2 $b2 $b2 $_cleanup_418 $b2 $b2 $b2)
+  (table 18 18 anyfunc)
+  (elem (i32.const 0) $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $b1 $___stdio_write $b1 $b1 $b2 $b2 $b2 $b2 $_cleanup_418 $b2 $b2 $b2)
   (func $_malloc (param $i1 i32) (result i32)
     (local $i2 i32)
     (local $i3 i32)
diff --git a/test/emcc_hello_world.fromasm b/test/emcc_hello_world.fromasm
index c99290ba8..1ef3b9017 100644
--- a/test/emcc_hello_world.fromasm
+++ b/test/emcc_hello_world.fromasm
@@ -55,7 +55,8 @@
   (export "dynCall_iiii" $dynCall_iiii)
   (export "dynCall_vi" $dynCall_vi)
   (export "___udivmoddi4" $___udivmoddi4)
-  (table $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $___stdio_write $b1 $b1 $b1 $b2 $b2 $b2 $b2 $b2 $_cleanup $b2 $b2)
+  (table 18 18 anyfunc)
+  (elem (i32.const 0) $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $___stdio_write $b1 $b1 $b1 $b2 $b2 $b2 $b2 $b2 $_cleanup $b2 $b2)
   (func $stackAlloc (param $0 i32) (result i32)
     (local $1 i32)
     (set_local $1
diff --git a/test/emcc_hello_world.fromasm.imprecise b/test/emcc_hello_world.fromasm.imprecise
index ee84765a1..13c8baec6 100644
--- a/test/emcc_hello_world.fromasm.imprecise
+++ b/test/emcc_hello_world.fromasm.imprecise
@@ -49,7 +49,8 @@
   (export "dynCall_iiii" $dynCall_iiii)
   (export "dynCall_vi" $dynCall_vi)
   (export "___udivmoddi4" $___udivmoddi4)
-  (table $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $___stdio_write $b1 $b1 $b1 $b2 $b2 $b2 $b2 $b2 $_cleanup $b2 $b2)
+  (table 18 18 anyfunc)
+  (elem (i32.const 0) $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $___stdio_write $b1 $b1 $b1 $b2 $b2 $b2 $b2 $b2 $_cleanup $b2 $b2)
   (func $stackAlloc (param $0 i32) (result i32)
     (local $1 i32)
     (set_local $1
diff --git a/test/emcc_hello_world.fromasm.imprecise.no-opts b/test/emcc_hello_world.fromasm.imprecise.no-opts
index 327618169..d8b887891 100644
--- a/test/emcc_hello_world.fromasm.imprecise.no-opts
+++ b/test/emcc_hello_world.fromasm.imprecise.no-opts
@@ -49,7 +49,8 @@
   (export "dynCall_iiii" $dynCall_iiii)
   (export "dynCall_vi" $dynCall_vi)
   (export "___udivmoddi4" $___udivmoddi4)
-  (table $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $___stdio_write $b1 $b1 $b1 $b2 $b2 $b2 $b2 $b2 $_cleanup $b2 $b2)
+  (table 18 18 anyfunc)
+  (elem (i32.const 0) $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $___stdio_write $b1 $b1 $b1 $b2 $b2 $b2 $b2 $b2 $_cleanup $b2 $b2)
   (func $stackAlloc (param $size i32) (result i32)
     (local $ret i32)
     (set_local $ret
diff --git a/test/emcc_hello_world.fromasm.no-opts b/test/emcc_hello_world.fromasm.no-opts
index 41e3e9e26..efa2de849 100644
--- a/test/emcc_hello_world.fromasm.no-opts
+++ b/test/emcc_hello_world.fromasm.no-opts
@@ -55,7 +55,8 @@
   (export "dynCall_iiii" $dynCall_iiii)
   (export "dynCall_vi" $dynCall_vi)
   (export "___udivmoddi4" $___udivmoddi4)
-  (table $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $___stdio_write $b1 $b1 $b1 $b2 $b2 $b2 $b2 $b2 $_cleanup $b2 $b2)
+  (table 18 18 anyfunc)
+  (elem (i32.const 0) $b0 $___stdio_close $b1 $b1 $___stdout_write $___stdio_seek $___stdio_write $b1 $b1 $b1 $b2 $b2 $b2 $b2 $b2 $_cleanup $b2 $b2)
   (func $stackAlloc (param $size i32) (result i32)
     (local $ret i32)
     (set_local $ret
diff --git a/test/example/c-api-kitchen-sink.c b/test/example/c-api-kitchen-sink.c
index 496ac4efd..0aaf5ab95 100644
--- a/test/example/c-api-kitchen-sink.c
+++ b/test/example/c-api-kitchen-sink.c
@@ -246,7 +246,7 @@ void test_core() {
   // Memory. One per module
 
   const char *segments[] = { "hello, world" };
-  BinaryenIndex segmentOffsets[] = { 10 };
+  BinaryenExpressionRef segmentOffsets[] = { BinaryenConst(module, BinaryenLiteralInt32(10)) };
   BinaryenIndex segmentSizes[] = { 12 };
   BinaryenSetMemory(module, 1, 256, "mem", segments, segmentOffsets, segmentSizes, 1);
 
diff --git a/test/example/c-api-kitchen-sink.txt b/test/example/c-api-kitchen-sink.txt
index 64f5fc3b4..42a5bfee1 100644
--- a/test/example/c-api-kitchen-sink.txt
+++ b/test/example/c-api-kitchen-sink.txt
@@ -7,9 +7,8 @@ BinaryenFloat64: 4
   (f32.const -33.61199951171875)
 )
 (module
-  (memory 1 256
-    (segment 10 "hello, world")
-  )
+  (memory 1 256)
+  (data (i32.const 10) "hello, world")
   (export "mem" memory)
   (start $starter)
   (type $iiIfF (func (param i32 i64 f32 f64) (result i32)))
@@ -18,7 +17,8 @@ BinaryenFloat64: 4
   (type $3 (func))
   (import $an-imported "module" "base" (param i32 f64) (result f32))
   (export "kitchen_sinker" "$kitchen()sinker")
-  (table "$kitchen()sinker")
+  (table 1 1 anyfunc)
+  (elem (i32.const 0) "$kitchen()sinker")
   (func "$kitchen()sinker" (type $iiIfF) (param $0 i32) (param $1 i64) (param $2 f32) (param $3 f64) (result i32)
     (local $4 i32)
     (block $the-body
@@ -1375,10 +1375,11 @@ int main() {
     BinaryenFunctionRef funcs[] = { functions[0] };
     BinaryenSetFunctionTable(the_module, funcs, 1);
   }
+  expressions[245] = BinaryenConst(the_module, BinaryenLiteralInt32(10));
   {
     const char segment0[] = { 104, 101, 108, 108, 111, 44, 32, 119, 111, 114, 108, 100 };
     const char* segments[] = { segment0 };
-    BinaryenIndex segmentOffsets[] = { 10 };
+    BinaryenExpressionRef segmentOffsets[] = { expressions[245] };
     BinaryenIndex segmentSizes[] = { 12 };
     BinaryenSetMemory(the_module, 1, 256, "mem", segments, segmentOffsets, segmentSizes, 1);
   }
@@ -1386,10 +1387,10 @@ int main() {
     BinaryenIndex paramTypes[] = { 0 };
     functionTypes[2] = BinaryenAddFunctionType(the_module, "v", 0, paramTypes, 0);
   }
-  expressions[245] = BinaryenNop(the_module);
+  expressions[246] = BinaryenNop(the_module);
   {
     BinaryenType varTypes[] = { 0 };
-    functions[1] = BinaryenAddFunction(the_module, "starter", functionTypes[2], varTypes, 0, expressions[245]);
+    functions[1] = BinaryenAddFunction(the_module, "starter", functionTypes[2], varTypes, 0, expressions[246]);
   }
   BinaryenSetStart(the_module, functions[1]);
   {
@@ -1399,9 +1400,8 @@ int main() {
   BinaryenModuleValidate(the_module);
   BinaryenModulePrint(the_module);
 (module
-  (memory 1 256
-    (segment 10 "hello, world")
-  )
+  (memory 1 256)
+  (data (i32.const 10) "hello, world")
   (export "mem" memory)
   (start $starter)
   (type $iiIfF (func (param i32 i64 f32 f64) (result i32)))
@@ -1410,7 +1410,8 @@ int main() {
   (type $3 (func))
   (import $an-imported "module" "base" (param i32 f64) (result f32))
   (export "kitchen_sinker" "$kitchen()sinker")
-  (table "$kitchen()sinker")
+  (table 1 1 anyfunc)
+  (elem (i32.const 0) "$kitchen()sinker")
   (func "$kitchen()sinker" (type $iiIfF) (param $0 i32) (param $1 i64) (param $2 f32) (param $3 f64) (result i32)
     (local $4 i32)
     (block $the-body
diff --git a/test/example/c-api-kitchen-sink.txt.txt b/test/example/c-api-kitchen-sink.txt.txt
index 96cbaaa00..7e32ba431 100644
--- a/test/example/c-api-kitchen-sink.txt.txt
+++ b/test/example/c-api-kitchen-sink.txt.txt
@@ -2,9 +2,8 @@
   (f32.const -33.61199951171875)
 )
 (module
-  (memory 1 256
-    (segment 10 "hello, world")
-  )
+  (memory 1 256)
+  (data (i32.const 10) "hello, world")
   (export "mem" memory)
   (start $starter)
   (type $iiIfF (func (param i32 i64 f32 f64) (result i32)))
@@ -13,7 +12,8 @@
   (type $3 (func))
   (import $an-imported "module" "base" (param i32 f64) (result f32))
   (export "kitchen_sinker" "$kitchen()sinker")
-  (table "$kitchen()sinker")
+  (table 1 1 anyfunc)
+  (elem (i32.const 0) "$kitchen()sinker")
   (func "$kitchen()sinker" (type $iiIfF) (param $0 i32) (param $1 i64) (param $2 f32) (param $3 f64) (result i32)
     (local $4 i32)
     (block $the-body
diff --git a/test/kitchen_sink.wast b/test/kitchen_sink.wast
index e0cc6617a..2b139a95b 100644
--- a/test/kitchen_sink.wast
+++ b/test/kitchen_sink.wast
@@ -1,7 +1,6 @@
 (module
-  (memory 4096 4096
-    (segment 1026 "\14\00")
-  )
+  (memory 4096 4096)
+  (data (i32.const 1026) "\14\00")
   (type $0 (func (result i32)))
   (func $kitchensink (type $0) (result i32)
     (block $block0
diff --git a/test/kitchen_sink.wast.fromBinary b/test/kitchen_sink.wast.fromBinary
index cd58fdf65..dd55b5bae 100644
--- a/test/kitchen_sink.wast.fromBinary
+++ b/test/kitchen_sink.wast.fromBinary
@@ -1,7 +1,6 @@
 (module
-  (memory 4096 4096
-    (segment 1026 "\14\00")
-  )
+  (memory 4096 4096)
+  (data (i32.const 1026) "\14\00")
   (type $0 (func (result i32)))
   (func $kitchensink (type $0) (result i32)
     (block $label$0
diff --git a/test/llvm_autogenerated/byval.wast b/test/llvm_autogenerated/byval.wast
index 9ebb4b446..c4dc678ea 100644
--- a/test/llvm_autogenerated/byval.wast
+++ b/test/llvm_autogenerated/byval.wast
@@ -1,7 +1,6 @@
 (module
-  (memory 1
-    (segment 4 "\10\04\00\00")
-  )
+  (memory 1)
+  (data (i32.const 4) "\10\04\00\00")
   (export "memory" memory)
   (type $FUNCSIG$vi (func (param i32)))
   (type $FUNCSIG$iiii (func (param i32 i32 i32) (result i32)))
diff --git a/test/llvm_autogenerated/call.wast b/test/llvm_autogenerated/call.wast
index 812667aec..8dc92ff80 100644
--- a/test/llvm_autogenerated/call.wast
+++ b/test/llvm_autogenerated/call.wast
@@ -1,7 +1,6 @@
 (module
-  (memory 1
-    (segment 4 "\10\04\00\00")
-  )
+  (memory 1)
+  (data (i32.const 4) "\10\04\00\00")
   (export "memory" memory)
   (type $FUNCSIG$v (func))
   (type $FUNCSIG$i (func (result i32)))
diff --git a/test/llvm_autogenerated/cfg-stackify.wast b/test/llvm_autogenerated/cfg-stackify.wast
index ac20e3398..2dbdd5e93 100644
--- a/test/llvm_autogenerated/cfg-stackify.wast
+++ b/test/llvm_autogenerated/cfg-stackify.wast
@@ -1,7 +1,6 @@
 (module
-  (memory 1
-    (segment 4 "\10\04\00\00")
-  )
+  (memory 1)
+  (data (i32.const 4) "\10\04\00\00")
   (export "memory" memory)
   (type $FUNCSIG$i (func (result i32)))
   (type $FUNCSIG$v (func))
diff --git a/test/llvm_autogenerated/comparisons_f32.wast b/test/llvm_autogenerated/comparisons_f32.wast
index 2ab127beb..9d9898846 100644
--- a/test/llvm_autogenerated/comparisons_f32.wast
+++ b/test/llvm_autogenerated/comparisons_f32.wast
@@ -1,7 +1,6 @@
 (module
-  (memory 1
-    (segment 4 "\10\04\00\00")
-  )
+  (memory 1)
+  (data (i32.const 4) "\10\04\00\00")
   (export "memory" memory)
   (export "ord_f32" $ord_f32)
   (export "uno_f32" $uno_f32)
diff --git a/test/llvm_autogenerated/comparisons_f64.wast b/test/llvm_autogenerated/comparisons_f64.wast
index 8d9ddf0c0..edd3cd9b7 100644
--- a/test/llvm_autogenerated/comparisons_f64.wast
+++ b/test/llvm_autogenerated/comparisons_f64.wast
@@ -1,7 +1,6 @@
 (module
-  (memory 1
-    (segment 4 "\10\04\00\00")
-  )
+  (memory 1)
+  (data (i32.const 4) "\10\04\00\00")
   (export "memory" memory)
   (export "ord_f64" $ord_f64)
   (export "uno_f64" $uno_f64)
diff --git a/test/llvm_autogenerated/comparisons_i32.wast b/test/llvm_autogenerated/comparisons_i32.wast
index 2e9a074ee..2657cabd1 100644
--- a/test/llvm_autogenerated/comparisons_i32.wast
+++ b/test/llvm_autogenerated/comparisons_i32.wast
@@ -1,7 +1,6 @@
 (module
-  (memory 1
-    (segment 4 "\10\04\00\00")
-  )
+  (memory 1)
+  (data (i32.const 4) "\10\04\00\00")
   (export "memory" memory)
   (export "eq_i32" $eq_i32)
   (export "ne_i32" $ne_i32)
diff --git a/test/llvm_autogenerated/comparisons_i64.wast b/test/llvm_autogenerated/comparisons_i64.wast
index 2bf520862..0ce7ab530 100644
--- a/test/llvm_autogenerated/comparisons_i64.wast
+++ b/test/llvm_autogenerated/comparisons_i64.wast
@@ -1,7 +1,6 @@
 (module
-  (memory 1
-    (segment 4 "\10\04\00\00")
-  )
+  (memory 1)
+  (data (i32.const 4) "\10\04\00\00")
   (export "memory" memory)
   (export "eq_i64" $eq_i64)
   (export "ne_i64" $ne_i64)
diff --git a/test/llvm_autogenerated/conv.wast b/test/llvm_autogenerated/conv.wast
index 273217a23..0ee43f493 100644
--- a/test/llvm_autogenerated/conv.wast
+++ b/test/llvm_autogenerated/conv.wast
@@ -1,7 +1,6 @@
 (module
-  (memory 1
-    (segment 4 "\10\04\00\00")
-  )
+  (memory 1)
+  (data (i32.const 4) "\10\04\00\00")
   (export "memory" memory)
   (export "i32_wrap_i64" $i32_wrap_i64)
   (export "i64_extend_s_i32" $i64_extend_s_i32)
diff --git a/test/llvm_autogenerated/copysign-casts.wast b/test/llvm_autogenerated/copysign-casts.wast
index 14da8c65d..853cce958 100644
--- a/test/llvm_autogenerated/copysign-casts.wast
+++ b/test/llvm_autogenerated/copysign-casts.wast
@@ -1,7 +1,6 @@
 (module
-  (memory 1
-    (segment 4 "\10\04\00\00")
-  )
+  (memory 1)
+  (data (i32.const 4) "\10\04\00\00")
   (export "memory" memory)
   (export "fold_promote" $fold_promote)
   (export "fold_demote" $fold_demote)
diff --git a/test/llvm_autogenerated/cpus.wast b/test/llvm_autogenerated/cpus.wast
index c874eab7c..ce2ace210 100644
--- a/test/llvm_autogenerated/cpus.wast
+++ b/test/llvm_autogenerated/cpus.wast
@@ -1,7 +1,6 @@
 (module
-  (memory 1
-    (segment 4 "\10\04\00\00")
-  )
+  (memory 1)
+  (data (i32.const 4) "\10\04\00\00")
   (export "memory" memory)
   (export "f" $f)
   (func $f (param $0 i32) (result i32)
diff --git a/test/llvm_autogenerated/dead-vreg.wast b/test/llvm_autogenerated/dead-vreg.wast
index efb17b49b..be6e82cfd 100644
--- a/test/llvm_autogenerated/dead-vreg.wast
+++ b/test/llvm_autogenerated/dead-vreg.wast
@@ -1,7 +1,6 @@
 (module
-  (memory 1
-    (segment 4 "\10\04\00\00")
-  )
+  (memory 1)
+  (data (i32.const 4) "\10\04\00\00")
   (export "memory" memory)
   (export "foo" $foo)
   (func $foo (param $0 i32) (param $1 i32) (param $2 i32)
diff --git a/test/llvm_autogenerated/divrem-constant.wast b/test/llvm_autogenerated/divrem-constant.wast
index c0f05f8b8..358ecdbf3 100644
--- a/test/llvm_autogenerated/divrem-constant.wast
+++ b/test/llvm_autogenerated/divrem-constant.wast
@@ -1,7 +1,6 @@
 (module
-  (memory 1
-    (segment 4 "\10\04\00\00")
-  )
+  (memory 1)
+  (data (i32.const 4) "\10\04\00\00")
   (export "memory" memory)
   (export "test_udiv_2" $test_udiv_2)
   (export "test_udiv_5" $test_udiv_5)
diff --git a/test/llvm_autogenerated/f32.wast b/test/llvm_autogenerated/f32.wast
index 03409d03b..466ce049a 100644
--- a/test/llvm_autogenerated/f32.wast
+++ b/test/llvm_autogenerated/f32.wast
@@ -1,7 +1,6 @@
 (module
-  (memory 1
-    (segment 4 "\10\04\00\00")
-  )
+  (memory 1)
+  (data (i32.const 4) "\10\04\00\00")
   (export "memory" memory)
   (type $FUNCSIG$ffff (func (param f32 f32 f32) (result f32)))
   (import $fmaf "env" "fmaf" (param f32 f32 f32) (result f32))
diff --git a/test/llvm_autogenerated/f64.wast b/test/llvm_autogenerated/f64.wast
index 860d183f5..0c74c17ea 100644
--- a/test/llvm_autogenerated/f64.wast
+++ b/test/llvm_autogenerated/f64.wast
@@ -1,7 +1,6 @@
 (module
-  (memory 1
-    (segment 4 "\10\04\00\00")
-  )
+  (memory 1)
+  (data (i32.const 4) "\10\04\00\00")
   (export "memory" memory)
   (type $FUNCSIG$dddd (func (param f64 f64 f64) (result f64)))
   (import $fma "env" "fma" (param f64 f64 f64) (result f64))
diff --git a/test/llvm_autogenerated/fast-isel.wast b/test/llvm_autogenerated/fast-isel.wast
index 02d8e97f1..50cdb5469 100644
--- a/test/llvm_autogenerated/fast-isel.wast
+++ b/test/llvm_autogenerated/fast-isel.wast
@@ -1,7 +1,6 @@
 (module
-  (memory 1
-    (segment 4 "\10\04\00\00")
-  )
+  (memory 1)
+  (data (i32.const 4) "\10\04\00\00")
   (export "memory" memory)
   (export "immediate_f32" $immediate_f32)
   (export "immediate_f64" $immediate_f64)
diff --git a/test/llvm_autogenerated/frem.wast b/test/llvm_autogenerated/frem.wast
index 15d5cc222..b7f784d2d 100644
--- a/test/llvm_autogenerated/frem.wast
+++ b/test/llvm_autogenerated/frem.wast
@@ -1,7 +1,6 @@
 (module
-  (memory 1
-    (segment 4 "\10\04\00\00")
-  )
+  (memory 1)
+  (data (i32.const 4) "\10\04\00\00")
   (export "memory" memory)
   (type $FUNCSIG$ddd (func (param f64 f64) (result f64)))
   (type $FUNCSIG$fff (func (param f32 f32) (result f32)))
diff --git a/test/llvm_autogenerated/func.wast b/test/llvm_autogenerated/func.wast
index 118fb252b..b4298e449 100644
--- a/test/llvm_autogenerated/func.wast
+++ b/test/llvm_autogenerated/func.wast
@@ -1,7 +1,6 @@
 (module
-  (memory 1
-    (segment 4 "\10\04\00\00")
-  )
+  (memory 1)
+  (data (i32.const 4) "\10\04\00\00")
   (export "memory" memory)
   (export "f0" $f0)
   (export "f1" $f1)
diff --git a/test/llvm_autogenerated/global.wast b/test/llvm_autogenerated/global.wast
index cbb8ac184..85c50ff03 100644
--- a/test/llvm_autogenerated/global.wast
+++ b/test/llvm_autogenerated/global.wast
@@ -1,19 +1,18 @@
 (module
-  (memory 1
-    (segment 4 "\b0\08\00\00")
-    (segment 12 "9\05\00\00")
-    (segment 28 "\01\00\00\00")
-    (segment 32 "*\00\00\00")
-    (segment 36 "\ff\ff\ff\ff")
-    (segment 64 "\00\00\00\00\01\00\00\00")
-    (segment 72 "\ff\ff\ff\ff\ff\ff\ff\ff")
-    (segment 92 "\00\00\00\80")
-    (segment 96 "\00\00\00@")
-    (segment 128 "\00\00\00\00\00\00\00\80")
-    (segment 136 "\00\00\00\00\00\00\00@")
-    (segment 656 "\e0\00\00\00")
-    (segment 1192 "\a4\04\00\00")
-  )
+  (memory 1)
+  (data (i32.const 4) "\b0\08\00\00")
+  (data (i32.const 12) "9\05\00\00")
+  (data (i32.const 28) "\01\00\00\00")
+  (data (i32.const 32) "*\00\00\00")
+  (data (i32.const 36) "\ff\ff\ff\ff")
+  (data (i32.const 64) "\00\00\00\00\01\00\00\00")
+  (data (i32.const 72) "\ff\ff\ff\ff\ff\ff\ff\ff")
+  (data (i32.const 92) "\00\00\00\80")
+  (data (i32.const 96) "\00\00\00@")
+  (data (i32.const 128) "\00\00\00\00\00\00\00\80")
+  (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")
   (export "memory" memory)
   (type $FUNCSIG$iiii (func (param i32 i32 i32) (result i32)))
   (import $memcpy "env" "memcpy" (param i32 i32 i32) (result i32))
diff --git a/test/llvm_autogenerated/globl.wast b/test/llvm_autogenerated/globl.wast
index e357a6337..cf493cb12 100644
--- a/test/llvm_autogenerated/globl.wast
+++ b/test/llvm_autogenerated/globl.wast
@@ -1,7 +1,6 @@
 (module
-  (memory 1
-    (segment 4 "\10\04\00\00")
-  )
+  (memory 1)
+  (data (i32.const 4) "\10\04\00\00")
   (export "memory" memory)
   (export "foo" $foo)
   (func $foo
diff --git a/test/llvm_autogenerated/i128.wast b/test/llvm_autogenerated/i128.wast
index 19b600792..830c1433c 100644
--- a/test/llvm_autogenerated/i128.wast
+++ b/test/llvm_autogenerated/i128.wast
@@ -1,7 +1,6 @@
 (module
-  (memory 1
-    (segment 4 "\10\04\00\00")
-  )
+  (memory 1)
+  (data (i32.const 4) "\10\04\00\00")
   (export "memory" memory)
   (type $FUNCSIG$vijji (func (param i32 i64 i64 i32)))
   (type $FUNCSIG$vijjjj (func (param i32 i64 i64 i64 i64)))
diff --git a/test/llvm_autogenerated/i32-load-store-alignment.wast b/test/llvm_autogenerated/i32-load-store-alignment.wast
index 230d3ffdc..e1ef2f5e8 100644
--- a/test/llvm_autogenerated/i32-load-store-alignment.wast
+++ b/test/llvm_autogenerated/i32-load-store-alignment.wast
@@ -1,7 +1,6 @@
 (module
-  (memory 1
-    (segment 4 "\10\04\00\00")
-  )
+  (memory 1)
+  (data (i32.const 4) "\10\04\00\00")
   (export "memory" memory)
   (export "ldi32_a1" $ldi32_a1)
   (export "ldi32_a2" $ldi32_a2)
diff --git a/test/llvm_autogenerated/i32.wast b/test/llvm_autogenerated/i32.wast
index 2f1bf90ca..72d5b14a8 100644
--- a/test/llvm_autogenerated/i32.wast
+++ b/test/llvm_autogenerated/i32.wast
@@ -1,7 +1,6 @@
 (module
-  (memory 1
-    (segment 4 "\10\04\00\00")
-  )
+  (memory 1)
+  (data (i32.const 4) "\10\04\00\00")
   (export "memory" memory)
   (export "add32" $add32)
   (export "sub32" $sub32)
diff --git a/test/llvm_autogenerated/i64-load-store-alignment.wast b/test/llvm_autogenerated/i64-load-store-alignment.wast
index f345f6dcc..33362acfc 100644
--- a/test/llvm_autogenerated/i64-load-store-alignment.wast
+++ b/test/llvm_autogenerated/i64-load-store-alignment.wast
@@ -1,7 +1,6 @@
 (module
-  (memory 1
-    (segment 4 "\10\04\00\00")
-  )
+  (memory 1)
+  (data (i32.const 4) "\10\04\00\00")
   (export "memory" memory)
   (export "ldi64_a1" $ldi64_a1)
   (export "ldi64_a2" $ldi64_a2)
diff --git a/test/llvm_autogenerated/i64.wast b/test/llvm_autogenerated/i64.wast
index bcbca2611..fa50edd5f 100644
--- a/test/llvm_autogenerated/i64.wast
+++ b/test/llvm_autogenerated/i64.wast
@@ -1,7 +1,6 @@
 (module
-  (memory 1
-    (segment 4 "\10\04\00\00")
-  )
+  (memory 1)
+  (data (i32.const 4) "\10\04\00\00")
   (export "memory" memory)
   (export "add64" $add64)
   (export "sub64" $sub64)
diff --git a/test/llvm_autogenerated/ident.wast b/test/llvm_autogenerated/ident.wast
index d54e39f47..20a88f29f 100644
--- a/test/llvm_autogenerated/ident.wast
+++ b/test/llvm_autogenerated/ident.wast
@@ -1,7 +1,6 @@
 (module
-  (memory 1
-    (segment 4 "\10\04\00\00")
-  )
+  (memory 1)
+  (data (i32.const 4) "\10\04\00\00")
   (export "memory" memory)
 )
 ;; METADATA: { "asmConsts": {},"staticBump": 1040, "initializers": [] }
diff --git a/test/llvm_autogenerated/immediates.wast b/test/llvm_autogenerated/immediates.wast
index 5e16ec488..89820cdf1 100644
--- a/test/llvm_autogenerated/immediates.wast
+++ b/test/llvm_autogenerated/immediates.wast
@@ -1,7 +1,6 @@
 (module
-  (memory 1
-    (segment 4 "\10\04\00\00")
-  )
+  (memory 1)
+  (data (i32.const 4) "\10\04\00\00")
   (export "memory" memory)
   (export "zero_i32" $zero_i32)
   (export "one_i32" $one_i32)
diff --git a/test/llvm_autogenerated/irreducible-cfg.wast b/test/llvm_autogenerated/irreducible-cfg.wast
index 6990faa76..3e7dbd28f 100644
--- a/test/llvm_autogenerated/irreducible-cfg.wast
+++ b/test/llvm_autogenerated/irreducible-cfg.wast
@@ -1,7 +1,6 @@
 (module
-  (memory 1
-    (segment 4 "\10\04\00\00")
-  )
+  (memory 1)
+  (data (i32.const 4) "\10\04\00\00")
   (export "memory" memory)
   (export "test0" $test0)
   (export "test1" $test1)
diff --git a/test/llvm_autogenerated/legalize.wast b/test/llvm_autogenerated/legalize.wast
index 8ceba3431..912efce02 100644
--- a/test/llvm_autogenerated/legalize.wast
+++ b/test/llvm_autogenerated/legalize.wast
@@ -1,7 +1,6 @@
 (module
-  (memory 1
-    (segment 4 "\10\04\00\00")
-  )
+  (memory 1)
+  (data (i32.const 4) "\10\04\00\00")
   (export "memory" memory)
   (type $FUNCSIG$vijji (func (param i32 i64 i64 i32)))
   (import $__ashlti3 "env" "__ashlti3" (param i32 i64 i64 i32))
diff --git a/test/llvm_autogenerated/load-ext.wast b/test/llvm_autogenerated/load-ext.wast
index 4b734e546..67c07444d 100644
--- a/test/llvm_autogenerated/load-ext.wast
+++ b/test/llvm_autogenerated/load-ext.wast
@@ -1,7 +1,6 @@
 (module
-  (memory 1
-    (segment 4 "\10\04\00\00")
-  )
+  (memory 1)
+  (data (i32.const 4) "\10\04\00\00")
   (export "memory" memory)
   (export "sext_i8_i32" $sext_i8_i32)
   (export "zext_i8_i32" $zext_i8_i32)
diff --git a/test/llvm_autogenerated/load-store-i1.wast b/test/llvm_autogenerated/load-store-i1.wast
index 994c70a51..3138a07bf 100644
--- a/test/llvm_autogenerated/load-store-i1.wast
+++ b/test/llvm_autogenerated/load-store-i1.wast
@@ -1,7 +1,6 @@
 (module
-  (memory 1
-    (segment 4 "\10\04\00\00")
-  )
+  (memory 1)
+  (data (i32.const 4) "\10\04\00\00")
   (export "memory" memory)
   (export "load_u_i1_i32" $load_u_i1_i32)
   (export "load_s_i1_i32" $load_s_i1_i32)
diff --git a/test/llvm_autogenerated/load.wast b/test/llvm_autogenerated/load.wast
index 361027640..22774cc57 100644
--- a/test/llvm_autogenerated/load.wast
+++ b/test/llvm_autogenerated/load.wast
@@ -1,7 +1,6 @@
 (module
-  (memory 1
-    (segment 4 "\10\04\00\00")
-  )
+  (memory 1)
+  (data (i32.const 4) "\10\04\00\00")
   (export "memory" memory)
   (export "ldi32" $ldi32)
   (export "ldi64" $ldi64)
diff --git a/test/llvm_autogenerated/mem-intrinsics.wast b/test/llvm_autogenerated/mem-intrinsics.wast
index 6f3416a14..62d586ad9 100644
--- a/test/llvm_autogenerated/mem-intrinsics.wast
+++ b/test/llvm_autogenerated/mem-intrinsics.wast
@@ -1,7 +1,6 @@
 (module
-  (memory 1
-    (segment 4 "\10\04\00\00")
-  )
+  (memory 1)
+  (data (i32.const 4) "\10\04\00\00")
   (export "memory" memory)
   (type $FUNCSIG$v (func))
   (type $FUNCSIG$i (func (result i32)))
diff --git a/test/llvm_autogenerated/memory-addr32.wast b/test/llvm_autogenerated/memory-addr32.wast
index e75c80eaf..d5e43423a 100644
--- a/test/llvm_autogenerated/memory-addr32.wast
+++ b/test/llvm_autogenerated/memory-addr32.wast
@@ -1,7 +1,6 @@
 (module
-  (memory 1
-    (segment 4 "\10\04\00\00")
-  )
+  (memory 1)
+  (data (i32.const 4) "\10\04\00\00")
   (export "memory" memory)
   (export "current_memory" $current_memory)
   (export "grow_memory" $grow_memory)
diff --git a/test/llvm_autogenerated/non-executable-stack.wast b/test/llvm_autogenerated/non-executable-stack.wast
index d54e39f47..20a88f29f 100644
--- a/test/llvm_autogenerated/non-executable-stack.wast
+++ b/test/llvm_autogenerated/non-executable-stack.wast
@@ -1,7 +1,6 @@
 (module
-  (memory 1
-    (segment 4 "\10\04\00\00")
-  )
+  (memory 1)
+  (data (i32.const 4) "\10\04\00\00")
   (export "memory" memory)
 )
 ;; METADATA: { "asmConsts": {},"staticBump": 1040, "initializers": [] }
diff --git a/test/llvm_autogenerated/offset.wast b/test/llvm_autogenerated/offset.wast
index 63383af3a..a24a055e3 100644
--- a/test/llvm_autogenerated/offset.wast
+++ b/test/llvm_autogenerated/offset.wast
@@ -1,8 +1,7 @@
 (module
-  (memory 1
-    (segment 4 "\10\04\00\00")
-    (segment 12 "\00\00\00\00")
-  )
+  (memory 1)
+  (data (i32.const 4) "\10\04\00\00")
+  (data (i32.const 12) "\00\00\00\00")
   (export "memory" memory)
   (export "load_i32_with_folded_offset" $load_i32_with_folded_offset)
   (export "load_i32_with_folded_gep_offset" $load_i32_with_folded_gep_offset)
diff --git a/test/llvm_autogenerated/phi.wast b/test/llvm_autogenerated/phi.wast
index 30c5aa12c..3bd742e8d 100644
--- a/test/llvm_autogenerated/phi.wast
+++ b/test/llvm_autogenerated/phi.wast
@@ -1,7 +1,6 @@
 (module
-  (memory 1
-    (segment 4 "\10\04\00\00")
-  )
+  (memory 1)
+  (data (i32.const 4) "\10\04\00\00")
   (export "memory" memory)
   (export "test0" $test0)
   (export "test1" $test1)
diff --git a/test/llvm_autogenerated/reg-stackify.wast b/test/llvm_autogenerated/reg-stackify.wast
index eea7e8bbf..b9526b566 100644
--- a/test/llvm_autogenerated/reg-stackify.wast
+++ b/test/llvm_autogenerated/reg-stackify.wast
@@ -1,8 +1,7 @@
 (module
-  (memory 1
-    (segment 4 "\10\04\00\00")
-    (segment 12 "\00\00\00\00")
-  )
+  (memory 1)
+  (data (i32.const 4) "\10\04\00\00")
+  (data (i32.const 12) "\00\00\00\00")
   (export "memory" memory)
   (type $FUNCSIG$i (func (result i32)))
   (type $FUNCSIG$ii (func (param i32) (result i32)))
diff --git a/test/llvm_autogenerated/return-int32.wast b/test/llvm_autogenerated/return-int32.wast
index 8a10e58e4..eca34d41d 100644
--- a/test/llvm_autogenerated/return-int32.wast
+++ b/test/llvm_autogenerated/return-int32.wast
@@ -1,7 +1,6 @@
 (module
-  (memory 1
-    (segment 4 "\10\04\00\00")
-  )
+  (memory 1)
+  (data (i32.const 4) "\10\04\00\00")
   (export "memory" memory)
   (export "return_i32" $return_i32)
   (export "return_i32_twice" $return_i32_twice)
diff --git a/test/llvm_autogenerated/return-void.wast b/test/llvm_autogenerated/return-void.wast
index e8c9ba861..f2aa0eb37 100644
--- a/test/llvm_autogenerated/return-void.wast
+++ b/test/llvm_autogenerated/return-void.wast
@@ -1,7 +1,6 @@
 (module
-  (memory 1
-    (segment 4 "\10\04\00\00")
-  )
+  (memory 1)
+  (data (i32.const 4) "\10\04\00\00")
   (export "memory" memory)
   (export "return_void" $return_void)
   (export "return_void_twice" $return_void_twice)
diff --git a/test/llvm_autogenerated/select.wast b/test/llvm_autogenerated/select.wast
index 0bb26d95f..b8c32c86e 100644
--- a/test/llvm_autogenerated/select.wast
+++ b/test/llvm_autogenerated/select.wast
@@ -1,7 +1,6 @@
 (module
-  (memory 1
-    (segment 4 "\10\04\00\00")
-  )
+  (memory 1)
+  (data (i32.const 4) "\10\04\00\00")
   (export "memory" memory)
   (export "select_i32_bool" $select_i32_bool)
   (export "select_i32_eq" $select_i32_eq)
diff --git a/test/llvm_autogenerated/signext-zeroext.wast b/test/llvm_autogenerated/signext-zeroext.wast
index e7004abe8..f3534f9ba 100644
--- a/test/llvm_autogenerated/signext-zeroext.wast
+++ b/test/llvm_autogenerated/signext-zeroext.wast
@@ -1,7 +1,6 @@
 (module
-  (memory 1
-    (segment 4 "\10\04\00\00")
-  )
+  (memory 1)
+  (data (i32.const 4) "\10\04\00\00")
   (export "memory" memory)
   (export "z2s_func" $z2s_func)
   (export "s2z_func" $s2z_func)
diff --git a/test/llvm_autogenerated/store-results.wast b/test/llvm_autogenerated/store-results.wast
index dd974db29..c0969bf5f 100644
--- a/test/llvm_autogenerated/store-results.wast
+++ b/test/llvm_autogenerated/store-results.wast
@@ -1,7 +1,6 @@
 (module
-  (memory 1
-    (segment 4 " \04\00\00")
-  )
+  (memory 1)
+  (data (i32.const 4) " \04\00\00")
   (export "memory" memory)
   (export "single_block" $single_block)
   (export "foo" $foo)
diff --git a/test/llvm_autogenerated/store-trunc.wast b/test/llvm_autogenerated/store-trunc.wast
index c337018bf..cf20bcd00 100644
--- a/test/llvm_autogenerated/store-trunc.wast
+++ b/test/llvm_autogenerated/store-trunc.wast
@@ -1,7 +1,6 @@
 (module
-  (memory 1
-    (segment 4 "\10\04\00\00")
-  )
+  (memory 1)
+  (data (i32.const 4) "\10\04\00\00")
   (export "memory" memory)
   (export "trunc_i8_i32" $trunc_i8_i32)
   (export "trunc_i16_i32" $trunc_i16_i32)
diff --git a/test/llvm_autogenerated/store.wast b/test/llvm_autogenerated/store.wast
index 1234d94a9..1017588b1 100644
--- a/test/llvm_autogenerated/store.wast
+++ b/test/llvm_autogenerated/store.wast
@@ -1,7 +1,6 @@
 (module
-  (memory 1
-    (segment 4 "\10\04\00\00")
-  )
+  (memory 1)
+  (data (i32.const 4) "\10\04\00\00")
   (export "memory" memory)
   (export "sti32" $sti32)
   (export "sti64" $sti64)
diff --git a/test/llvm_autogenerated/switch.wast b/test/llvm_autogenerated/switch.wast
index 78f9a2859..abd4045ae 100644
--- a/test/llvm_autogenerated/switch.wast
+++ b/test/llvm_autogenerated/switch.wast
@@ -1,7 +1,6 @@
 (module
-  (memory 1
-    (segment 4 "\10\04\00\00")
-  )
+  (memory 1)
+  (data (i32.const 4) "\10\04\00\00")
   (export "memory" memory)
   (type $FUNCSIG$v (func))
   (import $foo0 "env" "foo0")
diff --git a/test/llvm_autogenerated/unreachable.wast b/test/llvm_autogenerated/unreachable.wast
index 8c9838b3d..27a783ccf 100644
--- a/test/llvm_autogenerated/unreachable.wast
+++ b/test/llvm_autogenerated/unreachable.wast
@@ -1,7 +1,6 @@
 (module
-  (memory 1
-    (segment 4 "\10\04\00\00")
-  )
+  (memory 1)
+  (data (i32.const 4) "\10\04\00\00")
   (export "memory" memory)
   (type $FUNCSIG$v (func))
   (import $abort "env" "abort")
diff --git a/test/llvm_autogenerated/unused-argument.wast b/test/llvm_autogenerated/unused-argument.wast
index 318ef7a87..c212ea165 100644
--- a/test/llvm_autogenerated/unused-argument.wast
+++ b/test/llvm_autogenerated/unused-argument.wast
@@ -1,7 +1,6 @@
 (module
-  (memory 1
-    (segment 4 "\10\04\00\00")
-  )
+  (memory 1)
+  (data (i32.const 4) "\10\04\00\00")
   (export "memory" memory)
   (type $FUNCSIG$i (func (result i32)))
   (import $return_something "env" "return_something" (result i32))
diff --git a/test/llvm_autogenerated/userstack.wast b/test/llvm_autogenerated/userstack.wast
index c2b38605e..216930a03 100644
--- a/test/llvm_autogenerated/userstack.wast
+++ b/test/llvm_autogenerated/userstack.wast
@@ -1,7 +1,6 @@
 (module
-  (memory 1
-    (segment 4 "\10\04\00\00")
-  )
+  (memory 1)
+  (data (i32.const 4) "\10\04\00\00")
   (export "memory" memory)
   (type $FUNCSIG$vi (func (param i32)))
   (import $ext_func "env" "ext_func" (param i32))
diff --git a/test/llvm_autogenerated/varargs.wast b/test/llvm_autogenerated/varargs.wast
index d460e2efb..02b3f2202 100644
--- a/test/llvm_autogenerated/varargs.wast
+++ b/test/llvm_autogenerated/varargs.wast
@@ -1,7 +1,6 @@
 (module
-  (memory 1
-    (segment 4 "\10\04\00\00")
-  )
+  (memory 1)
+  (data (i32.const 4) "\10\04\00\00")
   (export "memory" memory)
   (type $FUNCSIG$vi (func (param i32)))
   (import $callee "env" "callee" (param i32))
diff --git a/test/memorygrowth.fromasm b/test/memorygrowth.fromasm
index 5c005ba99..c07cc247e 100644
--- a/test/memorygrowth.fromasm
+++ b/test/memorygrowth.fromasm
@@ -40,7 +40,8 @@
   (export "dynCall_iiii" $lb)
   (export "dynCall_vi" $mb)
   (export "__growWasmMemory" $__growWasmMemory)
-  (table $nb $Oa $ob $Va $Ua $Ra $pb $Sa)
+  (table 8 8 anyfunc)
+  (elem (i32.const 0) $nb $Oa $ob $Va $Ua $Ra $pb $Sa)
   (func $eb (param $0 i32) (result i32)
     (local $1 i32)
     (local $2 i32)
diff --git a/test/memorygrowth.fromasm.imprecise b/test/memorygrowth.fromasm.imprecise
index b70bc7c9e..5482b08f6 100644
--- a/test/memorygrowth.fromasm.imprecise
+++ b/test/memorygrowth.fromasm.imprecise
@@ -39,7 +39,8 @@
   (export "dynCall_iiii" $lb)
   (export "dynCall_vi" $mb)
   (export "__growWasmMemory" $__growWasmMemory)
-  (table $nb $Oa $ob $Va $Ua $Ra $pb $Sa)
+  (table 8 8 anyfunc)
+  (elem (i32.const 0) $nb $Oa $ob $Va $Ua $Ra $pb $Sa)
   (func $eb (param $0 i32) (result i32)
     (local $1 i32)
     (local $2 i32)
diff --git a/test/memorygrowth.fromasm.imprecise.no-opts b/test/memorygrowth.fromasm.imprecise.no-opts
index dd03e651e..ddd73a5f8 100644
--- a/test/memorygrowth.fromasm.imprecise.no-opts
+++ b/test/memorygrowth.fromasm.imprecise.no-opts
@@ -39,7 +39,8 @@
   (export "dynCall_iiii" $lb)
   (export "dynCall_vi" $mb)
   (export "__growWasmMemory" $__growWasmMemory)
-  (table $nb $Oa $ob $Va $Ua $Ra $pb $Sa)
+  (table 8 8 anyfunc)
+  (elem (i32.const 0) $nb $Oa $ob $Va $Ua $Ra $pb $Sa)
   (func $eb (param $a i32) (result i32)
     (local $b i32)
     (local $c i32)
diff --git a/test/memorygrowth.fromasm.no-opts b/test/memorygrowth.fromasm.no-opts
index 29aa4aa30..c0a7307c5 100644
--- a/test/memorygrowth.fromasm.no-opts
+++ b/test/memorygrowth.fromasm.no-opts
@@ -40,7 +40,8 @@
   (export "dynCall_iiii" $lb)
   (export "dynCall_vi" $mb)
   (export "__growWasmMemory" $__growWasmMemory)
-  (table $nb $Oa $ob $Va $Ua $Ra $pb $Sa)
+  (table 8 8 anyfunc)
+  (elem (i32.const 0) $nb $Oa $ob $Va $Ua $Ra $pb $Sa)
   (func $eb (param $a i32) (result i32)
     (local $b i32)
     (local $c i32)
diff --git a/test/passes/dce.txt b/test/passes/dce.txt
index 692a5005e..9ae5977b6 100644
--- a/test/passes/dce.txt
+++ b/test/passes/dce.txt
@@ -2,7 +2,8 @@
   (memory 10)
   (type $ii (func (param i32 i32)))
   (type $1 (func))
-  (table $call-me)
+  (table 1 1 anyfunc)
+  (elem (i32.const 0) $call-me)
   (func $call-me (type $ii) (param $0 i32) (param $1 i32)
     (nop)
   )
diff --git a/test/passes/duplicate-function-elimination.txt b/test/passes/duplicate-function-elimination.txt
index 3671ce24b..a7511fc5c 100644
--- a/test/passes/duplicate-function-elimination.txt
+++ b/test/passes/duplicate-function-elimination.txt
@@ -38,7 +38,8 @@
   (type $0 (func))
   (export "keep2" $keep2)
   (export "other" $keep2)
-  (table $keep2 $keep2 $caller)
+  (table 3 3 anyfunc)
+  (elem (i32.const 0) $keep2 $keep2 $caller)
   (func $keep2 (type $0)
     (nop)
   )
@@ -363,7 +364,8 @@
 (module
   (memory 0)
   (type $T (func))
-  (table $erase $erase)
+  (table 2 2 anyfunc)
+  (elem (i32.const 0) $erase $erase)
   (func $erase (type $T)
     (call_indirect $T
       (i32.const 0)
@@ -373,7 +375,8 @@
 (module
   (memory 0)
   (type $T (func))
-  (table $keep2 $other)
+  (table 2 2 anyfunc)
+  (elem (i32.const 0) $keep2 $other)
   (func $keep2 (type $T)
     (call_indirect $T
       (i32.const 0)
@@ -389,7 +392,8 @@
   (memory 0)
   (type $T (func))
   (type $S (func))
-  (table $keep2 $other)
+  (table 2 2 anyfunc)
+  (elem (i32.const 0) $keep2 $other)
   (func $keep2 (type $T)
     (call_indirect $T
       (i32.const 0)
diff --git a/test/passes/remove-unused-functions.txt b/test/passes/remove-unused-functions.txt
index b6f7cf3e1..cd819d347 100644
--- a/test/passes/remove-unused-functions.txt
+++ b/test/passes/remove-unused-functions.txt
@@ -3,7 +3,8 @@
   (start $start)
   (type $0 (func))
   (export "exported" $exported)
-  (table $called_indirect)
+  (table 1 1 anyfunc)
+  (elem (i32.const 0) $called_indirect)
   (func $start (type $0)
     (call $called0)
   )
diff --git a/test/passes/remove-unused-names_merge-blocks.txt b/test/passes/remove-unused-names_merge-blocks.txt
index fe5bd5cf8..88d284a5a 100644
--- a/test/passes/remove-unused-names_merge-blocks.txt
+++ b/test/passes/remove-unused-names_merge-blocks.txt
@@ -4,7 +4,8 @@
   (type $ii (func (param i32 i32)))
   (type $iii (func (param i32 i32 i32)))
   (type $3 (func))
-  (table $call-i)
+  (table 1 1 anyfunc)
+  (elem (i32.const 0) $call-i)
   (func $call-i (type $i) (param $0 i32)
     (nop)
   )
diff --git a/test/unit.fromasm b/test/unit.fromasm
index f939782e7..49189df43 100644
--- a/test/unit.fromasm
+++ b/test/unit.fromasm
@@ -15,7 +15,8 @@
   (import $i32u-div "asm2wasm" "i32u-div" (param i32 i32) (result i32))
   (export "big_negative" $big_negative)
   (export "pick" $big_negative)
-  (table $big_negative $big_negative $big_negative $big_negative $big_negative $big_negative $importedDoubles $big_negative $big_negative $cneg)
+  (table 10 10 anyfunc)
+  (elem (i32.const 0) $big_negative $big_negative $big_negative $big_negative $big_negative $big_negative $importedDoubles $big_negative $big_negative $cneg)
   (func $big_negative
     (nop)
   )
diff --git a/test/unit.fromasm.imprecise b/test/unit.fromasm.imprecise
index f80f4ce6c..d2c10b549 100644
--- a/test/unit.fromasm.imprecise
+++ b/test/unit.fromasm.imprecise
@@ -11,7 +11,8 @@
   (import $f64-rem "asm2wasm" "f64-rem" (param f64 f64) (result f64))
   (export "big_negative" $big_negative)
   (export "pick" $big_negative)
-  (table $big_negative $big_negative $big_negative $big_negative $big_negative $big_negative $importedDoubles $big_negative $big_negative $cneg)
+  (table 10 10 anyfunc)
+  (elem (i32.const 0) $big_negative $big_negative $big_negative $big_negative $big_negative $big_negative $importedDoubles $big_negative $big_negative $cneg)
   (func $big_negative
     (nop)
   )
diff --git a/test/unit.fromasm.imprecise.no-opts b/test/unit.fromasm.imprecise.no-opts
index 4fa627938..7037a6c1c 100644
--- a/test/unit.fromasm.imprecise.no-opts
+++ b/test/unit.fromasm.imprecise.no-opts
@@ -11,7 +11,8 @@
   (import $f64-rem "asm2wasm" "f64-rem" (param f64 f64) (result f64))
   (export "big_negative" $big_negative)
   (export "pick" $exportMe)
-  (table $z $big_negative $z $z $w $w $importedDoubles $w $z $cneg)
+  (table 10 10 anyfunc)
+  (elem (i32.const 0) $z $big_negative $z $z $w $w $importedDoubles $w $z $cneg)
   (func $big_negative
     (local $temp f64)
     (set_local $temp
diff --git a/test/unit.fromasm.no-opts b/test/unit.fromasm.no-opts
index c10bd3dff..51ae345b9 100644
--- a/test/unit.fromasm.no-opts
+++ b/test/unit.fromasm.no-opts
@@ -15,7 +15,8 @@
   (import $i32u-div "asm2wasm" "i32u-div" (param i32 i32) (result i32))
   (export "big_negative" $big_negative)
   (export "pick" $exportMe)
-  (table $z $big_negative $z $z $w $w $importedDoubles $w $z $cneg)
+  (table 10 10 anyfunc)
+  (elem (i32.const 0) $z $big_negative $z $z $w $w $importedDoubles $w $z $cneg)
   (func $big_negative
     (local $temp f64)
     (set_local $temp
diff --git a/test/unit.wast b/test/unit.wast
index 301ba719c..2e21d44dd 100644
--- a/test/unit.wast
+++ b/test/unit.wast
@@ -1,7 +1,6 @@
 (module
-  (memory 4096 4096
-    (segment 1026 "\14\00")
-  )
+  (memory 4096 4096)
+  (data (i32.const 1026) "\14\00")
   (type $FUNCSIG$vf (func (param f32)))
   (type $FUNCSIG$v (func))
   (type $FUNCSIG$id (func (param f64) (result i32)))
@@ -14,7 +13,8 @@
   (import $f64-to-int "asm2wasm" "f64-to-int" (param f64) (result i32))
   (import $f64-rem "asm2wasm" "f64-rem" (param f64 f64) (result f64))
   (export "big_negative" $big_negative)
-  (table $z $big_negative $z $z $w $w $importedDoubles $w $z $cneg)
+  (table 10 anyfunc)
+  (elem (i32.const 0) $z $big_negative $z $z $w $w $importedDoubles $w $z $cneg)
   (func $big_negative (type $FUNCSIG$v)
     (local $temp f64)
     (block $block0
diff --git a/test/unit.wast.fromBinary b/test/unit.wast.fromBinary
index c9ba4528b..29d53598a 100644
--- a/test/unit.wast.fromBinary
+++ b/test/unit.wast.fromBinary
@@ -1,7 +1,6 @@
 (module
-  (memory 4096 4096
-    (segment 1026 "\14\00")
-  )
+  (memory 4096 4096)
+  (data (i32.const 1026) "\14\00")
   (type $0 (func (param f32)))
   (type $1 (func))
   (type $2 (func (param f64) (result i32)))
@@ -14,7 +13,8 @@
   (import $import$1 "asm2wasm" "f64-to-int" (param f64) (result i32))
   (import $import$2 "asm2wasm" "f64-rem" (param f64 f64) (result f64))
   (export "big_negative" $big_negative)
-  (table $z $big_negative $z $z $w $w $importedDoubles $w $z $cneg)
+  (table 10 anyfunc)
+  (elem (i32.const 0) $z $big_negative $z $z $w $w $importedDoubles $w $z $cneg)
   (func $big_negative (type $1)
     (local $var$0 f64)
     (block $label$0