Update tests from spec repo

Test/spec/utf8-invalid-encoding.wast

+(assert_malformed (module quote "(func (export \"\\00\\00\\fe\\ff\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\8f\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\90\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\9f\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\a0\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\bf\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\c0\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\c0\\bf\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\c1\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\c1\\bf\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\c2\\00\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\c2\\2e\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\c2\\7f\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\c2\\80\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\c2\\c0\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\c2\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\c2\\fd\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\df\\00\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\df\\7f\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\df\\c0\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\df\\fd\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\e0\\00\\a0\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\e0\\7f\\a0\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\e0\\80\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\e0\\80\\a0\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\e0\\9f\\a0\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\e0\\9f\\bf\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\e0\\a0\\00\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\e0\\a0\\7f\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\e0\\a0\\c0\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\e0\\a0\\fd\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\e0\\c0\\a0\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\e0\\fd\\a0\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\e1\\00\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\e1\\2e\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\e1\\7f\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\e1\\80\\00\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\e1\\80\\2e\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\e1\\80\\7f\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\e1\\80\\80\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\e1\\80\\c0\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\e1\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\e1\\80\\fd\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\e1\\c0\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\e1\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\e1\\fd\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\ec\\00\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\ec\\7f\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\ec\\80\\00\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\ec\\80\\7f\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\ec\\80\\c0\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\ec\\80\\fd\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\ec\\c0\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\ec\\fd\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\ed\\00\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\ed\\7f\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\ed\\80\\00\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\ed\\80\\7f\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\ed\\80\\c0\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\ed\\80\\fd\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\ed\\a0\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\ed\\a0\\bf\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\ed\\bf\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\ed\\bf\\bf\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\ed\\c0\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\ed\\fd\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\ee\\00\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\ee\\7f\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\ee\\80\\00\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\ee\\80\\7f\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\ee\\80\\c0\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\ee\\80\\fd\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\ee\\c0\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\ee\\fd\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\ef\\00\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\ef\\7f\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\ef\\80\\00\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\ef\\80\\7f\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\ef\\80\\c0\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\ef\\80\\fd\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\ef\\c0\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\ef\\fd\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f0\\00\\90\\90\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f0\\7f\\90\\90\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f0\\80\\80\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f0\\80\\90\\90\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f0\\8f\\90\\90\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f0\\8f\\bf\\bf\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f0\\90\\00\\90\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f0\\90\\7f\\90\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f0\\90\\90\\00\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f0\\90\\90\\7f\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f0\\90\\90\\c0\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f0\\90\\90\\fd\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f0\\90\\c0\\90\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f0\\90\\fd\\90\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f0\\c0\\90\\90\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f0\\fd\\90\\90\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f1\\00\\80\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f1\\23\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f1\\7f\\80\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f1\\80\\00\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f1\\80\\23\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f1\\80\\7f\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f1\\80\\80\\00\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f1\\80\\80\\23\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f1\\80\\80\\7f\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f1\\80\\80\\80\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f1\\80\\80\\c0\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f1\\80\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f1\\80\\80\\fd\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f1\\80\\c0\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f1\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f1\\80\\fd\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f1\\c0\\80\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f1\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f1\\fd\\80\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f3\\00\\80\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f3\\7f\\80\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f3\\80\\00\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f3\\80\\7f\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f3\\80\\80\\00\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f3\\80\\80\\7f\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f3\\80\\80\\c0\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f3\\80\\80\\fd\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f3\\80\\c0\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f3\\80\\fd\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f3\\c0\\80\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f3\\fd\\80\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f4\\00\\80\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f4\\7f\\80\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f4\\80\\00\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f4\\80\\7f\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f4\\80\\80\\00\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f4\\80\\80\\7f\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f4\\80\\80\\c0\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f4\\80\\80\\fd\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f4\\80\\c0\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f4\\80\\fd\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f4\\90\\80\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f4\\bf\\80\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f4\\c0\\80\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f4\\fd\\80\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f5\\80\\80\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f7\\80\\80\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f7\\bf\\bf\\bf\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f8\\23\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f8\\80\\23\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f8\\80\\80\\23\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f8\\80\\80\\80\\23\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f8\\80\\80\\80\\80\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f8\\80\\80\\80\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f8\\80\\80\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f8\\80\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f8\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\f8\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\fb\\bf\\bf\\bf\\bf\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\fc\\23\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\fc\\80\\23\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\fc\\80\\80\\23\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\fc\\80\\80\\80\\23\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\fc\\80\\80\\80\\80\\23\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\fc\\80\\80\\80\\80\\80\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\fc\\80\\80\\80\\80\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\fc\\80\\80\\80\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\fc\\80\\80\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\fc\\80\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\fc\\80\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\fc\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\fd\\bf\\bf\\bf\\bf\\bf\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\fe\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\fe\\ff\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\ff\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\ff\\fe\\00\\00\"))") "invalid UTF-8 encoding")
+(assert_malformed (module quote "(func (export \"\\ff\\fe\"))") "invalid UTF-8 encoding")

