Skip to content

Commit d4f599f

Browse files
committed
Renaming module record's [[Async]] to [[HasTLA]].
1 parent 3917eda commit d4f599f

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -774,7 +774,7 @@ private int innerModuleEvaluation(JSRealm realm, JSModuleRecord moduleRecord, De
774774
requiredModule.appendAsyncParentModules(moduleRecord);
775775
}
776776
}
777-
if (moduleRecord.getPendingAsyncDependencies() > 0 || moduleRecord.isTopLevelAsync()) {
777+
if (moduleRecord.getPendingAsyncDependencies() > 0 || moduleRecord.hasTLA()) {
778778
assert !moduleRecord.isAsyncEvaluating() && moduleRecord.getAsyncEvaluatingOrder() == 0;
779779
moduleRecord.setAsyncEvaluating(true);
780780
moduleRecord.setAsyncEvaluatingOrder(realm.nextAsyncEvaluationOrder());
@@ -806,7 +806,7 @@ private int innerModuleEvaluation(JSRealm realm, JSModuleRecord moduleRecord, De
806806
private static void moduleAsyncExecution(JSRealm realm, JSModuleRecord module) {
807807
// ExecuteAsyncModule ( module )
808808
assert module.getStatus() == Status.Evaluating || module.getStatus() == Status.Evaluated;
809-
assert module.isTopLevelAsync();
809+
assert module.hasTLA();
810810
PromiseCapabilityRecord capability = NewPromiseCapabilityNode.createDefault(realm);
811811
DynamicObject onFulfilled = createCallAsyncModuleFulfilled(realm, module);
812812
DynamicObject onRejected = createCallAsyncModuleRejected(realm, module);
@@ -881,7 +881,7 @@ private static void gatherAvailableAncestors(JSModuleRecord module, Set<JSModule
881881
m.decPendingAsyncDependencies();
882882
if (m.getPendingAsyncDependencies() == 0) {
883883
execList.add(m);
884-
if (!m.isTopLevelAsync()) {
884+
if (!m.hasTLA()) {
885885
gatherAvailableAncestors(m, execList);
886886
}
887887
}
@@ -908,7 +908,7 @@ public int compare(JSModuleRecord o1, JSModuleRecord o2) {
908908
for (JSModuleRecord m : execList) {
909909
if (!m.isAsyncEvaluating()) {
910910
assert m.getEvaluationError() != null;
911-
} else if (m.isTopLevelAsync()) {
911+
} else if (m.hasTLA()) {
912912
moduleAsyncExecution(realm, m);
913913
} else {
914914
try {
@@ -948,7 +948,7 @@ private static Object asyncModuleExecutionRejected(JSRealm realm, JSModuleRecord
948948
}
949949

950950
private static Object moduleExecution(JSRealm realm, JSModuleRecord moduleRecord, PromiseCapabilityRecord capability) {
951-
if (!moduleRecord.isTopLevelAsync()) {
951+
if (!moduleRecord.hasTLA()) {
952952
assert capability == null;
953953
return JSFunction.call(JSArguments.create(Undefined.instance, JSFunction.create(realm, moduleRecord.getFunctionData()), moduleRecord));
954954
} else {

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/nodes/promise/ImportCallNode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ public Object execute(VirtualFrame frame) {
356356
try {
357357
JSModuleRecord moduleRecord = context.getEvaluator().hostResolveImportedModule(context, referencingScriptOrModule, moduleRequest);
358358
JSRealm realm = getRealm();
359-
if (moduleRecord.isTopLevelAsync()) {
359+
if (moduleRecord.hasTLA()) {
360360
context.getEvaluator().moduleInstantiation(realm, moduleRecord);
361361
Object innerPromise = context.getEvaluator().moduleEvaluation(realm, moduleRecord);
362362
assert JSPromise.isJSPromise(innerPromise);

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public JSModuleRecord(JSModuleData parsedModule, JSModuleLoader moduleLoader) {
107107
super(parsedModule.getContext(), parsedModule.getSource());
108108
this.parsedModule = parsedModule;
109109
this.moduleLoader = moduleLoader;
110-
this.async = parsedModule.isTopLevelAsync();
110+
this.hasTLA = parsedModule.isTopLevelAsync();
111111
this.hostDefined = null;
112112
setUninstantiated();
113113
}
@@ -241,8 +241,8 @@ public void setUninstantiated() {
241241

242242
// [[CycleRoot]]
243243
private JSModuleRecord cycleRoot = this;
244-
// [[Async]]
245-
private final boolean async;
244+
// [[HasTLA]]
245+
private final boolean hasTLA;
246246
// [[AsyncEvaluating]]
247247
private boolean asyncEvaluating = false;
248248
private long asyncEvaluatingOrder;
@@ -306,8 +306,8 @@ public long getAsyncEvaluatingOrder() {
306306
return asyncEvaluatingOrder;
307307
}
308308

309-
public boolean isTopLevelAsync() {
310-
return async;
309+
public boolean hasTLA() {
310+
return hasTLA;
311311
}
312312

313313
public void setExecutionContinuation(Object continuation) {

graal-nodejs/mx.graal-nodejs/com.oracle.truffle.trufflenode/src/com/oracle/truffle/trufflenode/GraalJSAccess.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3501,7 +3501,7 @@ public Object moduleEvaluate(Object context, Object module) {
35013501
jsContext.getEvaluator().moduleEvaluation(jsRealm, moduleRecord);
35023502
}
35033503

3504-
if (!moduleRecord.isTopLevelAsync()) {
3504+
if (!moduleRecord.hasTLA()) {
35053505
Throwable evaluationError = moduleRecord.getEvaluationError();
35063506
if (evaluationError != null) {
35073507
throw JSRuntime.rethrow(evaluationError);

0 commit comments

Comments
 (0)