Changeset 273292 in webkit

Timestamp:

Feb 22, 2021 6:02:01 PM (3 years ago)

Author:

keith_miller@apple.com

Message:

Move asyncModuleEvaluation into its own function and use intrinsic constants
​https://bugs.webkit.org/show_bug.cgi?id=222281

Reviewed by Yusuke Suzuki.

Also delete an unused field on the module entry.

• builtins/ModuleLoader.js:

(globalPrivate.newRegistryEntry):
(moduleEvaluation):
(async asyncModuleEvaluation):

• runtime/JSModuleLoader.cpp:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• builtins/ModuleLoader.js (modified) (2 diffs)
• runtime/JSModuleLoader.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2021-02-22  Keith Miller  <keith_miller@apple.com>
+
+        Move asyncModuleEvaluation into its own function and use intrinsic constants
+        https://bugs.webkit.org/show_bug.cgi?id=222281
+
+        Reviewed by Yusuke Suzuki.
+
+        Also delete an unused field on the module entry.
+
+        * builtins/ModuleLoader.js:
+        (globalPrivate.newRegistryEntry):
+        (moduleEvaluation):
+        (async asyncModuleEvaluation):
+        * runtime/JSModuleLoader.cpp:
+
 2021-02-22  Keith Miller  <keith_miller@apple.com>
 

trunk/Source/JavaScriptCore/builtins/ModuleLoader.js

@@ -102 +102 @@
         then: @undefined,
         isAsync: false,
-        completionPromise: @undefined,
     };
 }
@@ -328 +327 @@
 
         this.evaluate(entry.key, entry.module, fetcher);
-    } else {
-        return (async function asyncModuleEvaluation(entry, dependencies) {
-            for (var i = 0, length = dependencies.length; i < length; ++i)
-                await this.moduleEvaluation(dependencies[i], fetcher);
-
-            var resumeMode = 0;
-            while (true) {
-                var awaitedValue = this.evaluate(entry.key, entry.module, fetcher, awaitedValue, resumeMode);
-                if (@getAbstractModuleRecordInternalField(entry.module, @abstractModuleRecordFieldState) == @GeneratorStateExecuting)
-                    return;
-
-                try {
-                    awaitedValue = await awaitedValue;
-                    resumeMode = 0;
-                } catch (e) {
-                    awaitedValue = e;
-                    resumeMode = 2;
-                }
-            }
-        }).@call(this, entry, dependencies);
+    } else
+        return this.asyncModuleEvaluation(entry, fetcher, dependencies);
+}
+
+async function asyncModuleEvaluation(entry, fetcher, dependencies)
+{
+    "use strict";
+
+    for (var i = 0, length = dependencies.length; i < length; ++i)
+        await this.moduleEvaluation(dependencies[i], fetcher);
+
+    var resumeMode = @GeneratorResumeModeNormal;
+    while (true) {
+        var awaitedValue = this.evaluate(entry.key, entry.module, fetcher, awaitedValue, resumeMode);
+        if (@getAbstractModuleRecordInternalField(entry.module, @abstractModuleRecordFieldState) == @GeneratorStateExecuting)
+            return;
+
+        try {
+            awaitedValue = await awaitedValue;
+            resumeMode = @GeneratorResumeModeNormal;
+        } catch (e) {
+            awaitedValue = e;
+            resumeMode = @GeneratorResumeModeThrow;
+        }
     }
 }

trunk/Source/JavaScriptCore/runtime/JSModuleLoader.cpp

@@ -75 +75 @@
     moduleDeclarationInstantiation moduleLoaderModuleDeclarationInstantiation DontEnum|Function 2
     moduleEvaluation               JSBuiltin                                  DontEnum|Function 2
+    asyncModuleEvaluation          JSBuiltin                                  DontEnum|Function 3
     evaluate                       moduleLoaderEvaluate                       DontEnum|Function 3
     provideFetch                   JSBuiltin                                  DontEnum|Function 2