Changeset 271039 in webkit

Timestamp:

Dec 21, 2020 1:31:23 PM (3 years ago)

Author:

commit-queue@webkit.org

Message:

Source/JavaScriptCore:
[JSC] Add minimum parameter to the WASM JS-API for Memory & Table.
​https://bugs.webkit.org/show_bug.cgi?id=219600

Patch by Jessica Tallon <​jtallon@igalia.com> on 2020-12-21
Reviewed by Yusuke Suzuki.

This patch adds a "minimum" perameter to the constructor of both WebAssembly.Memory and
WebAssembly.Table. This represents the same value as the "initial" perameter. The new
perameter name is outlined here [1]. It is part of the JS type reflection proposal.

[1]: ​https://github.com/WebAssembly/js-types/blob/master/proposals/js-types/Overview.md#naming-of-size-limits

• JSTests/wasm/js-api/table.js:
• JSTests/wasm/js-api/test_memory_constructor.js:
• Source/JavaScriptCore/wasm/js/WebAssemblyMemoryConstructor.cpp:
• Source/JavaScriptCore/wasm/js/WebAssemblyTableConstructor.cpp:

LayoutTests:
[JSC] Fix expectation for WASM JS-type reflection WPTs
​https://bugs.webkit.org/show_bug.cgi?id=219600

Patch by Jessica Tallon <​jtallon@igalia.com> on 2020-12-21
Reviewed by Yusuke Suzuki.

Changed the expectations for the WASM JS-Type reflections constructor
tests as we now support the minimum parameter.

• LayoutTests/imported/w3c/web-platform-tests/wasm/jsapi/memory/constructor-types.tentative.any-expected.txt:
• LayoutTests/imported/w3c/web-platform-tests/wasm/jsapi/table/constructor-types.tentative.any-expected.txt:
• LayoutTests/imported/w3c/web-platform-tests/wasm/jsapi/memory/constructor-types.tentative.any.worker-expected.txt:
• LayoutTests/imported/w3c/web-platform-tests/wasm/jsapi/table/constructor-types.tentative.any.worker-expected.txt:

Location:

trunk

Files:

