Merge branch 'main' into resolve

Author: fgmccabe

document/js-api/index.bs

@@ -1171,7 +1171,7 @@ This slot holds a [=function address=] relative to the [=surrounding agent=]'s [
     1. Let |args| be the result of [=coerce JavaScript arguments|coercing arguments=] (|functype|,|argValues|).
     1. Let (|store|, |ret|) be the result of [=func_invoke=](|store|, |funcaddr|, |args|).
     1. Set the [=surrounding agent=]'s [=associated store=] to |store|.
-    1. If |ret| is [=error=], throw an exception. This exception should be a WebAssembly {{RuntimeError}} exception, unless otherwise indicated by <a href="#errors">the WebAssembly error mapping</a>.
+    1. If |ret| is [=error=], throw an exception. This exception must be a WebAssembly {{RuntimeError}} exception, unless otherwise indicated by <a href="#errors">the WebAssembly error mapping</a>.
     1. If |ret| is [=THROW=] [=ref.exn=] |exnaddr|, then:
         1. Let |tagaddr| be [=exn_tag=](|store|, |exnaddr|).
         1. Let |payload| be [=exn_read=](|store|, |exnaddr|).
@@ -1438,7 +1438,7 @@ interface Suspending {
     1. Add an entry mapping |ec| to [=active=] in |map|.
     1. Let (|store|, |result|) be the result of [=func_invoke=](|store|, |funcaddr|, |args|).
     1. Assert: If control reaches here, we have done waiting for suspended imports.
-    1. If the entry for |ec| in |map| is not [=active=] then throw a WebAssembly {{RuntimeError}} exception. Otherwise, remove the entry for |ec| from [=map=].
+    1. If the entry for |ec| in |map| is not [=active=] then throw a WebAssembly {{SuspendError}} exception. Otherwise, remove the entry for |ec| from [=map=].
     1. Set the [=surrounding agent=]'s [=associated store=] to |store|.
     1. If |result| is [=error=], throw a WebAssembly {{RuntimeError}} exception, unless otherwise indicated by <a href="#errors">the WebAssembly error mapping</a>.
     1. Otherwise, if |result| is of the form [=throw=] exnaddr,
@@ -1477,7 +1477,7 @@ To <dfn>create a suspending function</dfn> from a JavaScript function |func|, wi
         1. Let |async_context| be the [=surrounding agent=]'s [=running execution context=].
         1. Let |map| be the [=surrounding agent=]'s associated [=Execution Context Status map=].
         1. If the entry for |async_context| in |map| is not [=active=], then:
-            1. Perform [=throw a JavaScript exception=] with a {{RuntimeError}} exception.
+            1. Perform [=throw a JavaScript exception=] with a {{SuspendError}} exception.
         1. [=Prepare to run script=] with |relevant settings|.
         1. [=Prepare to run a callback=] with |stored settings|.
         1. Let [|parameters|] → [|resultTypes|] be |functype|.
@@ -1812,19 +1812,19 @@ To <dfn>get the JavaScript exception tag</dfn>, perform the following steps:
 
 <h3 id="error-objects">Error Objects</h3>
 
-WebAssembly defines the following Error classes: <dfn exception>CompileError</dfn>, <dfn exception>LinkError</dfn>, and <dfn exception>RuntimeError</dfn>.
+WebAssembly defines the following Error classes: <dfn exception>CompileError</dfn>, <dfn exception>LinkError</dfn>, <dfn exception>RuntimeError</dfn>, and <dfn exception>SuspendError</dfn>.
 
 <div algorithm="create the WebAssembly namespace object">
 When the [=namespace object=] for the {{WebAssembly}} namespace is [=create a namespace object|created=], the following steps must be run:
 
 1.  Let |namespaceObject| be the [=namespace object=].
-1.  [=list/iterate|For each=] |error| of « "CompileError", "LinkError", "RuntimeError" »,
+1.  [=list/iterate|For each=] |error| of « "CompileError", "LinkError", "RuntimeError", "SuspendError" »,
     1.  Let |constructor| be a new object, implementing the [=NativeError Object Structure=], with <var ignore>NativeError</var> set to |error|.
     1.  [=!=] [$DefineMethodProperty$](|namespaceObject|, |error|,  |constructor|, false).
 
 </div>
 
-Note: This defines {{CompileError}}, {{LinkError}}, and {{RuntimeError}} classes on the {{WebAssembly}} namespace, which are produced by the APIs defined in this specification.
+Note: This defines {{CompileError}}, {{LinkError}}, {{RuntimeError}}, and {{SuspendError}} classes on the {{WebAssembly}} namespace, which are produced by the APIs defined in this specification.
 They expose the same interface as native JavaScript errors like {{TypeError}} and {{RangeError}}.
 
 Note: It is not currently possible to define this behavior using Web IDL.

test/js-api/js-promise-integration/js-promise-integration.any.js

@@ -1,14 +1,6 @@
 // META: global=jsshell
 // META: script=/wasm/jsapi/wasm-module-builder.js
 
-function Promising(wasm_export) {
-  return WebAssembly.promising(wasm_export);
-}
-
-function Suspending(jsFun){
-  return new WebAssembly.Suspending(jsFun);
-}
-
 // Test for invalid wrappers
 test(() => {
   assert_throws(TypeError, () => WebAssembly.promising({}),
@@ -52,9 +44,9 @@ promise_test(async () => {
           kExprLocalGet, 0,
           kExprCallFunction, import_index, // suspend
       ]).exportFunc();
-  let js_import = Suspending(() => Promise.resolve(42));
+  let js_import = WebAssembly.Suspending(() => Promise.resolve(42));
   let instance = builder.instantiate({m: {import: js_import}});
-  let wrapped_export = Promising(instance.exports.test);
+  let wrapped_export = WebAssembly.promising(instance.exports.test);
   let export_promise = wrapped_export();
   assert_true(export_promise instanceof Promise);
   assert_equals(await export_promise, 42);
@@ -91,9 +83,9 @@ promise_test(async () => {
   function js_import() {
     return Promise.resolve(++i);
   };
-  let wasm_js_import = Suspending(js_import);
+  let wasm_js_import = WebAssembly.Suspending(js_import);
   let instance = builder.instantiate({m: {import: wasm_js_import}});
-  let wrapped_export = Promising(instance.exports.test);
+  let wrapped_export = WebAssembly.promising(instance.exports.test);
   let export_promise = wrapped_export();
   assert_equals(instance.exports.g.value, 0);
   assert_true(export_promise instanceof Promise);
@@ -154,11 +146,11 @@ promise_test(async () => {
           kExprCallFunction, import42_index, // suspend?
           kExprCallFunction, importSetA_index
       ]).exportFunc();
-  let import42 = Suspending(()=>Promise.resolve(42));
+  let import42 = WebAssembly.Suspending(()=>Promise.resolve(42));
   let instance = builder.instantiate({m: {import42: import42,
     setA:AbeforeB.setA}});
 
-  let wrapped_export = Promising(instance.exports.test);
+  let wrapped_export = WebAssembly.promising(instance.exports.test);
 
 //  AbeforeB.showAbeforeB();
   let exported_promise = wrapped_export();
@@ -183,11 +175,11 @@ promise_test(async () => {
           kExprCallFunction, import42_index, // suspend?
           kExprCallFunction, importSetA_index
       ]).exportFunc();
-  let import42 = Suspending(()=>42);
+  let import42 = WebAssembly.Suspending(()=>42);
   let instance = builder.instantiate({m: {import42: import42,
     setA:AbeforeB.setA}});
 
-  let wrapped_export = Promising(instance.exports.test);
+  let wrapped_export = WebAssembly.promising(instance.exports.test);
 
   let exported_promise = wrapped_export();
   AbeforeB.setB();
@@ -213,10 +205,10 @@ test(t => {
   function js_import() {
     return Promise.resolve();
   };
-  let wasm_js_import = Suspending(js_import);
+  let wasm_js_import = WebAssembly.Suspending(js_import);
 
   let instance = builder.instantiate({m: {import: wasm_js_import, tag: tag}});
-  let wrapped_export = Promising(instance.exports.test);
+  let wrapped_export = WebAssembly.promising(instance.exports.test);
   let export_promise = wrapped_export();
   assert_true(export_promise instanceof Promise);
   promise_rejects(t, new WebAssembly.Exception(tag, []), export_promise);
@@ -239,10 +231,10 @@ promise_test(async (t) => {
   function js_import() {
     return Promise.reject(new WebAssembly.Exception(tag, [42]));
   };
-  let wasm_js_import = Suspending(js_import);
+  let wasm_js_import = WebAssembly.Suspending(js_import);
 
   let instance = builder.instantiate({m: {import: wasm_js_import, tag: tag}});
-  let wrapped_export = Promising(instance.exports.test);
+  let wrapped_export = WebAssembly.promising(instance.exports.test);
   let export_promise = wrapped_export();
   assert_true(export_promise instanceof Promise);
   assert_equals(await export_promise, 42);
@@ -273,14 +265,14 @@ async function TestNestedSuspenders(suspend) {
           kExprCallFunction, inner_index
       ]).exportFunc();
 
-  let inner = Suspending(() => suspend ? Promise.resolve(42) : 43);
+  let inner = WebAssembly.Suspending(() => suspend ? Promise.resolve(42) : 43);
 
   let export_inner;
-  let outer = Suspending(() => export_inner());
+  let outer = WebAssembly.Suspending(() => export_inner());
 
   let instance = builder.instantiate({m: {inner, outer}});
-  export_inner = Promising(instance.exports.inner);
-  let export_outer = Promising(instance.exports.outer);
+  export_inner = WebAssembly.promising(instance.exports.inner);
+  let export_outer = WebAssembly.promising(instance.exports.outer);
   let result = export_outer();
   assert_true(result instanceof Promise);
   if(suspend)
@@ -310,11 +302,11 @@ test(() => {
       .addBody([
           kExprLocalGet, 0
       ]).exportFunc();
-  let js_import = Suspending(() => Promise.resolve(42));
+  let js_import = WebAssembly.Suspending(() => Promise.resolve(42));
   let instance = builder.instantiate({m: {import: js_import}});
-  let suspender = Promising(instance.exports.return_suspender)();
+  let suspender = WebAssembly.promising(instance.exports.return_suspender)();
   for (s of [suspender, null, undefined, {}]) {
-    assert_throws(WebAssembly.RuntimeError, () => instance.exports.test(s));
+    assert_throws(WebAssembly.SuspendError, () => instance.exports.test(s));
   }
 }, "Call import with an invalid suspender");
 
@@ -438,8 +430,7 @@ promise_test(async (t) => {
         }});
   // export1 (promising)
   let wrapper = WebAssembly.promising(instance.exports.export1);
-  promise_rejects(t, new WebAssembly.RuntimeError(), wrapper(),
-      /trying to suspend JS frames/);
+  promise_rejects(t, new WebAssembly.SuspendError(), wrapper());
 });
 
 promise_test(async () => {
@@ -465,3 +456,31 @@ promise_test(async () => {
   let wrapped_export = WebAssembly.promising(instance2.exports.main);
   assert_equals(await wrapped_export(), 3);
 });
+
+test(() => {
+  let builder = new WasmModuleBuilder();
+  let js_tag = builder.addImportedTag("", "tag", kSig_v_r);
+  try_sig_index = builder.addType(kSig_i_v);
+
+  let promise42 = new WebAssembly.Suspending(() => Promise.resolve(42));
+  let kPromise42Ref = builder.addImport("", "promise42", kSig_i_v);
+
+  builder.addFunction("test", kSig_i_v)
+    .addBody([
+      kExprTry, try_sig_index,
+        kExprCallFunction, kPromise42Ref,
+        kExprReturn,  // If there was no trap or exception, return
+      kExprCatch, js_tag,
+        kExprI32Const, 43,
+        kExprReturn,
+      kExprEnd,
+    ])
+    .exportFunc();
+
+  let instance = builder.instantiate({"": {
+      promise42: promise42,
+      tag: WebAssembly.JSTag,
+  }});
+
+  assert_equals(43, instance.exports.test());
+},"catch the bad suspension");