wasm-micro-runtime/tests/wamr-test-suites/spec-test-script/gc_ignore_cases.patch

diff --git a/test/core/binary.wast b/test/core/binary.wast
index 84f4b153..4424c08a 100644
--- a/test/core/binary.wast
+++ b/test/core/binary.wast
@@ -206,7 +206,7 @@
 )
 
 ;; Type section with signed LEB128 encoded type
-(assert_malformed
+(;assert_malformed
   (module binary
     "\00asm" "\01\00\00\00"
     "\01"                     ;; Type section id
@@ -216,7 +216,7 @@
     "\00\00"
   )
   "integer representation too long"
-)
+;)
 
 ;; Unsigned LEB128 must not be overlong
 (assert_malformed
@@ -1683,7 +1683,7 @@
 )
 
 ;; 2 elem segment declared, 1 given
-(assert_malformed
+(;assert_malformed
   (module binary
     "\00asm" "\01\00\00\00"
     "\01\04\01"                             ;; type section
@@ -1696,7 +1696,7 @@
     ;; "\00\41\00\0b\01\00"                 ;; elem 1 (missed)
   )
   "unexpected end"
-)
+;)
 
 ;; 2 elem segment declared, 1.5 given
 (assert_malformed
@@ -1813,7 +1813,7 @@
 )
 
 ;; 1 br_table target declared, 2 given
-(assert_malformed
+(;assert_malformed
   (module binary
     "\00asm" "\01\00\00\00"
     "\01\04\01"                             ;; type section
@@ -1832,7 +1832,7 @@
     "\0b\0b\0b"                             ;; end
   )
   "unexpected end of section or function"
-)
+;)
 
 ;; Start section
 (module binary
diff --git a/test/core/elem.wast b/test/core/elem.wast
index 57457286..5c0bd457 100644
--- a/test/core/elem.wast
+++ b/test/core/elem.wast
@@ -584,9 +584,11 @@
   (func $const-i32-d (type $out-i32) (i32.const 68))
 )
 
+(;
 (assert_return (invoke $module1 "call-7") (i32.const 67))
 (assert_return (invoke $module1 "call-8") (i32.const 68))
 (assert_return (invoke $module1 "call-9") (i32.const 66))
+;)
 
 (module $module3
   (type $out-i32 (func (result i32)))
@@ -597,6 +599,8 @@
   (func $const-i32-f (type $out-i32) (i32.const 70))
 )
 
+(;
 (assert_return (invoke $module1 "call-7") (i32.const 67))
 (assert_return (invoke $module1 "call-8") (i32.const 69))
 (assert_return (invoke $module1 "call-9") (i32.const 70))
+;)
diff --git a/test/core/gc/array.wast b/test/core/gc/array.wast
index 7ee75b20..e3e0f635 100644
--- a/test/core/gc/array.wast
+++ b/test/core/gc/array.wast
@@ -35,10 +35,10 @@
 ;; Binding structure
 
 (module
-  (rec
+  ;;(rec
     (type $s0 (array (ref $s1)))
     (type $s1 (array (ref $s0)))
-  )
+  ;;)
 
   (func (param (ref $forward)))
 
@@ -61,8 +61,8 @@
   (type $vec (array f32))
   (type $mvec (array (mut f32)))
 
-  (global (ref $vec) (array.new_canon $vec (f32.const 1) (i32.const 3)))
-  (global (ref $vec) (array.new_canon_default $vec (i32.const 3)))
+  ;;(global (ref $vec) (array.new_canon $vec (f32.const 1) (i32.const 3)))
+  ;;(global (ref $vec) (array.new_canon_default $vec (i32.const 3)))
 
   (func $new (export "new") (result (ref $vec))
     (array.new_canon_default $vec (i32.const 3))
@@ -95,7 +95,7 @@
 )
 
 (assert_return (invoke "new") (ref.array))
-(assert_return (invoke "new") (ref.eq))
+;;(assert_return (invoke "new") (ref.eq))
 (assert_return (invoke "get" (i32.const 0)) (f32.const 0))
 (assert_return (invoke "set_get" (i32.const 1) (f32.const 7)) (f32.const 7))
 (assert_return (invoke "len") (i32.const 3))
@@ -107,7 +107,7 @@
   (type $vec (array f32))
   (type $mvec (array (mut f32)))
 
-  (global (ref $vec) (array.new_canon_fixed $vec 2 (f32.const 1) (f32.const 2)))
+  ;;(global (ref $vec) (array.new_canon_fixed $vec 2 (f32.const 1) (f32.const 2)))
 
   (func $new (export "new") (result (ref $vec))
     (array.new_canon_fixed $vec 2 (f32.const 1) (f32.const 2))
@@ -140,7 +140,7 @@
 )
 
 (assert_return (invoke "new") (ref.array))
-(assert_return (invoke "new") (ref.eq))
+;;(assert_return (invoke "new") (ref.eq))
 (assert_return (invoke "get" (i32.const 0)) (f32.const 1))
 (assert_return (invoke "set_get" (i32.const 1) (f32.const 7)) (f32.const 7))
 (assert_return (invoke "len") (i32.const 2))
@@ -185,7 +185,7 @@
 )
 
 (assert_return (invoke "new") (ref.array))
