Changeset 230720 in webkit for trunk/Source/JavaScriptCore/jsc.cpp

Timestamp:

Apr 17, 2018, 11:00:07 AM (7 years ago)

Author:

Yusuke Suzuki

Message:

[WebAssembly][Modules] Implement function import from wasm modules
​https://bugs.webkit.org/show_bug.cgi?id=184689

Reviewed by JF Bastien.

JSTests:

• wasm.yaml:
• wasm/modules/js-wasm-cycle.js: Added.
• wasm/modules/js-wasm-cycle/entry.js: Added.

(from.string_appeared_here.export.return42):

• wasm/modules/js-wasm-cycle/sum.wasm: Added.
• wasm/modules/js-wasm-cycle/sum.wat: Added.
• wasm/modules/run-from-wasm.wasm: Added.
• wasm/modules/run-from-wasm.wat: Added.
• wasm/modules/run-from-wasm/check.js: Added.

(export.check):

• wasm/modules/wasm-imports-js-exports.js: Added.
• wasm/modules/wasm-imports-js-exports/imports.wasm: Added.
• wasm/modules/wasm-imports-js-exports/imports.wat: Added.
• wasm/modules/wasm-imports-js-exports/sum.js: Added.

(export.sum):

• wasm/modules/wasm-imports-js-re-exports-wasm-exports.js: Added.
• wasm/modules/wasm-imports-js-re-exports-wasm-exports/imports.wasm: Added.
• wasm/modules/wasm-imports-js-re-exports-wasm-exports/imports.wat: Added.
• wasm/modules/wasm-imports-js-re-exports-wasm-exports/re-export.js: Added.
• wasm/modules/wasm-imports-js-re-exports-wasm-exports/sum.wasm: Added.
• wasm/modules/wasm-imports-js-re-exports-wasm-exports/sum.wat: Added.
• wasm/modules/wasm-imports-wasm-exports.js: Added.
• wasm/modules/wasm-imports-wasm-exports/imports.wasm: Added.
• wasm/modules/wasm-imports-wasm-exports/imports.wat: Added.
• wasm/modules/wasm-imports-wasm-exports/sum.wasm: Added.
• wasm/modules/wasm-imports-wasm-exports/sum.wat: Added.
• wasm/modules/wasm-js-cycle.js: Added.
• wasm/modules/wasm-js-cycle/entry.wasm: Added.
• wasm/modules/wasm-js-cycle/entry.wat: Added.
• wasm/modules/wasm-js-cycle/sum.js: Added.

(from.string_appeared_here.export.sum):

• wasm/modules/wasm-wasm-cycle.js: Added.
• wasm/modules/wasm-wasm-cycle/entry.wasm: Added.
• wasm/modules/wasm-wasm-cycle/entry.wat: Added.
• wasm/modules/wasm-wasm-cycle/sum.wasm: Added.
• wasm/modules/wasm-wasm-cycle/sum.wat: Added.

Source/JavaScriptCore:

This patch implements function import from wasm modules. We move function importing part
from JSWebAssemblyInstance's creation function to WebAssemblyModuleRecord::link. This
is because linking these functions requires that all the dependent modules are created.
While we want to move all the linking functionality from JSWebAssemblyInstance to
WebAssemblyModuleRecord::link, we do not that in this patch. In this patch, we move only
function importing part because efficient compilation of WebAssembly needs to know
the type of WebAssemblyMemory (signaling or bound checking). This needs to know imported
or attached WebAssembly memory object. So we cannot defer this linking to
WebAssemblyModuleRecord::link now.

The largest difference from JS module linking is that WebAssembly module linking links
function from the module by snapshotting. When you have a cyclic module graph like this,

