Changeset 272071 in webkit

Timestamp:

Jan 29, 2021 11:26:36 AM (18 months ago)

Author:

commit-queue@webkit.org

Message:

[JSC] WebAssembly.Global should support Funcref and Externref
​https://bugs.webkit.org/show_bug.cgi?id=220914

Patch by Dmitry Bezhetskov <dbezhetskov> on 2021-01-29
Reviewed by Yusuke Suzuki.

JSTests:

Add tests for WebAssembly.Global ctors with
new reference types:
​https://webassembly.github.io/reference-types/js-api/index.html#dom-global-global.

• wasm/references/globals.js: Added.

(Pelmen):
(testGlobalConstructorForExternref):
(async testGlobalConstructorForFuncref):

Source/JavaScriptCore:

Allow using reference types in ctor of WebAssembly.Global
according to the spec
​https://webassembly.github.io/reference-types/js-api/index.html#dom-global-global.

• wasm/js/WebAssemblyGlobalConstructor.cpp:

(JSC::JSC_DEFINE_HOST_FUNCTION):

Location:

trunk

Files:

• JSTests/ChangeLog (modified) (1 diff)
• JSTests/wasm/references/globals.js (added)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/wasm/WasmTable.cpp (modified) (1 diff)
• Source/JavaScriptCore/wasm/WasmTable.h (modified) (1 diff)
• Source/JavaScriptCore/wasm/js/JSWebAssemblyHelpers.h (modified) (1 diff)
• Source/JavaScriptCore/wasm/js/WebAssemblyGlobalConstructor.cpp (modified) (4 diffs)
• Source/JavaScriptCore/wasm/js/WebAssemblyTableConstructor.cpp (modified) (1 diff)
• Source/JavaScriptCore/wasm/js/WebAssemblyTablePrototype.cpp (modified) (2 diffs)

trunk/JSTests/ChangeLog

@@ +1 @@
+2021-01-29  Dmitry Bezhetskov  <dbezhetskov@igalia.com>
+
+        [JSC] WebAssembly.Global should support Funcref and Externref
+        https://bugs.webkit.org/show_bug.cgi?id=220914
+
+        Reviewed by Yusuke Suzuki.
+
+        Add tests for WebAssembly.Global ctors with
+        new reference types:
+        https://webassembly.github.io/reference-types/js-api/index.html#dom-global-global.
+
+        * wasm/references/globals.js: Added.
+        (Pelmen):
+        (testGlobalConstructorForExternref):
+        (async testGlobalConstructorForFuncref):
+
 2021-01-28  Yusuke Suzuki  <ysuzuki@apple.com>
 

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2021-01-29  Dmitry Bezhetskov  <dbezhetskov@igalia.com>
+
+        [JSC] WebAssembly.Global should support Funcref and Externref
+        https://bugs.webkit.org/show_bug.cgi?id=220914
+
+        Reviewed by Yusuke Suzuki.
+
+        Allow using reference types in ctor of WebAssembly.Global
+        according to the spec
+        https://webassembly.github.io/reference-types/js-api/index.html#dom-global-global.
+
+        * wasm/js/WebAssemblyGlobalConstructor.cpp:
+        (JSC::JSC_DEFINE_HOST_FUNCTION):
+
 2021-01-29  David Kilzer  <ddkilzer@apple.com>
 

trunk/Source/JavaScriptCore/wasm/WasmTable.cpp

@@ -175 +175 @@
 }
 
+Type Table::wasmType() const
+{
+    if (isExternrefTable())
+        return Type::Externref;
+    ASSERT(isFuncrefTable());
+    return Type::Funcref;
+}
+
 FuncRefTable* Table::asFuncrefTable()
 {

trunk/Source/JavaScriptCore/wasm/WasmTable.h

@@ -69 +69 @@
     bool isExternrefTable() const { return m_type == TableElementType::Externref; }
     bool isFuncrefTable() const { return m_type == TableElementType::Funcref; }
+    Type wasmType() const;
     FuncRefTable* asFuncrefTable();
 

trunk/Source/JavaScriptCore/wasm/js/JSWebAssemblyHelpers.h

@@ -136 +136 @@
 }
 