• JSTests/wasm/js-api/table.js (modified) (1 diff)
• JSTests/wasm/js-api/test_memory_constructor.js (modified) (1 diff)
• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/wasm/jsapi/memory/constructor-types.tentative.any-expected.txt (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/wasm/jsapi/memory/constructor-types.tentative.any.worker-expected.txt (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/wasm/jsapi/table/constructor-types.tentative.any-expected.txt (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/wasm/jsapi/table/constructor-types.tentative.any.worker-expected.txt (modified) (1 diff)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/wasm/js/WebAssemblyMemoryConstructor.cpp (modified) (1 diff)
• Source/JavaScriptCore/wasm/js/WebAssemblyTableConstructor.cpp (modified) (1 diff)

trunk/JSTests/wasm/js-api/table.js

@@ -365 +365 @@
     assert.truthy(instance.exports.table instanceof WebAssembly.Table);
 }
+
+{
+    const args = {minimum: 5, element: "funcref"}
+    let minimum = false
+    const proxy = new Proxy(args, {
+        get(target, prop, receiver) {
+            if (prop === "minimum") {
+                minimum = true;
+            }
+            return Reflect.get(...arguments);
+        }
+    })
+    const table = new WebAssembly.Table(proxy);
+    assert.eq(table.length, 5);
+    assert.truthy(minimum);
+
+    let threw = false;
+    try {
+        new WebAssembly.Table({minimum: 5, initial: 5, element: "funcref"});
+    } catch (e) {
+        assert.truthy(e instanceof TypeError);
+        assert.eq(e.message, "WebAssembly.Table 'initial' and 'minimum' options are specified at the same time")
+        threw = true;
+    }
+    assert.truthy(threw);
+}

trunk/JSTests/wasm/js-api/test_memory_constructor.js

@@ -82 +82 @@
     assert(threw);
 }
+
+{
+    const args = {minimum: 5};
+    let minimum = false;
+    const proxy = new Proxy(args, {
+        get(target, prop, receiver) {
+            if (prop === "minimum") {
+                minimum = true;
+            }
+            return Reflect.get(...arguments);
+        }
+    })
+    const mem = new WebAssembly.Memory(proxy);
+    assert(mem.buffer.byteLength === 5 * pageSize);
+    assert(minimum);
+
+    let threw = false;
+    try {
+        new WebAssembly.Memory({minimum: 5, initial: 5});
+    } catch (e) {
+        assert(e instanceof TypeError);
+        assert(e.message === "WebAssembly.Memory 'initial' and 'minimum' options are specified at the same time");
+        threw = true;
+    }
+    assert(threw);
+}

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-12-21  Jessica Tallon  <jtallon@igalia.com>
+
+        [JSC] Fix expectation for WASM JS-type reflection WPTs
+        https://bugs.webkit.org/show_bug.cgi?id=219600
+
+        Reviewed by Yusuke Suzuki.
+
+        Changed the expectations for the WASM JS-Type reflections constructor
+        tests as we now support the minimum parameter.
+
+        * LayoutTests/imported/w3c/web-platform-tests/wasm/jsapi/memory/constructor-types.tentative.any-expected.txt:
+        * LayoutTests/imported/w3c/web-platform-tests/wasm/jsapi/table/constructor-types.tentative.any-expected.txt:
+        * LayoutTests/imported/w3c/web-platform-tests/wasm/jsapi/memory/constructor-types.tentative.any.worker-expected.txt:
+        * LayoutTests/imported/w3c/web-platform-tests/wasm/jsapi/table/constructor-types.tentative.any.worker-expected.txt:
+
 2020-12-21  Alicia Boya García  <aboya@igalia.com>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/wasm/jsapi/memory/constructor-types.tentative.any-expected.txt

@@ -1 +1 @@
 
-FAIL Initializing with both initial and minimum assert_throws_js: function "() => new WebAssembly.Memory(argument)" did not throw
-FAIL Zero minimum Expect an integer argument in the range: [0, 2^32 - 1]
-FAIL Non-zero minimum Expect an integer argument in the range: [0, 2^32 - 1]
+PASS Initializing with both initial and minimum
+PASS Zero minimum
+PASS Non-zero minimum
 

trunk/LayoutTests/imported/w3c/web-platform-tests/wasm/jsapi/memory/constructor-types.tentative.any.worker-expected.txt

@@ -1 +1 @@
 
-FAIL Initializing with both initial and minimum assert_throws_js: function "() => new WebAssembly.Memory(argument)" did not throw
-FAIL Zero minimum Expect an integer argument in the range: [0, 2^32 - 1]
-FAIL Non-zero minimum Expect an integer argument in the range: [0, 2^32 - 1]
+PASS Initializing with both initial and minimum
+PASS Zero minimum
+PASS Non-zero minimum
 

trunk/LayoutTests/imported/w3c/web-platform-tests/wasm/jsapi/table/constructor-types.tentative.any-expected.txt

@@ -1 +1 @@
 
-FAIL Initializing with both initial and minimum assert_throws_js: function "() => new WebAssembly.Table(argument)" did not throw
-FAIL Zero minimum Expect an integer argument in the range: [0, 2^32 - 1]
-FAIL Non-zero minimum Expect an integer argument in the range: [0, 2^32 - 1]
+PASS Initializing with both initial and minimum
+PASS Zero minimum
+PASS Non-zero minimum
 

trunk/LayoutTests/imported/w3c/web-platform-tests/wasm/jsapi/table/constructor-types.tentative.any.worker-expected.txt

@@ -1 +1 @@
 
-FAIL Initializing with both initial and minimum assert_throws_js: function "() => new WebAssembly.Table(argument)" did not throw
-FAIL Zero minimum Expect an integer argument in the range: [0, 2^32 - 1]
-FAIL Non-zero minimum Expect an integer argument in the range: [0, 2^32 - 1]
+PASS Initializing with both initial and minimum
+PASS Zero minimum
+PASS Non-zero minimum
 

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2020-12-21  Jessica Tallon  <jtallon@igalia.com>
+
+        [JSC] Add minimum parameter to the WASM JS-API for Memory & Table.
+        https://bugs.webkit.org/show_bug.cgi?id=219600
+
+        Reviewed by Yusuke Suzuki.
+
+        This patch adds a "minimum" perameter to the constructor of both WebAssembly.Memory and
+        WebAssembly.Table. This represents the same value as the "initial" perameter. The new
+        perameter name is outlined here [1]. It is part of the JS type reflection proposal.
+
+        [1]: https://github.com/WebAssembly/js-types/blob/master/proposals/js-types/Overview.md#naming-of-size-limits
+
+        * JSTests/wasm/js-api/table.js:
+        * JSTests/wasm/js-api/test_memory_constructor.js:
+        * Source/JavaScriptCore/wasm/js/WebAssemblyMemoryConstructor.cpp:
+        * Source/JavaScriptCore/wasm/js/WebAssemblyTableConstructor.cpp:
+
 2020-12-21  Keith Miller  <keith_miller@apple.com>
 

trunk/Source/JavaScriptCore/wasm/js/WebAssemblyMemoryConstructor.cpp

@@ -69 +69 @@
     {
         Identifier initial = Identifier::fromString(vm, "initial");
-        JSValue minSizeValue = memoryDescriptor->get(globalObject, initial);
+        JSValue initSizeValue = memoryDescriptor->get(globalObject, initial);
         RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
+        Identifier minimum = Identifier::fromString(vm, "minimum");
+        JSValue minSizeValue = memoryDescriptor->get(globalObject, minimum);
+        RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
+        if (!minSizeValue.isUndefined() && !initSizeValue.isUndefined()) {
+            // Error because both specified.
+            return throwVMTypeError(globalObject, throwScope, "WebAssembly.Memory 'initial' and 'minimum' options are specified at the same time");
+        }
+        if (!initSizeValue.isUndefined())
+            minSizeValue = initSizeValue;
+
         uint32_t size = toNonWrappingUint32(globalObject, minSizeValue);
         RETURN_IF_EXCEPTION(throwScope, encodedJSValue());

trunk/Source/JavaScriptCore/wasm/js/WebAssemblyTableConstructor.cpp

@@ -82 +82 @@
     JSValue initialSizeValue = memoryDescriptor->get(globalObject, initialIdent);
     RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
+    Identifier minimumIdent = Identifier::fromString(vm, "minimum");
+    JSValue minSizeValue = memoryDescriptor->get(globalObject, minimumIdent);
+    RETURN_IF_EXCEPTION(throwScope, encodedJSValue());
+    if (!initialSizeValue.isUndefined() && !minSizeValue.isUndefined())
+        return throwVMTypeError(globalObject, throwScope, "WebAssembly.Table 'initial' and 'minimum' options are specified at the same time");
+
+    if (!minSizeValue.isUndefined())
+        initialSizeValue = minSizeValue;
+
     uint32_t initial = toNonWrappingUint32(globalObject, initialSizeValue);
     RETURN_IF_EXCEPTION(throwScope, encodedJSValue());