Merge remote-tracking branch 'upstream/master'

Author: rossberg

document/core/exec/modules.rst

@@ -1,7 +1,7 @@
 Modules
 -------
 
-For modules, the execution semantics primarily defines :ref:`instantiation <exec-instantiation>`, which :ref:`allocates <alloc>` instances for a module and its contained definitions, inititializes :ref:`tables <syntax-table>` and :ref:`memories <syntax-mem>` from contained :ref:`element <syntax-elem>` and :ref:`data <syntax-data>` segments, and invokes the :ref:`start function <syntax-start>` if present. It also includes :ref:`invocation <exec-invocation>` of exported functions.
+For modules, the execution semantics primarily defines :ref:`instantiation <exec-instantiation>`, which :ref:`allocates <alloc>` instances for a module and its contained definitions, initializes :ref:`tables <syntax-table>` and :ref:`memories <syntax-mem>` from contained :ref:`element <syntax-elem>` and :ref:`data <syntax-data>` segments, and invokes the :ref:`start function <syntax-start>` if present. It also includes :ref:`invocation <exec-invocation>` of exported functions.
 
 Instantiation depends on a number of auxiliary notions for :ref:`type-checking imports <exec-import>` and :ref:`allocating <alloc>` instances.
 

interpreter/exec/eval.ml

@@ -157,7 +157,7 @@ let rec step (c : config) : config =
         vs', [Plain (Br (Lib.List32.nth xs i)) @@ e.at]
 
       | Return, vs ->
-        vs, [Returning vs @@ e.at]
+        [], [Returning vs @@ e.at]
 
       | Call x, vs ->
         vs, [Invoke (func frame.inst x) @@ e.at]

test/README.md

@@ -1,4 +1,4 @@
-This directory contains the WebAssembly test suite. It is split into two
+This directory contains the WebAssembly test suite. It is split into three
 directories:
 
 * [`core/`](core/), tests for the core semantics

test/core/call_indirect.wast

@@ -938,5 +938,5 @@
 
 (assert_invalid
   (module (table funcref (elem 0 0)))
-  "unknown function 0"
+  "unknown function"
 )

test/core/data.wast

@@ -283,7 +283,7 @@
   (module
     (data (i32.const 0) "")
   )
-  "unknown memory 0"
+  "unknown memory"
 )
 
 ;; Invalid offsets

test/core/elem.wast

@@ -249,7 +249,7 @@
     (func $f)
     (elem (i32.const 0) $f)
   )
-  "unknown table 0"
+  "unknown table"
 )
 
 ;; Invalid offsets

test/core/i32.wast

@@ -62,6 +62,7 @@
 (assert_trap (invoke "div_s" (i32.const 1) (i32.const 0)) "integer divide by zero")
 (assert_trap (invoke "div_s" (i32.const 0) (i32.const 0)) "integer divide by zero")
 (assert_trap (invoke "div_s" (i32.const 0x80000000) (i32.const -1)) "integer overflow")
+(assert_trap (invoke "div_s" (i32.const 0x80000000) (i32.const 0)) "integer divide by zero")
 (assert_return (invoke "div_s" (i32.const 1) (i32.const 1)) (i32.const 1))
 (assert_return (invoke "div_s" (i32.const 0) (i32.const 1)) (i32.const 0))
 (assert_return (invoke "div_s" (i32.const 0) (i32.const -1)) (i32.const 0))

test/core/i64.wast

@@ -62,6 +62,7 @@
 (assert_trap (invoke "div_s" (i64.const 1) (i64.const 0)) "integer divide by zero")
 (assert_trap (invoke "div_s" (i64.const 0) (i64.const 0)) "integer divide by zero")
 (assert_trap (invoke "div_s" (i64.const 0x8000000000000000) (i64.const -1)) "integer overflow")
+(assert_trap (invoke "div_s" (i64.const 0x8000000000000000) (i64.const 0)) "integer divide by zero")
 (assert_return (invoke "div_s" (i64.const 1) (i64.const 1)) (i64.const 1))
 (assert_return (invoke "div_s" (i64.const 0) (i64.const 1)) (i64.const 0))
 (assert_return (invoke "div_s" (i64.const 0) (i64.const -1)) (i64.const 0))