-ALWAYS_INLINE JSValue defaultValueForTable(const Wasm::TableElementType tableType)
+ALWAYS_INLINE JSValue defaultValueForReferenceType(const Wasm::Type type)
 {
-    if (tableType == Wasm::TableElementType::Externref)
+    ASSERT(Wasm::isRefType(type));
+    if (type == Wasm::Type::Externref)
         return jsUndefined();
-    ASSERT(tableType == Wasm::TableElementType::Funcref);
+    ASSERT(type == Wasm::Type::Funcref);
     return jsNull();
 }

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

@@ -31 +31 @@
 #include "JSCInlines.h"
 #include "JSWebAssemblyGlobal.h"
+#include "WasmFormat.h"
 #include "WebAssemblyGlobalPrototype.h"
 
@@ -94 +95 @@
         else if (valueString == "f64")
             type = Wasm::Type::F64;
+        else if (Options::useWebAssemblyReferences() && valueString == "anyfunc")
+            type = Wasm::Type::Funcref;
+        else if (Options::useWebAssemblyReferences() && valueString == "externref")
+            type = Wasm::Type::Externref;
         else
             return JSValue::encode(throwException(globalObject, throwScope, createTypeError(globalObject, "WebAssembly.Global expects its 'value' field to be the string 'i32', 'i64', 'f32', or 'f64'"_s)));
@@ -126 +131 @@
             break;
         }
+        case Wasm::Type::Funcref:
+        case Wasm::Type::Externref: {
+            // We check default value for these types later in set method.
+            ASSERT(Options::useWebAssemblyReferences());
+            break;
+        }
         default:
             RELEASE_ASSERT_NOT_REACHED();
@@ -132 +143 @@
 
     Ref<Wasm::Global> wasmGlobal = Wasm::Global::create(type, mutability, initialValue);
-    RELEASE_AND_RETURN(throwScope, JSValue::encode(JSWebAssemblyGlobal::tryCreate(globalObject, vm, webAssemblyGlobalStructure, WTFMove(wasmGlobal))));
+    JSWebAssemblyGlobal* jsWebAssemblyGlobal = JSWebAssemblyGlobal::tryCreate(globalObject, vm, webAssemblyGlobalStructure, WTFMove(wasmGlobal));
+    RETURN_IF_EXCEPTION(throwScope, { });
+
+    if (Wasm::isRefType(type)) {
+        ASSERT(Options::useWebAssemblyReferences());
+        if (argument.isUndefined())
+            argument = defaultValueForReferenceType(type);
+        jsWebAssemblyGlobal->global()->set(globalObject, argument);
+        RETURN_IF_EXCEPTION(throwScope, { });
+    }
+    return JSValue::encode(jsWebAssemblyGlobal);
 }
 

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

@@ -123 +123 @@
     if (Options::useWebAssemblyReferences()) {
         JSValue defaultValue = callFrame->argumentCount() < 2
-            ? defaultValueForTable(jsWebAssemblyTable->table()->type())
+            ? defaultValueForReferenceType(jsWebAssemblyTable->table()->wasmType())
             : callFrame->uncheckedArgument(1);
         WebAssemblyFunction* wasmFunction = nullptr;

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

@@ -95 +95 @@
     if (Options::useWebAssemblyReferences()) {
         if (callFrame->argumentCount() < 2)
-            defaultValue = defaultValueForTable(table->table()->type());
+            defaultValue = defaultValueForReferenceType(table->table()->wasmType());
         else
             defaultValue = callFrame->uncheckedArgument(1);
@@ -141 +141 @@
     JSValue value = callFrame->argument(1);
     if (Options::useWebAssemblyReferences() && callFrame->argumentCount() < 2)
-        value = defaultValueForTable(table->table()->type());
+        value = defaultValueForReferenceType(table->table()->wasmType());
 
     if (table->table()->asFuncrefTable()) {