libraries/wasm-jit/Test/spec/CMakeLists.txt

@@ -71,6 +71,7 @@ add_test(typecheck ${TEST_BIN} ${CMAKE_CURRENT_LIST_DIR}/typecheck.wast)
 add_test(unreachable ${TEST_BIN} ${CMAKE_CURRENT_LIST_DIR}/unreachable.wast)
 add_test(unreached-invalid ${TEST_BIN} ${CMAKE_CURRENT_LIST_DIR}/unreached-invalid.wast)
 add_test(unwind ${TEST_BIN} ${CMAKE_CURRENT_LIST_DIR}/unwind.wast)
+add_test(utf8-invalid-encoding ${TEST_BIN} ${CMAKE_CURRENT_LIST_DIR}/utf8-invalid-encoding.wast)
 add_test(utf8-custom-section-id ${TEST_BIN} ${CMAKE_CURRENT_LIST_DIR}/utf8-custom-section-id.wast)
 add_test(utf8-import-field ${TEST_BIN} ${CMAKE_CURRENT_LIST_DIR}/utf8-import-field.wast)
 add_test(utf8-import-module ${TEST_BIN} ${CMAKE_CURRENT_LIST_DIR}/utf8-import-module.wast)

libraries/wasm-jit/Test/spec/imports.wast

@@ -106,92 +106,92 @@
 
 (assert_unlinkable
   (module (import "test" "func" (func (param i32))))
-  "type mismatch"
+  "incompatible import type"
 )
 (assert_unlinkable
   (module (import "test" "func" (func (result i32))))
-  "type mismatch"
+  "incompatible import type"
 )
 (assert_unlinkable
   (module (import "test" "func" (func (param i32) (result i32))))
-  "type mismatch"
+  "incompatible import type"
 )
 (assert_unlinkable
   (module (import "test" "func-i32" (func)))
-  "type mismatch"
+  "incompatible import type"
 )
 (assert_unlinkable
   (module (import "test" "func-i32" (func (result i32))))
-  "type mismatch"
+  "incompatible import type"
 )
 (assert_unlinkable
   (module (import "test" "func-i32" (func (param f32))))
-  "type mismatch"
+  "incompatible import type"
 )
 (assert_unlinkable
   (module (import "test" "func-i32" (func (param i64))))
-  "type mismatch"
+  "incompatible import type"
 )
 (assert_unlinkable
   (module (import "test" "func-i32" (func (param i32) (result i32))))
-  "type mismatch"
+  "incompatible import type"
 )
 (assert_unlinkable
   (module (import "test" "func->i32" (func)))
-  "type mismatch"
+  "incompatible import type"
 )
 (assert_unlinkable
   (module (import "test" "func->i32" (func (param i32))))
-  "type mismatch"
+  "incompatible import type"
 )
 (assert_unlinkable
   (module (import "test" "func->i32" (func (result f32))))
-  "type mismatch"
+  "incompatible import type"
 )
 (assert_unlinkable
   (module (import "test" "func->i32" (func (result i64))))
-  "type mismatch"
+  "incompatible import type"
 )
 (assert_unlinkable
   (module (import "test" "func->i32" (func (param i32) (result i32))))
-  "type mismatch"
+  "incompatible import type"
 )
 (assert_unlinkable
   (module (import "test" "func-i32->i32" (func)))
-  "type mismatch"
+  "incompatible import type"
 )
 (assert_unlinkable
   (module (import "test" "func-i32->i32" (func (param i32))))
-  "type mismatch"
+  "incompatible import type"
 )
 (assert_unlinkable
   (module (import "test" "func-i32->i32" (func (result i32))))
-  "type mismatch"
+  "incompatible import type"
 )
 
 (assert_unlinkable
   (module (import "test" "global-i32" (func (result i32))))
-  "type mismatch"
+  "incompatible import type"
 )
 (assert_unlinkable
   (module (import "test" "table-10-inf" (func)))
-  "type mismatch"
+  "incompatible import type"
 )
 (assert_unlinkable
   (module (import "test" "memory-2-inf" (func)))
-  "type mismatch"
+  "incompatible import type"
 )
 (assert_unlinkable
   (module (import "spectest" "global" (func)))
-  "type mismatch"
+  "incompatible import type"
 )
 (assert_unlinkable
   (module (import "spectest" "table" (func)))
-  "type mismatch"
+  "incompatible import type"
 )
 (assert_unlinkable
   (module (import "spectest" "memory" (func)))
-  "type mismatch"
+  "incompatible import type"
 )
 
 