-> JS1 (export "fun") -> Wasm1 (import "fun from JS1) -+

^{|
+--------------------------------------------------+}

we fail to link this since "fun" is not instantiated when Wasm1 is first linked. This behavior
is described in [1], and tested in this patch.

[1]: ​https://github.com/WebAssembly/esm-integration/tree/master/proposals/esm-integration#js---wasm-cycle-where-js-is-higher-in-the-module-graph

• JavaScriptCore.xcodeproj/project.pbxproj:
• jsc.cpp:

(functionDollarAgentStart):
(checkException):
(runWithOptions):
Small fixes for wasm module loading.

• parser/NodesAnalyzeModule.cpp:

(JSC::ImportDeclarationNode::analyzeModule):

• runtime/AbstractModuleRecord.cpp:

(JSC::AbstractModuleRecord::resolveImport):
(JSC::AbstractModuleRecord::link):

• runtime/AbstractModuleRecord.h:

(JSC::AbstractModuleRecord::moduleEnvironmentMayBeNull):
(JSC::AbstractModuleRecord::ImportEntry::isNamespace const): Deleted.
Now, wasm modules can have import which is named "*". So this function does not work.
Since wasm modules never have namespace importing, we check this in JS's module analyzer.

• runtime/JSModuleEnvironment.cpp:

(JSC::JSModuleEnvironment::getOwnNonIndexPropertyNames):

• runtime/JSModuleRecord.cpp:

(JSC::JSModuleRecord::instantiateDeclarations):

• wasm/WasmCreationMode.h: Added.
• wasm/js/JSWebAssemblyInstance.cpp:

(JSC::JSWebAssemblyInstance::finalizeCreation):
(JSC::JSWebAssemblyInstance::create):

• wasm/js/JSWebAssemblyInstance.h:
• wasm/js/WebAssemblyInstanceConstructor.cpp:

(JSC::constructJSWebAssemblyInstance):

• wasm/js/WebAssemblyModuleRecord.cpp:

(JSC::WebAssemblyModuleRecord::link):

• wasm/js/WebAssemblyModuleRecord.h:
• wasm/js/WebAssemblyPrototype.cpp:

(JSC::resolve):
(JSC::instantiate):
(JSC::compileAndInstantiate):
(JSC::WebAssemblyPrototype::instantiate):
(JSC::webAssemblyInstantiateFunc):

Tools:

Add runWebAssemblyDirect, which runs wasm file directly.

• Scripts/run-jsc-stress-tests:

File:

• trunk/Source/JavaScriptCore/jsc.cpp (modified) (6 diffs)

trunk/Source/JavaScriptCore/jsc.cpp

@@ -197 +197 @@
 template<typename Func>
 int runJSC(CommandLine, bool isWorker, const Func&);
-static void checkException(GlobalObject*, bool isLastFile, bool hasException, JSValue, CommandLine&, bool& success);
+static void checkException(ExecState*, GlobalObject*, bool isLastFile, bool hasException, JSValue, CommandLine&, bool& success);
 
 class Message : public ThreadSafeRefCounted<Message> {
@@ -1633 +1633 @@
                     if (evaluationException)
                         result = evaluationException->value();
-                    checkException(globalObject, true, evaluationException, result, commandLine, success);
+                    checkException(globalObject->globalExec(), globalObject, true, evaluationException, result, commandLine, success);
                     if (!success)
                         exit(1);
@@ -2260 +2260 @@
 }
 
-static void checkException(GlobalObject* globalObject, bool isLastFile, bool hasException, JSValue value, CommandLine& options, bool& success)
+static void checkException(ExecState* exec, GlobalObject* globalObject, bool isLastFile, bool hasException, JSValue value, CommandLine& options, bool& success)
 {
     VM& vm = globalObject->vm();
@@ -2272 +2272 @@
         success = success && !hasException;
         if (options.m_dump && !hasException)
-            printf("End: %s\n", value.toWTFString(globalObject->globalExec()).utf8().data());
+            printf("End: %s\n", value.toWTFString(exec).utf8().data());
         if (hasException)
             dumpException(globalObject, value);
@@ -2325 +2325 @@
 
             JSFunction* fulfillHandler = JSNativeStdFunction::create(vm, globalObject, 1, String(), [&, isLastFile](ExecState* exec) {
-                checkException(globalObject, isLastFile, false, exec->argument(0), options, success);
+                checkException(exec, globalObject, isLastFile, false, exec->argument(0), options, success);
                 return JSValue::encode(jsUndefined());
             });
 
             JSFunction* rejectHandler = JSNativeStdFunction::create(vm, globalObject, 1, String(), [&, isLastFile](ExecState* exec) {
-                checkException(globalObject, isLastFile, true, exec->argument(0), options, success);
+                checkException(exec, globalObject, isLastFile, true, exec->argument(0), options, success);
                 return JSValue::encode(jsUndefined());
             });
@@ -2343 +2343 @@
             if (evaluationException)
                 returnValue = evaluationException->value();
-            checkException(globalObject, isLastFile, evaluationException, returnValue, options, success);
+            checkException(globalObject->globalExec(), globalObject, isLastFile, evaluationException, returnValue, options, success);
         }