test/core/if.wast

@@ -892,42 +892,42 @@
 
 
 (assert_malformed
-  (module quote "(func if end $l)")
+  (module quote "(func i32.const 0 if end $l)")
   "mismatching label"
 )
 (assert_malformed
-  (module quote "(func if $a end $l)")
+  (module quote "(func i32.const 0 if $a end $l)")
   "mismatching label"
 )
 (assert_malformed
-  (module quote "(func if else $l end)")
+  (module quote "(func i32.const 0 if else $l end)")
   "mismatching label"
 )
 (assert_malformed
-  (module quote "(func if $a else $l end)")
+  (module quote "(func i32.const 0 if $a else $l end)")
   "mismatching label"
 )
 (assert_malformed
-  (module quote "(func if else end $l)")
+  (module quote "(func i32.const 0 if else end $l)")
   "mismatching label"
 )
 (assert_malformed
-  (module quote "(func if else $l end $l)")
+  (module quote "(func i32.const 0 if else $l end $l)")
   "mismatching label"
 )
 (assert_malformed
-  (module quote "(func if else $l1 end $l2)")
+  (module quote "(func i32.const 0 if else $l1 end $l2)")
   "mismatching label"
 )
 (assert_malformed
-  (module quote "(func if $a else end $l)")
+  (module quote "(func i32.const 0 if $a else end $l)")
   "mismatching label"
 )
 (assert_malformed
-  (module quote "(func if $a else $a end $l)")
+  (module quote "(func i32.const 0 if $a else $a end $l)")
   "mismatching label"
 )
 (assert_malformed
-  (module quote "(func if $a else $l end $l)")
+  (module quote "(func i32.const 0 if $a else $l end $l)")
   "mismatching label"
-)
+)

test/core/names.wast

@@ -603,6 +603,13 @@
 
   ;; Test an unusual character.
   (func (export "ꙮ") (result i32) (i32.const 475))
+
+  ;; Test the three characters whose normalization forms under NFC, NFD, NFKC,
+  ;; and NFKD are all different.
+  ;; http://unicode.org/faq/normalization.html#6
+  (func (export "ϓ") (result i32) (i32.const 476))
+  (func (export "ϔ") (result i32) (i32.const 477))
+  (func (export "ẛ") (result i32) (i32.const 478))
 )
 
 (assert_return (invoke "") (i32.const 0))
@@ -1081,6 +1088,9 @@
 (assert_return (invoke "〇") (i32.const 473))
 (assert_return (invoke "๛") (i32.const 474))
 (assert_return (invoke "ꙮ") (i32.const 475))
+(assert_return (invoke "ϓ") (i32.const 476))
+(assert_return (invoke "ϔ") (i32.const 477))
+(assert_return (invoke "ẛ") (i32.const 478))
 
 (module
   ;; Test that we can use indices instead of names to reference imports,

test/core/unreachable.wast

@@ -107,6 +107,9 @@
   (func (export "as-if-else") (param i32 i32) (result i32)
     (if (result i32) (local.get 0) (then (local.get 1)) (else (unreachable)))
   )
+  (func (export "as-if-then-no-else") (param i32 i32) (result i32)
+    (if (local.get 0) (then (unreachable))) (local.get 1)
+  )
 
   (func (export "as-select-first") (param i32 i32) (result i32)
     (select (unreachable) (local.get 0) (local.get 1))
@@ -255,6 +258,8 @@
 (assert_return (invoke "as-if-then" (i32.const 0) (i32.const 6)) (i32.const 6))
 (assert_trap (invoke "as-if-else" (i32.const 0) (i32.const 6)) "unreachable")
 (assert_return (invoke "as-if-else" (i32.const 1) (i32.const 6)) (i32.const 6))
+(assert_trap (invoke "as-if-then-no-else" (i32.const 1) (i32.const 6)) "unreachable")
+(assert_return (invoke "as-if-then-no-else" (i32.const 0) (i32.const 6)) (i32.const 6))
 
 (assert_trap (invoke "as-select-first" (i32.const 0) (i32.const 6)) "unreachable")
 (assert_trap (invoke "as-select-first" (i32.const 1) (i32.const 6)) "unreachable")