Changeset 211410 in webkit

Timestamp:

Jan 30, 2017 11:21:43 PM (7 years ago)

Author:

Yusuke Suzuki

Message:

[JSC] Do not reject WebAssembly.compile() with Exception
​https://bugs.webkit.org/show_bug.cgi?id=167585

Reviewed by Mark Lam.

JSTests:

• wasm/js-api/Module-compile.js:

(async.testPromiseAPI):

Source/JavaScriptCore:

We accidentally reject the promise with Exception instead of Exception::value()
for the result of WebAssembly::compile().

• wasm/JSWebAssembly.cpp:

(JSC::webAssemblyCompileFunc):

Location:

trunk

Files:

• JSTests/ChangeLog (modified) (1 diff)
• JSTests/wasm/js-api/Module-compile.js (modified) (1 diff)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/wasm/JSWebAssembly.cpp (modified) (1 diff)

trunk/JSTests/ChangeLog

@@ +1 @@
+2017-01-30  Yusuke Suzuki  <utatane.tea@gmail.com>
+
+        [JSC] Do not reject WebAssembly.compile() with Exception
+        https://bugs.webkit.org/show_bug.cgi?id=167585
+
+        Reviewed by Mark Lam.
+
+        * wasm/js-api/Module-compile.js:
+        (async.testPromiseAPI):
+
 2017-01-27  Yusuke Suzuki  <utatane.tea@gmail.com>
 

trunk/JSTests/wasm/js-api/Module-compile.js

@@ -22 +22 @@
             assert.truthy(e instanceof WebAssembly.CompileError);
             assert.truthy(e.message === "WebAssembly.Module doesn't parse at byte 34 / 43: Memory section cannot exist if an Import has a memory (evaluating 'WebAssembly.compile(builder.WebAssembly().get())')");
+        }
+        assert.truthy(threw);
+    }
+
+    {
+        let threw = false;
+        try {
+            await WebAssembly.compile();
+        } catch(e) {
+            threw = true;
+            assert.truthy(e instanceof TypeError);
+            assert.eq(e.message, "first argument must be an ArrayBufferView or an ArrayBuffer (evaluating 'WebAssembly.compile()')");
         }
         assert.truthy(threw);

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2017-01-30  Yusuke Suzuki  <utatane.tea@gmail.com>
+
+        [JSC] Do not reject WebAssembly.compile() with Exception
+        https://bugs.webkit.org/show_bug.cgi?id=167585
+
+        Reviewed by Mark Lam.
+
+        We accidentally reject the promise with Exception instead of Exception::value()
+        for the result of WebAssembly::compile().
+
+        * wasm/JSWebAssembly.cpp:
+        (JSC::webAssemblyCompileFunc):
+
 2017-01-30  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/JavaScriptCore/wasm/JSWebAssembly.cpp

@@ -57 +57 @@
     if (Exception* exception = catchScope.exception()) {
         catchScope.clearException();
-        promise->reject(exec, exception);
+        promise->reject(exec, exception->value());
         return JSValue::encode(promise->promise());
     }