@@ -234,27 +234,27 @@
 
 (assert_unlinkable
   (module (import "test" "func" (global i32)))
-  "type mismatch"
+  "incompatible import type"
 )
 (assert_unlinkable
   (module (import "test" "table-10-inf" (global i32)))
-  "type mismatch"
+  "incompatible import type"
 )
 (assert_unlinkable
   (module (import "test" "memory-2-inf" (global i32)))
-  "type mismatch"
+  "incompatible import type"
 )
 (assert_unlinkable
   (module (import "spectest" "print" (global i32)))
-  "type mismatch"
+  "incompatible import type"
 )
 (assert_unlinkable
   (module (import "spectest" "table" (global i32)))
-  "type mismatch"
+  "incompatible import type"
 )
 (assert_unlinkable
   (module (import "spectest" "memory" (global i32)))
-  "type mismatch"
+  "incompatible import type"
 )
 
 
@@ -330,36 +330,36 @@
 
 (assert_unlinkable
   (module (import "test" "table-10-inf" (table 12 anyfunc)))
-  "actual size smaller than declared"
+  "incompatible import type"
 )
 (assert_unlinkable
   (module (import "test" "table-10-inf" (table 10 20 anyfunc)))
-  "maximum size larger than declared"
+  "incompatible import type"
 )
 (assert_unlinkable
   (module (import "spectest" "table" (table 12 anyfunc)))
-  "actual size smaller than declared"
+  "incompatible import type"
 )
 (assert_unlinkable
   (module (import "spectest" "table" (table 10 15 anyfunc)))
-  "maximum size larger than declared"
+  "incompatible import type"
 )
 
 (assert_unlinkable
   (module (import "test" "func" (table 10 anyfunc)))
-  "type mismatch"
+  "incompatible import type"
 )
 (assert_unlinkable
   (module (import "test" "global-i32" (table 10 anyfunc)))
-  "type mismatch"
+  "incompatible import type"
 )
 (assert_unlinkable
   (module (import "test" "memory-2-inf" (table 10 anyfunc)))
-  "type mismatch"
+  "incompatible import type"
 )
 (assert_unlinkable
   (module (import "spectest" "print" (table 10 anyfunc)))
-  "type mismatch"
+  "incompatible import type"
 )
 
 
