Replace GetCycleRoot with [[CycleRoot]] field.

Author: iamstolis

graal-js/src/com.oracle.truffle.js.parser/src/com/oracle/truffle/js/parser/GraalJSEvaluator.java

@@ -677,7 +677,7 @@ public Object moduleEvaluation(JSRealm realm, JSModuleRecord moduleRecord) {
         if (realm.getContext().isOptionTopLevelAwait()) {
             assert module.getStatus() == Status.Linked || module.getStatus() == Status.Evaluated;
             if (module.getStatus() == Status.Evaluated) {
-                module = getAsyncCycleRoot(module);
+                module = module.getCycleRoot();
             }
             if (module.getTopLevelCapability() != null) {
                 return module.getTopLevelCapability().getPromise();
@@ -729,26 +729,6 @@ public Object moduleEvaluation(JSRealm realm, JSModuleRecord moduleRecord) {
         }
     }
 
-    @TruffleBoundary
-    private static JSModuleRecord getAsyncCycleRoot(JSModuleRecord moduleRecord) {
-        // GetAsyncCycleRoot ( module )
-        JSModuleRecord module = moduleRecord;
-        assert module.getStatus() == Status.Evaluated;
-
-        if (module.getAsyncParentModules().size() == 0) {
-            return module;
-        }
-        while (module.getDFSIndex() > module.getDFSAncestorIndex()) {
-            assert module.getAsyncParentModules().size() != 0;
-            JSModuleRecord nextCycleModule = module.getAsyncParentModules().remove(0);
-            assert nextCycleModule.getDFSAncestorIndex() <= module.getDFSAncestorIndex();
-            module = nextCycleModule;
-        }
-
-        assert module.getDFSIndex() == module.getDFSAncestorIndex();
-        return module;
-    }
-
     @TruffleBoundary
     private int innerModuleEvaluation(JSRealm realm, JSModuleRecord moduleRecord, Deque<JSModuleRecord> stack, int index0) {
         // InnerModuleEvaluation( module, stack, index )
@@ -783,7 +763,7 @@ private int innerModuleEvaluation(JSRealm realm, JSModuleRecord moduleRecord, De
             if (requiredModule.getStatus() == Status.Evaluating) {
                 moduleRecord.setDFSAncestorIndex(Math.min(moduleRecord.getDFSAncestorIndex(), requiredModule.getDFSAncestorIndex()));
             } else {
-                requiredModule = getAsyncCycleRoot(requiredModule);
+                requiredModule = requiredModule.getCycleRoot();
                 assert requiredModule.getStatus() == Status.Evaluated;
                 if (requiredModule.getEvaluationError() != null) {
                     throw JSRuntime.rethrow(moduleRecord.getEvaluationError());
@@ -809,9 +789,11 @@ private int innerModuleEvaluation(JSRealm realm, JSModuleRecord moduleRecord, De
         assert occursExactlyOnce(moduleRecord, stack);
         assert moduleRecord.getDFSAncestorIndex() <= moduleRecord.getDFSIndex();
         if (moduleRecord.getDFSAncestorIndex() == moduleRecord.getDFSIndex()) {
+            JSModuleRecord cycleRoot = moduleRecord;
             while (true) {
                 JSModuleRecord requiredModule = stack.pop();
                 requiredModule.setStatus(Status.Evaluated);
+                requiredModule.setCycleRoot(cycleRoot);
                 if (requiredModule.equals(moduleRecord)) {
                     break;
                 }
@@ -892,7 +874,7 @@ private static void gatherAvailableAncestors(JSModuleRecord module, Set<JSModule
         // GatherAvailableAncestors ( module, execList )
         assert module.getStatus() == Status.Evaluated;
         for (JSModuleRecord m : module.getAsyncParentModules()) {
-            if (!execList.contains(m) && getAsyncCycleRoot(m).getEvaluationError() == null) {
+            if (!execList.contains(m) && m.getCycleRoot().getEvaluationError() == null) {
                 assert m.getEvaluationError() == null;
                 assert m.isAsyncEvaluating();
                 assert m.getPendingAsyncDependencies() > 0;
@@ -913,7 +895,7 @@ private static Object asyncModuleExecutionFulfilled(JSRealm realm, JSModuleRecor
         assert module.getEvaluationError() == null;
         module.setAsyncEvaluating(false);
         if (module.getTopLevelCapability() != null) {
-            assert module.getDFSIndex() == module.getDFSAncestorIndex();
+            assert module.getCycleRoot() == module;
             JSFunction.call(JSArguments.create(Undefined.instance, module.getTopLevelCapability().getResolve(), dynamicImportResolutionResult));
         }
         Set<JSModuleRecord> execList = new TreeSet<>(new Comparator<JSModuleRecord>() {
@@ -933,6 +915,7 @@ public int compare(JSModuleRecord o1, JSModuleRecord o2) {
                     moduleExecution(realm, m, null);
                     m.setAsyncEvaluating(false);
                     if (m.getTopLevelCapability() != null) {
+                        assert m.getCycleRoot() == m;
                         JSFunction.call(JSArguments.create(Undefined.instance, m.getTopLevelCapability().getResolve(), dynamicImportResolutionResult));
                     }
                 } catch (Exception e) {
@@ -955,13 +938,10 @@ private static Object asyncModuleExecutionRejected(JSRealm realm, JSModuleRecord
         module.setEvaluationError(JSRuntime.getException(error));
         module.setAsyncEvaluating(false);
         for (JSModuleRecord m : module.getAsyncParentModules()) {
-            if (module.getDFSIndex() != module.getDFSAncestorIndex()) {
-                assert m.getDFSAncestorIndex() == module.getDFSAncestorIndex();
-            }
             asyncModuleExecutionRejected(realm, m, error);
         }
         if (module.getTopLevelCapability() != null) {
-            assert module.getDFSIndex() == module.getDFSAncestorIndex();
+            assert module.getCycleRoot() == module;
             JSFunction.call((DynamicObject) module.getTopLevelCapability().getReject(), Undefined.instance, new Object[]{error});
         }
         return Undefined.instance;

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/runtime/objects/JSModuleRecord.java

@@ -239,6 +239,8 @@ public void setUninstantiated() {
 
     // ##### Top-level await
 
+    // [[CycleRoot]]
+    private JSModuleRecord cycleRoot = this;
     // [[Async]]
     private final boolean async;
     // [[AsyncEvaluating]]
@@ -316,4 +318,12 @@ public Object getExecutionContinuation() {
         return topLevelAwaitModuleLoadingContinuation;
     }
 
+    public void setCycleRoot(JSModuleRecord module) {
+        cycleRoot = module;
+    }
+
+    public JSModuleRecord getCycleRoot() {
+        return cycleRoot;
+    }
+
 }