Changeset 188894 in webkit for trunk/Source/JavaScriptCore/runtime/Completion.cpp

Timestamp:

Aug 24, 2015, 4:48:55 PM (10 years ago)

Author:

Yusuke Suzuki

Message:

[ES6] Return JSInternalPromise as result of evaluateModule
​https://bugs.webkit.org/show_bug.cgi?id=148173

Reviewed by Saam Barati.

Now evaluateModule returns JSInternalPromise* as its result value.
When an error occurs while loading or executing the modules,
this promise is rejected by that error. By leveraging this, we implemented
asynchronous error reporting when executing the modules in JSC shell.

And this patch also changes the evaluateModule signature to accept the entry
point by the moduleName. By using it, JSC shell can start executing the modules
with the entry point module name.

• builtins/ModuleLoaderObject.js:

(loadModule):

• jsc.cpp:

(dumpException):
(runWithScripts):

• runtime/Completion.cpp:

(JSC::evaluateModule):

• runtime/Completion.h:
• runtime/JSInternalPromise.cpp:

(JSC::JSInternalPromise::then):

• runtime/JSInternalPromise.h:
• runtime/ModuleLoaderObject.cpp:

(JSC::ModuleLoaderObject::requestInstantiateAll):
(JSC::ModuleLoaderObject::loadModule):
(JSC::ModuleLoaderObject::resolve):
(JSC::ModuleLoaderObject::fetch):
(JSC::ModuleLoaderObject::translate):
(JSC::ModuleLoaderObject::instantiate):
(JSC::moduleLoaderObjectParseModule):

• runtime/ModuleLoaderObject.h:

File:

• trunk/Source/JavaScriptCore/runtime/Completion.cpp (modified) (3 diffs)

trunk/Source/JavaScriptCore/runtime/Completion.cpp

@@ -31 +31 @@
 #include "JSCInlines.h"
 #include "JSGlobalObject.h"
+#include "JSInternalPromise.h"
+#include "JSInternalPromiseDeferred.h"
 #include "JSLock.h"
 #include "JSModuleRecord.h"
@@ -112 +114 @@
 }
 
-void evaluateModule(ExecState* exec, const SourceCode& source, NakedPtr<Exception>& returnedException)
+static JSInternalPromise* evaluateModule(const JSLockHolder&, ExecState* exec, JSGlobalObject* globalObject, JSValue moduleName, JSValue referrer)
+{
+    return globalObject->moduleLoader()->loadModule(exec, moduleName, referrer);
+}
+
+static JSInternalPromise* evaluateModule(const JSLockHolder& lock, ExecState* exec, JSGlobalObject* globalObject, const Identifier& moduleName)
+{
+    JSValue moduleNameValue;
+    if (moduleName.isSymbol())
+        moduleNameValue = Symbol::create(exec->vm(), static_cast<SymbolImpl&>(*moduleName.impl()));
+    else
+        moduleNameValue = jsString(&exec->vm(), moduleName.impl());
+
+    return evaluateModule(lock, exec, globalObject, moduleNameValue, jsUndefined());
+}
+
+JSInternalPromise* evaluateModule(ExecState* exec, const SourceCode& source)
 {
     JSLockHolder lock(exec);
     RELEASE_ASSERT(exec->vm().atomicStringTable() == wtfThreadData().atomicStringTable());
     RELEASE_ASSERT(!exec->vm().isCollectorBusy());
-
-    CodeProfiling profile(source);
 
     JSGlobalObject* globalObject = exec->vmEntryGlobalObject();
@@ -126 +142 @@
     Symbol* key = Symbol::create(exec->vm(), *privateName.uid());
 
-    ModuleLoaderObject* moduleLoader = globalObject->moduleLoader();
-
     // Insert the given source code to the ModuleLoader registry as the fetched registry entry.
-    moduleLoader->provide(exec, key, ModuleLoaderObject::Status::Fetch, source.toString());
+    globalObject->moduleLoader()->provide(exec, key, ModuleLoaderObject::Status::Fetch, source.toString());
     if (exec->hadException()) {
-        returnedException = exec->exception();
+        JSValue exception = exec->exception()->value();
         exec->clearException();
-        return;
+        JSInternalPromiseDeferred* deferred = JSInternalPromiseDeferred::create(exec, globalObject);
+        deferred->reject(exec, exception);
+        return deferred->promise();
     }
 
-    // FIXME: Now, we don't implement the linking phase yet.
-    // So here, we just call requestInstantiateAll to only perform the module loading.
-    // At last, it should be replaced with requestReady.
-    // https://bugs.webkit.org/show_bug.cgi?id=148172
-    moduleLoader->requestInstantiateAll(exec, key);
+    return evaluateModule(lock, exec, globalObject, key, jsUndefined());
+}
 
-    // FIXME: We should also handle the asynchronous Syntax Errors that will be delivered by the rejected promise.
-    // https://bugs.webkit.org/show_bug.cgi?id=148173
-    if (exec->hadException()) {
-        returnedException = exec->exception();
-        exec->clearException();
-        return;
-    }
+JSInternalPromise* evaluateModule(ExecState* exec, const Identifier& moduleName)
+{
+    JSLockHolder lock(exec);
+    RELEASE_ASSERT(exec->vm().atomicStringTable() == wtfThreadData().atomicStringTable());
+    RELEASE_ASSERT(!exec->vm().isCollectorBusy());
+
+    return evaluateModule(lock, exec, exec->vmEntryGlobalObject(), moduleName);
+}
+
+JSInternalPromise* evaluateModule(ExecState* exec, const String& moduleName)
+{
+    JSLockHolder lock(exec);
+    RELEASE_ASSERT(exec->vm().atomicStringTable() == wtfThreadData().atomicStringTable());
+    RELEASE_ASSERT(!exec->vm().isCollectorBusy());
+
+    return evaluateModule(lock, exec, exec->vmEntryGlobalObject(), Identifier::fromString(exec, moduleName));
 }