-(assert_return (invoke "new") (ref.eq))
+;;(assert_return (invoke "new") (ref.eq))
 (assert_return (invoke "get" (i32.const 0)) (i32.const 1))
 (assert_return (invoke "set_get" (i32.const 1) (i32.const 7)) (i32.const 7))
 (assert_return (invoke "len") (i32.const 3))
@@ -201,8 +201,8 @@
   (type $avec (array (mut anyref)))
 
   (elem $e (ref $bvec)
-    (array.new_canon $bvec (i32.const 7) (i32.const 3))
-    (array.new_canon_fixed $bvec 2 (i32.const 1) (i32.const 2))
+    ;;(array.new_canon $bvec (i32.const 7) (i32.const 3))
+    ;;(array.new_canon_fixed $bvec 2 (i32.const 1) (i32.const 2))
   )
 
   (func $new (export "new") (result (ref $vec))
@@ -242,8 +242,9 @@
   )
 )
 
+(; ;; TODO: support array.new_canon_elem
 (assert_return (invoke "new") (ref.array))
-(assert_return (invoke "new") (ref.eq))
+;;(assert_return (invoke "new") (ref.eq))
 (assert_return (invoke "get" (i32.const 0) (i32.const 0)) (i32.const 7))
 (assert_return (invoke "get" (i32.const 1) (i32.const 0)) (i32.const 1))
 (assert_return (invoke "set_get" (i32.const 0) (i32.const 1) (i32.const 1)) (i32.const 2))
@@ -251,6 +252,7 @@
 
 (assert_trap (invoke "get" (i32.const 10) (i32.const 0)) "out of bounds")
 (assert_trap (invoke "set_get" (i32.const 10) (i32.const 0) (i32.const 0)) "out of bounds")
+;)
 
 (assert_invalid
   (module
diff --git a/test/core/gc/extern.wast b/test/core/gc/extern.wast
index 1f32a0ab..93177e8b 100644
--- a/test/core/gc/extern.wast
+++ b/test/core/gc/extern.wast
@@ -36,14 +36,14 @@
 (assert_return (invoke "internalize" (ref.extern 1)) (ref.host 1))
 (assert_return (invoke "internalize" (ref.null extern)) (ref.null any))
 
-(assert_return (invoke "externalize" (ref.host 2)) (ref.extern 2))
+;;(assert_return (invoke "externalize" (ref.host 2)) (ref.extern 2))
 (assert_return (invoke "externalize" (ref.null any)) (ref.null extern))
 
 (assert_return (invoke "externalize-i" (i32.const 0)) (ref.null extern))
 (assert_return (invoke "externalize-i" (i32.const 1)) (ref.extern))
 (assert_return (invoke "externalize-i" (i32.const 2)) (ref.extern))
 (assert_return (invoke "externalize-i" (i32.const 3)) (ref.extern))
-(assert_return (invoke "externalize-i" (i32.const 4)) (ref.extern))
+;;(assert_return (invoke "externalize-i" (i32.const 4)) (ref.extern))
 (assert_return (invoke "externalize-i" (i32.const 5)) (ref.null extern))
 
 (assert_return (invoke "externalize-ii" (i32.const 0)) (ref.null any))
diff --git a/test/core/gc/struct.wast b/test/core/gc/struct.wast
index bbd2c94a..dc490f62 100644
--- a/test/core/gc/struct.wast
+++ b/test/core/gc/struct.wast
@@ -30,10 +30,10 @@
 ;; Binding structure
 
 (module
-  (rec
+  ;;(rec
     (type $s0 (struct (field (ref 0) (ref 1) (ref $s0) (ref $s1))))
     (type $s1 (struct (field (ref 0) (ref 1) (ref $s0) (ref $s1))))
-  )
+  ;;)
 
   (func (param (ref $forward)))
 
@@ -55,7 +55,7 @@
 (module
   (type $vec (struct (field f32) (field $y (mut f32)) (field $z f32)))
 
-  (global (ref $vec) (struct.new_canon $vec (f32.const 1) (f32.const 2) (f32.const 3)))
+  ;;(global (ref $vec) (struct.new_canon $vec (f32.const 1) (f32.const 2) (f32.const 3)))
   (global (ref $vec) (struct.new_canon_default $vec))
 
   (func (export "new") (result anyref)
diff --git a/test/core/gc/type-subtyping.wast b/test/core/gc/type-subtyping.wast
index fc5d3d6b..7123afdf 100644
--- a/test/core/gc/type-subtyping.wast
+++ b/test/core/gc/type-subtyping.wast
@@ -34,6 +34,7 @@
 
 ;; Recursive definitions
 
+(;
 (module
   (type $t (sub (struct (field anyref))))
   (rec (type $r (sub $t (struct (field (ref $r))))))
@@ -175,6 +176,7 @@
 (assert_trap (invoke "fail4") "cast")
 (assert_trap (invoke "fail5") "cast")
 (assert_trap (invoke "fail6") "cast")
+;)
 
 (module
   (type $t1 (sub (func)))
@@ -209,6 +211,7 @@
 
 ;; Linking
 
+(;
 (module
   (type $t0 (sub (func (result (ref null func)))))
   (rec (type $t1 (sub $t0 (func (result (ref null $t1))))))
@@ -262,6 +265,7 @@
   )
   "incompatible import type"
 )
+;)
 
 (module
   (type $t1 (sub (func)))
diff --git a/test/core/linking.wast b/test/core/linking.wast
index 6a8ba1d0..e3059235 100644
--- a/test/core/linking.wast
+++ b/test/core/linking.wast
@@ -14,10 +14,12 @@
   (func $g (result i32) (i32.const 3))
 )
 
+(;
 (assert_return (invoke $Mf "call") (i32.const 2))
 (assert_return (invoke $Nf "Mf.call") (i32.const 2))
 (assert_return (invoke $Nf "call") (i32.const 3))
 (assert_return (invoke $Nf "call Mf.call") (i32.const 2))
+;)
 
 (module
   (import "spectest" "print_i32" (func $f (param i32)))
@@ -47,6 +49,7 @@
 )
 (register "Mg" $Mg)
 
+(;
 (module $Ng
   (global $x (import "Mg" "glob") i32)
   (global $mut_glob (import "Mg" "mut_glob") (mut i32))
@@ -81,6 +84,7 @@
 (assert_return (get $Ng "Mg.mut_glob") (i32.const 241))
 (assert_return (invoke $Mg "get_mut") (i32.const 241))
 (assert_return (invoke $Ng "Mg.get_mut") (i32.const 241))
+;)
 
 
 (assert_unlinkable
@@ -109,6 +113,7 @@
 )
 (register "Mref_ex" $Mref_ex)
 
+(;
 (module $Mref_im
   (type $t (func))
   (global (import "Mref_ex" "g-const-funcnull") (ref null func))
@@ -128,6 +133,7 @@
   (global (import "Mref_ex" "g-var-ref") (mut (ref $t)))
   (global (import "Mref_ex" "g-var-extern") (mut externref))
 )
+;)
 
 (assert_unlinkable
   (module (global (import "Mref_ex" "g-const-extern") (ref null func)))
@@ -300,6 +306,7 @@
   )
 )
 
+(;
 (assert_return (invoke $Mt "call" (i32.const 2)) (i32.const 4))
 (assert_return (invoke $Nt "Mt.call" (i32.const 2)) (i32.const 4))
 (assert_return (invoke $Nt "call" (i32.const 2)) (i32.const 5))
@@ -608,3 +615,4 @@
 
 (assert_return (invoke $Ms "get memory[0]") (i32.const 104))  ;; 'h'
 (assert_return (invoke $Ms "get table[0]") (i32.const 0xdead))
+;)
diff --git a/test/core/local_get.wast b/test/core/local_get.wast
index b56aeec3..03465714 100644
--- a/test/core/local_get.wast
+++ b/test/core/local_get.wast
@@ -227,6 +227,7 @@
 
 ;; Uninitialized undefaulted locals
 
+(; ;; TODO
 (module
   (func (export "get-after-set") (param $p (ref extern)) (result (ref extern))
     (local $x (ref extern))
@@ -248,6 +249,7 @@
 (assert_return (invoke "get-after-set" (ref.extern 1)) (ref.extern 1))
 (assert_return (invoke "get-after-tee" (ref.extern 2)) (ref.extern 2))
 (assert_return (invoke "get-in-block-after-set" (ref.extern 3)) (ref.extern 3))
+;)
 
 (assert_invalid
   (module (func $uninit (local $x (ref extern)) (drop (local.get $x))))
diff --git a/test/core/ref.wast b/test/core/ref.wast
index aef1b392..b86db373 100644
--- a/test/core/ref.wast
+++ b/test/core/ref.wast
@@ -71,7 +71,7 @@
 )
 (assert_invalid
   (module (func $if-invalid (drop (if (result (ref 1)) (then) (else)))))
-  "unknown type"
+  "type mismatch"
 )
 
 (assert_invalid
diff --git a/test/core/ref_func.wast b/test/core/ref_func.wast
index adb5cb78..b672c6c4 100644
--- a/test/core/ref_func.wast
+++ b/test/core/ref_func.wast
@@ -1,10 +1,14 @@
+(;
 (module
   (func (export "f") (param $x i32) (result i32) (local.get $x))
 )
 (register "M")
+;)
 
 (module
-  (func $f (import "M" "f") (param i32) (result i32))
+  ;;(func $f (import "M" "f") (param i32) (result i32))
+  (func $f (param $x i32) (result i32) (local.get $x))
+
   (func $g (param $x i32) (result i32)
     (i32.add (local.get $x) (i32.const 1))
   )
diff --git a/test/core/ref_null.wast b/test/core/ref_null.wast
index 1ffd03f8..b0fb88b5 100644
--- a/test/core/ref_null.wast
+++ b/test/core/ref_null.wast
@@ -11,7 +11,7 @@
 
 (assert_return (invoke "anyref") (ref.null any))
 (assert_return (invoke "funcref") (ref.null func))
-(assert_return (invoke "ref") (ref.null))
+(assert_return (invoke "ref") (ref.null func))
 
 
 (module
@@ -41,23 +41,23 @@
 )
 
 (assert_return (invoke "anyref") (ref.null any))
-(assert_return (invoke "anyref") (ref.null none))
-(assert_return (invoke "anyref") (ref.null))
+;;(assert_return (invoke "anyref") (ref.null none))
+;;(assert_return (invoke "anyref") (ref.null))
 (assert_return (invoke "nullref") (ref.null any))
-(assert_return (invoke "nullref") (ref.null none))
-(assert_return (invoke "nullref") (ref.null))
+;;(assert_return (invoke "nullref") (ref.null none))
+;;(assert_return (invoke "nullref") (ref.null))
 (assert_return (invoke "funcref") (ref.null func))
-(assert_return (invoke "funcref") (ref.null nofunc))
-(assert_return (invoke "funcref") (ref.null))
+;;(assert_return (invoke "funcref") (ref.null nofunc))
+;;(assert_return (invoke "funcref") (ref.null))
 (assert_return (invoke "nullfuncref") (ref.null func))
-(assert_return (invoke "nullfuncref") (ref.null nofunc))
-(assert_return (invoke "nullfuncref") (ref.null))
+;;(assert_return (invoke "nullfuncref") (ref.null nofunc))
+;;(assert_return (invoke "nullfuncref") (ref.null))
 (assert_return (invoke "externref") (ref.null extern))
-(assert_return (invoke "externref") (ref.null noextern))
-(assert_return (invoke "externref") (ref.null))
+;;(assert_return (invoke "externref") (ref.null noextern))
+;;(assert_return (invoke "externref") (ref.null))
 (assert_return (invoke "nullexternref") (ref.null extern))
-(assert_return (invoke "nullexternref") (ref.null noextern))
-(assert_return (invoke "nullexternref") (ref.null))
+;;(assert_return (invoke "nullexternref") (ref.null noextern))
+;;(assert_return (invoke "nullexternref") (ref.null))
 (assert_return (invoke "ref") (ref.null func))
-(assert_return (invoke "ref") (ref.null nofunc))
-(assert_return (invoke "ref") (ref.null))
+;;(assert_return (invoke "ref") (ref.null nofunc))
+;;(assert_return (invoke "ref") (ref.null))
diff --git a/test/core/select.wast b/test/core/select.wast
index 94aa8605..087a82df 100644
--- a/test/core/select.wast
+++ b/test/core/select.wast
@@ -277,7 +277,7 @@
 (assert_return (invoke "select-f64-t" (f64.const 2) (f64.const nan:0x20304) (i32.const 0)) (f64.const nan:0x20304))
 
 (assert_return (invoke "join-funcnull" (i32.const 1)) (ref.func))
-(assert_return (invoke "join-funcnull" (i32.const 0)) (ref.null))
+(assert_return (invoke "join-funcnull" (i32.const 0)) (func:ref.null))
 
 (assert_trap (invoke "select-trap-left" (i32.const 1)) "unreachable")
 (assert_trap (invoke "select-trap-left" (i32.const 0)) "unreachable")
@@ -368,6 +368,7 @@
   (module (func $arity-0 (select (result) (nop) (nop) (i32.const 1))))
   "invalid result arity"
 )
+(;
 (assert_invalid
   (module (func $arity-2 (result i32 i32)
     (select (result i32 i32)
@@ -378,6 +379,7 @@
   ))
   "invalid result arity"
 )
+;)
 
 
 (assert_invalid
diff --git a/test/core/table.wast b/test/core/table.wast
index 16e35a80..2fbccb71 100644
--- a/test/core/table.wast
+++ b/test/core/table.wast
@@ -77,6 +77,7 @@
 
 ;; Table initializer
 
+(; ;; TODO: spec interpreter generates invalid wasm file?
 (module
   (type $dummy (func))
   (func $dummy)
@@ -93,6 +94,7 @@
 (assert_return (invoke "get1") (ref.null))
 (assert_return (invoke "get2") (ref.func))
 (assert_return (invoke "get3") (ref.func))
+;)
 
 
 ;; Duplicate table identifiers
diff --git a/test/core/table_copy.wast b/test/core/table_copy.wast
index 380e84ee..30c5f95c 100644
--- a/test/core/table_copy.wast
+++ b/test/core/table_copy.wast
@@ -14,11 +14,18 @@
 
 (module
   (type (func (result i32)))  ;; type #0
+  (;
   (import "a" "ef0" (func (result i32)))    ;; index 0
   (import "a" "ef1" (func (result i32)))
   (import "a" "ef2" (func (result i32)))
   (import "a" "ef3" (func (result i32)))
   (import "a" "ef4" (func (result i32)))    ;; index 4
+  ;)
+  (func (export "ef0") (result i32) (i32.const 0))
+  (func (export "ef1") (result i32) (i32.const 1))
+  (func (export "ef2") (result i32) (i32.const 2))
+  (func (export "ef3") (result i32) (i32.const 3))
+  (func (export "ef4") (result i32) (i32.const 4))
   (table $t0 30 30 funcref)
   (table $t1 30 30 funcref)
   (elem (table $t0) (i32.const 2) func 3 1 4 1)
@@ -106,11 +113,18 @@
 
 (module
   (type (func (result i32)))  ;; type #0
+  (;
   (import "a" "ef0" (func (result i32)))    ;; index 0
   (import "a" "ef1" (func (result i32)))
   (import "a" "ef2" (func (result i32)))
   (import "a" "ef3" (func (result i32)))
   (import "a" "ef4" (func (result i32)))    ;; index 4
+  ;)
+  (func (export "ef0") (result i32) (i32.const 0))
+  (func (export "ef1") (result i32) (i32.const 1))
+  (func (export "ef2") (result i32) (i32.const 2))
+  (func (export "ef3") (result i32) (i32.const 3))
+  (func (export "ef4") (result i32) (i32.const 4))
   (table $t0 30 30 funcref)
   (table $t1 30 30 funcref)
   (elem (table $t0) (i32.const 2) func 3 1 4 1)
@@ -198,11 +212,18 @@
 
 (module
   (type (func (result i32)))  ;; type #0
+  (;
   (import "a" "ef0" (func (result i32)))    ;; index 0
   (import "a" "ef1" (func (result i32)))
   (import "a" "ef2" (func (result i32)))
   (import "a" "ef3" (func (result i32)))
   (import "a" "ef4" (func (result i32)))    ;; index 4
+  ;)
+  (func (export "ef0") (result i32) (i32.const 0))
+  (func (export "ef1") (result i32) (i32.const 1))
+  (func (export "ef2") (result i32) (i32.const 2))
+  (func (export "ef3") (result i32) (i32.const 3))
+  (func (export "ef4") (result i32) (i32.const 4))
   (table $t0 30 30 funcref)
   (table $t1 30 30 funcref)
   (elem (table $t0) (i32.const 2) func 3 1 4 1)
@@ -290,11 +311,18 @@
 
 (module
   (type (func (result i32)))  ;; type #0
+  (;
   (import "a" "ef0" (func (result i32)))    ;; index 0
   (import "a" "ef1" (func (result i32)))
   (import "a" "ef2" (func (result i32)))
   (import "a" "ef3" (func (result i32)))
   (import "a" "ef4" (func (result i32)))    ;; index 4
+  ;)
+  (func (export "ef0") (result i32) (i32.const 0))
+  (func (export "ef1") (result i32) (i32.const 1))
+  (func (export "ef2") (result i32) (i32.const 2))
+  (func (export "ef3") (result i32) (i32.const 3))
+  (func (export "ef4") (result i32) (i32.const 4))
   (table $t0 30 30 funcref)
   (table $t1 30 30 funcref)
   (elem (table $t0) (i32.const 2) func 3 1 4 1)
@@ -382,11 +410,18 @@
 
 (module
   (type (func (result i32)))  ;; type #0
+  (;
   (import "a" "ef0" (func (result i32)))    ;; index 0
   (import "a" "ef1" (func (result i32)))
   (import "a" "ef2" (func (result i32)))
   (import "a" "ef3" (func (result i32)))
   (import "a" "ef4" (func (result i32)))    ;; index 4
+  ;)
+  (func (export "ef0") (result i32) (i32.const 0))
+  (func (export "ef1") (result i32) (i32.const 1))
+  (func (export "ef2") (result i32) (i32.const 2))
+  (func (export "ef3") (result i32) (i32.const 3))
+  (func (export "ef4") (result i32) (i32.const 4))
   (table $t0 30 30 funcref)
   (table $t1 30 30 funcref)
   (elem (table $t0) (i32.const 2) func 3 1 4 1)
@@ -474,11 +509,18 @@
 
 (module
   (type (func (result i32)))  ;; type #0
+  (;
   (import "a" "ef0" (func (result i32)))    ;; index 0
   (import "a" "ef1" (func (result i32)))
   (import "a" "ef2" (func (result i32)))
   (import "a" "ef3" (func (result i32)))
   (import "a" "ef4" (func (result i32)))    ;; index 4
+  ;)
+  (func (export "ef0") (result i32) (i32.const 0))
+  (func (export "ef1") (result i32) (i32.const 1))
+  (func (export "ef2") (result i32) (i32.const 2))
+  (func (export "ef3") (result i32) (i32.const 3))
+  (func (export "ef4") (result i32) (i32.const 4))
   (table $t0 30 30 funcref)
   (table $t1 30 30 funcref)
   (elem (table $t0) (i32.const 2) func 3 1 4 1)
@@ -566,11 +608,18 @@
 
 (module
   (type (func (result i32)))  ;; type #0
+  (;
   (import "a" "ef0" (func (result i32)))    ;; index 0
   (import "a" "ef1" (func (result i32)))
   (import "a" "ef2" (func (result i32)))
   (import "a" "ef3" (func (result i32)))
   (import "a" "ef4" (func (result i32)))    ;; index 4
+  ;)
+  (func (export "ef0") (result i32) (i32.const 0))
+  (func (export "ef1") (result i32) (i32.const 1))
+  (func (export "ef2") (result i32) (i32.const 2))
+  (func (export "ef3") (result i32) (i32.const 3))
+  (func (export "ef4") (result i32) (i32.const 4))
   (table $t0 30 30 funcref)
   (table $t1 30 30 funcref)
   (elem (table $t0) (i32.const 2) func 3 1 4 1)
@@ -658,11 +707,18 @@
 
 (module
   (type (func (result i32)))  ;; type #0
+  (;
   (import "a" "ef0" (func (result i32)))    ;; index 0
   (import "a" "ef1" (func (result i32)))
   (import "a" "ef2" (func (result i32)))
   (import "a" "ef3" (func (result i32)))
   (import "a" "ef4" (func (result i32)))    ;; index 4
+  ;)
+  (func (export "ef0") (result i32) (i32.const 0))
+  (func (export "ef1") (result i32) (i32.const 1))
+  (func (export "ef2") (result i32) (i32.const 2))
+  (func (export "ef3") (result i32) (i32.const 3))
+  (func (export "ef4") (result i32) (i32.const 4))
   (table $t0 30 30 funcref)
   (table $t1 30 30 funcref)
   (elem (table $t0) (i32.const 2) func 3 1 4 1)
@@ -750,11 +806,18 @@
 
 (module
   (type (func (result i32)))  ;; type #0
+  (;
   (import "a" "ef0" (func (result i32)))    ;; index 0
   (import "a" "ef1" (func (result i32)))
   (import "a" "ef2" (func (result i32)))
   (import "a" "ef3" (func (result i32)))
   (import "a" "ef4" (func (result i32)))    ;; index 4
+  ;)
+  (func (export "ef0") (result i32) (i32.const 0))
+  (func (export "ef1") (result i32) (i32.const 1))
+  (func (export "ef2") (result i32) (i32.const 2))
+  (func (export "ef3") (result i32) (i32.const 3))
+  (func (export "ef4") (result i32) (i32.const 4))
   (table $t0 30 30 funcref)
   (table $t1 30 30 funcref)
   (elem (table $t0) (i32.const 2) func 3 1 4 1)
@@ -842,11 +905,18 @@
 
 (module
   (type (func (result i32)))  ;; type #0
+  (;
   (import "a" "ef0" (func (result i32)))    ;; index 0
   (import "a" "ef1" (func (result i32)))
   (import "a" "ef2" (func (result i32)))
   (import "a" "ef3" (func (result i32)))
   (import "a" "ef4" (func (result i32)))    ;; index 4
+  ;)
+  (func (export "ef0") (result i32) (i32.const 0))
+  (func (export "ef1") (result i32) (i32.const 1))
+  (func (export "ef2") (result i32) (i32.const 2))
+  (func (export "ef3") (result i32) (i32.const 3))
+  (func (export "ef4") (result i32) (i32.const 4))
   (table $t0 30 30 funcref)
   (table $t1 30 30 funcref)
   (elem (table $t1) (i32.const 2) func 3 1 4 1)
@@ -934,11 +1004,18 @@
 
 (module
   (type (func (result i32)))  ;; type #0
+  (;
   (import "a" "ef0" (func (result i32)))    ;; index 0
   (import "a" "ef1" (func (result i32)))
   (import "a" "ef2" (func (result i32)))
   (import "a" "ef3" (func (result i32)))
   (import "a" "ef4" (func (result i32)))    ;; index 4
+  ;)
+  (func (export "ef0") (result i32) (i32.const 0))
+  (func (export "ef1") (result i32) (i32.const 1))
+  (func (export "ef2") (result i32) (i32.const 2))
+  (func (export "ef3") (result i32) (i32.const 3))
+  (func (export "ef4") (result i32) (i32.const 4))
   (table $t0 30 30 funcref)
   (table $t1 30 30 funcref)
   (elem (table $t1) (i32.const 2) func 3 1 4 1)
@@ -1026,11 +1103,18 @@
 
 (module
   (type (func (result i32)))  ;; type #0
+  (;
   (import "a" "ef0" (func (result i32)))    ;; index 0
   (import "a" "ef1" (func (result i32)))
   (import "a" "ef2" (func (result i32)))
   (import "a" "ef3" (func (result i32)))
   (import "a" "ef4" (func (result i32)))    ;; index 4
+  ;)
+  (func (export "ef0") (result i32) (i32.const 0))
+  (func (export "ef1") (result i32) (i32.const 1))
+  (func (export "ef2") (result i32) (i32.const 2))
+  (func (export "ef3") (result i32) (i32.const 3))
+  (func (export "ef4") (result i32) (i32.const 4))
   (table $t0 30 30 funcref)
   (table $t1 30 30 funcref)
   (elem (table $t1) (i32.const 2) func 3 1 4 1)
@@ -1118,11 +1202,18 @@
 
 (module
   (type (func (result i32)))  ;; type #0
+  (;
   (import "a" "ef0" (func (result i32)))    ;; index 0
   (import "a" "ef1" (func (result i32)))
   (import "a" "ef2" (func (result i32)))
   (import "a" "ef3" (func (result i32)))
   (import "a" "ef4" (func (result i32)))    ;; index 4
+  ;)
+  (func (export "ef0") (result i32) (i32.const 0))
+  (func (export "ef1") (result i32) (i32.const 1))
+  (func (export "ef2") (result i32) (i32.const 2))
+  (func (export "ef3") (result i32) (i32.const 3))
+  (func (export "ef4") (result i32) (i32.const 4))
   (table $t0 30 30 funcref)
   (table $t1 30 30 funcref)
   (elem (table $t1) (i32.const 2) func 3 1 4 1)
@@ -1210,11 +1301,18 @@
 
 (module
   (type (func (result i32)))  ;; type #0
+  (;
   (import "a" "ef0" (func (result i32)))    ;; index 0
   (import "a" "ef1" (func (result i32)))
   (import "a" "ef2" (func (result i32)))
   (import "a" "ef3" (func (result i32)))
   (import "a" "ef4" (func (result i32)))    ;; index 4
+  ;)
+  (func (export "ef0") (result i32) (i32.const 0))
+  (func (export "ef1") (result i32) (i32.const 1))
+  (func (export "ef2") (result i32) (i32.const 2))
+  (func (export "ef3") (result i32) (i32.const 3))
+  (func (export "ef4") (result i32) (i32.const 4))
   (table $t0 30 30 funcref)
   (table $t1 30 30 funcref)
   (elem (table $t1) (i32.const 2) func 3 1 4 1)
@@ -1302,11 +1400,18 @@
 
 (module
   (type (func (result i32)))  ;; type #0
+  (;
   (import "a" "ef0" (func (result i32)))    ;; index 0
   (import "a" "ef1" (func (result i32)))
   (import "a" "ef2" (func (result i32)))
   (import "a" "ef3" (func (result i32)))
   (import "a" "ef4" (func (result i32)))    ;; index 4
+  ;)
+  (func (export "ef0") (result i32) (i32.const 0))
+  (func (export "ef1") (result i32) (i32.const 1))
+  (func (export "ef2") (result i32) (i32.const 2))
+  (func (export "ef3") (result i32) (i32.const 3))
+  (func (export "ef4") (result i32) (i32.const 4))
   (table $t0 30 30 funcref)
   (table $t1 30 30 funcref)
   (elem (table $t1) (i32.const 2) func 3 1 4 1)
@@ -1394,11 +1499,18 @@
 
 (module
   (type (func (result i32)))  ;; type #0
+  (;
   (import "a" "ef0" (func (result i32)))    ;; index 0
   (import "a" "ef1" (func (result i32)))
   (import "a" "ef2" (func (result i32)))
   (import "a" "ef3" (func (result i32)))
   (import "a" "ef4" (func (result i32)))    ;; index 4
+  ;)
+  (func (export "ef0") (result i32) (i32.const 0))
+  (func (export "ef1") (result i32) (i32.const 1))
+  (func (export "ef2") (result i32) (i32.const 2))
+  (func (export "ef3") (result i32) (i32.const 3))
+  (func (export "ef4") (result i32) (i32.const 4))
   (table $t0 30 30 funcref)
   (table $t1 30 30 funcref)
   (elem (table $t1) (i32.const 2) func 3 1 4 1)
@@ -1486,11 +1598,18 @@
 
 (module
   (type (func (result i32)))  ;; type #0
+  (;
   (import "a" "ef0" (func (result i32)))    ;; index 0
   (import "a" "ef1" (func (result i32)))
   (import "a" "ef2" (func (result i32)))
   (import "a" "ef3" (func (result i32)))
   (import "a" "ef4" (func (result i32)))    ;; index 4
+  ;)
+  (func (export "ef0") (result i32) (i32.const 0))
+  (func (export "ef1") (result i32) (i32.const 1))
+  (func (export "ef2") (result i32) (i32.const 2))
+  (func (export "ef3") (result i32) (i32.const 3))
+  (func (export "ef4") (result i32) (i32.const 4))
   (table $t0 30 30 funcref)
   (table $t1 30 30 funcref)
   (elem (table $t1) (i32.const 2) func 3 1 4 1)
@@ -1578,11 +1697,18 @@
 
 (module
   (type (func (result i32)))  ;; type #0
+  (;
   (import "a" "ef0" (func (result i32)))    ;; index 0
   (import "a" "ef1" (func (result i32)))
   (import "a" "ef2" (func (result i32)))
   (import "a" "ef3" (func (result i32)))
   (import "a" "ef4" (func (result i32)))    ;; index 4
+  ;)
+  (func (export "ef0") (result i32) (i32.const 0))
+  (func (export "ef1") (result i32) (i32.const 1))
+  (func (export "ef2") (result i32) (i32.const 2))
+  (func (export "ef3") (result i32) (i32.const 3))
+  (func (export "ef4") (result i32) (i32.const 4))
   (table $t0 30 30 funcref)
   (table $t1 30 30 funcref)
   (elem (table $t1) (i32.const 2) func 3 1 4 1)
diff --git a/test/core/table_init.wast b/test/core/table_init.wast
index 0b2d26f7..f70a7756 100644
--- a/test/core/table_init.wast
+++ b/test/core/table_init.wast
@@ -14,11 +14,18 @@
 
 (module
   (type (func (result i32)))  ;; type #0
+  (;
   (import "a" "ef0" (func (result i32)))    ;; index 0
   (import "a" "ef1" (func (result i32)))
   (import "a" "ef2" (func (result i32)))
   (import "a" "ef3" (func (result i32)))
   (import "a" "ef4" (func (result i32)))    ;; index 4
+  ;)
+  (func (export "ef0") (result i32) (i32.const 0))
+  (func (export "ef1") (result i32) (i32.const 1))
+  (func (export "ef2") (result i32) (i32.const 2))
+  (func (export "ef3") (result i32) (i32.const 3))
+  (func (export "ef4") (result i32) (i32.const 4))
   (table $t0 30 30 funcref)
   (table $t1 30 30 funcref)
   (elem (table $t0) (i32.const 2) func 3 1 4 1)
@@ -72,11 +79,18 @@
 
 (module
   (type (func (result i32)))  ;; type #0
+  (;
   (import "a" "ef0" (func (result i32)))    ;; index 0
   (import "a" "ef1" (func (result i32)))
   (import "a" "ef2" (func (result i32)))
   (import "a" "ef3" (func (result i32)))
   (import "a" "ef4" (func (result i32)))    ;; index 4
+  ;)
+  (func (export "ef0") (result i32) (i32.const 0))
+  (func (export "ef1") (result i32) (i32.const 1))
+  (func (export "ef2") (result i32) (i32.const 2))
+  (func (export "ef3") (result i32) (i32.const 3))
+  (func (export "ef4") (result i32) (i32.const 4))
   (table $t0 30 30 funcref)
   (table $t1 30 30 funcref)
   (elem (table $t0) (i32.const 2) func 3 1 4 1)
@@ -130,11 +144,18 @@
 
 (module
   (type (func (result i32)))  ;; type #0
+  (;
   (import "a" "ef0" (func (result i32)))    ;; index 0
   (import "a" "ef1" (func (result i32)))
   (import "a" "ef2" (func (result i32)))
   (import "a" "ef3" (func (result i32)))
   (import "a" "ef4" (func (result i32)))    ;; index 4
+  ;)
+  (func (export "ef0") (result i32) (i32.const 0))
+  (func (export "ef1") (result i32) (i32.const 1))
+  (func (export "ef2") (result i32) (i32.const 2))
+  (func (export "ef3") (result i32) (i32.const 3))
+  (func (export "ef4") (result i32) (i32.const 4))
   (table $t0 30 30 funcref)
   (table $t1 30 30 funcref)
   (elem (table $t0) (i32.const 2) func 3 1 4 1)
@@ -196,11 +217,18 @@
 
 (module
   (type (func (result i32)))  ;; type #0
+  (;
   (import "a" "ef0" (func (result i32)))    ;; index 0
   (import "a" "ef1" (func (result i32)))
   (import "a" "ef2" (func (result i32)))
   (import "a" "ef3" (func (result i32)))
   (import "a" "ef4" (func (result i32)))    ;; index 4
+  ;)
+  (func (export "ef0") (result i32) (i32.const 0))
+  (func (export "ef1") (result i32) (i32.const 1))
+  (func (export "ef2") (result i32) (i32.const 2))
+  (func (export "ef3") (result i32) (i32.const 3))
+  (func (export "ef4") (result i32) (i32.const 4))
   (table $t0 30 30 funcref)
   (table $t1 30 30 funcref)
   (elem (table $t1) (i32.const 2) func 3 1 4 1)
@@ -254,11 +282,18 @@
 
 (module
   (type (func (result i32)))  ;; type #0
+  (;
   (import "a" "ef0" (func (result i32)))    ;; index 0
   (import "a" "ef1" (func (result i32)))
   (import "a" "ef2" (func (result i32)))
   (import "a" "ef3" (func (result i32)))
   (import "a" "ef4" (func (result i32)))    ;; index 4
+  ;)
+  (func (export "ef0") (result i32) (i32.const 0))
+  (func (export "ef1") (result i32) (i32.const 1))
+  (func (export "ef2") (result i32) (i32.const 2))
+  (func (export "ef3") (result i32) (i32.const 3))
+  (func (export "ef4") (result i32) (i32.const 4))
   (table $t0 30 30 funcref)
   (table $t1 30 30 funcref)
   (elem (table $t1) (i32.const 2) func 3 1 4 1)
@@ -312,11 +347,18 @@
 
 (module
   (type (func (result i32)))  ;; type #0
+  (;
   (import "a" "ef0" (func (result i32)))    ;; index 0
   (import "a" "ef1" (func (result i32)))
   (import "a" "ef2" (func (result i32)))
   (import "a" "ef3" (func (result i32)))
   (import "a" "ef4" (func (result i32)))    ;; index 4
+  ;)
+  (func (export "ef0") (result i32) (i32.const 0))
+  (func (export "ef1") (result i32) (i32.const 1))
+  (func (export "ef2") (result i32) (i32.const 2))
+  (func (export "ef3") (result i32) (i32.const 3))
+  (func (export "ef4") (result i32) (i32.const 4))
   (table $t0 30 30 funcref)
   (table $t1 30 30 funcref)
   (elem (table $t1) (i32.const 2) func 3 1 4 1)