@@ -423,53 +423,53 @@
 
 (assert_unlinkable
   (module (import "test" "memory-2-inf" (memory 3)))
-  "actual size smaller than declared"
+  "incompatible import type"
 )
 (assert_unlinkable
   (module (import "test" "memory-2-inf" (memory 2 3)))
-  "maximum size larger than declared"
+  "incompatible import type"
 )
 (assert_unlinkable
   (module (import "spectest" "memory" (memory 2)))
-  "actual size smaller than declared"
+  "incompatible import type"
 )
 (assert_unlinkable
   (module (import "spectest" "memory" (memory 1 1)))
-  "maximum size larger than declared"
+  "incompatible import type"
 )
 
 (assert_unlinkable
   (module (import "test" "func-i32" (memory 1)))
-  "type mismatch"
+  "incompatible import type"
 )
 (assert_unlinkable
   (module (import "test" "global-i32" (memory 1)))
-  "type mismatch"
+  "incompatible import type"
 )
 (assert_unlinkable
   (module (import "test" "table-10-inf" (memory 1)))
-  "type mismatch"
+  "incompatible import type"
 )
 (assert_unlinkable
   (module (import "spectest" "print" (memory 1)))
-  "type mismatch"
+  "incompatible import type"
 )
 (assert_unlinkable
   (module (import "spectest" "global" (memory 1)))
-  "type mismatch"
+  "incompatible import type"
 )
 (assert_unlinkable
   (module (import "spectest" "table" (memory 1)))
-  "type mismatch"
+  "incompatible import type"
 )
 
 (assert_unlinkable
   (module (import "spectest" "memory" (memory 2)))
-  "actual size smaller than declared"
+  "incompatible import type"
 )
 (assert_unlinkable
   (module (import "spectest" "memory" (memory 1 1)))
-  "maximum size larger than declared"
+  "incompatible import type"
 )
 
 (module

libraries/wasm-jit/Test/spec/linking.wast

@@ -26,11 +26,11 @@
 (register "reexport_f")
 (assert_unlinkable
   (module (import "reexport_f" "print" (func (param i64))))
-  "type mismatch"
+  "incompatible import type"
 )
 (assert_unlinkable
   (module (import "reexport_f" "print" (func (param i32) (result i32))))
-  "type mismatch"
+  "incompatible import type"
 )
 
 
@@ -162,6 +162,14 @@
   (func $f)
 )
 
+(module $G1 (global (export "g") i32 (i32.const 5)))
+(register "G1" $G1)
+(module $G2
+  (global (import "G1" "g") i32)
+  (global (export "g") i32 (get_global 0))
+)
+(assert_return (get $G2 "g") (i32.const 5))
+
 (assert_unlinkable
   (module
     (table (import "Mt" "tab") 0 anyfunc)

libraries/wasm-jit/Test/spec/memory.wast

@@ -129,7 +129,7 @@
 
 (assert_invalid
   (module (memory 1 0))
-  "memory size minimum must not be greater than maximum"
+  "size minimum must not be greater than maximum"
 )
 (assert_invalid
   (module (memory 65537))

libraries/wasm-jit/Test/spec/unreached-invalid.wast

@@ -195,6 +195,18 @@
   ))
   "type mismatch"
 )
+(assert_invalid
+  (module (func $type-unary-num-vs-void-in-loop-after-unreachable
+    (unreachable) (loop (drop (i32.eqz (nop))))
+  ))
+  "type mismatch"
+)
+(assert_invalid
+  (module (func $type-unary-num-vs-void-in-i32-loop-after-unreachable
+    (unreachable) (loop (result i32) (i32.eqz (nop)))
+  ))
+  "type mismatch"
+)
 (assert_invalid
   (module (func $type-unary-num-vs-num-after-unreachable
     (unreachable) (drop (i32.eqz (f32.const 1)))
@@ -249,6 +261,24 @@
   ))
   "type mismatch"
 )
+(assert_invalid
+  (module (func $type-unary-num-vs-void-in-if-after-unreachable
+    (unreachable) (if (i32.const 0) (then (drop (i32.eqz (nop)))))
+  ))
+  "type mismatch"
+)
+(assert_invalid
+  (module (func $type-unary-num-vs-void-in-else-after-unreachable
+    (unreachable) (if (i32.const 0) (then (nop)) (else (drop (i32.eqz (nop)))))
+  ))
+  "type mismatch"
+)
+(assert_invalid
+  (module (func $type-unary-num-vs-void-in-else-after-unreachable-if
+    (if (i32.const 0) (then (unreachable)) (else (drop (i32.eqz (nop)))))
+  ))
+  "type mismatch"
+)
 
 (assert_invalid
   (module (func $type-unary-num-vs-void-after-nested-unreachable