Skip to content

Commit 33aadeb

Browse files
committed
[GR-61427] Set implementations of methods as reachableInCurrentLayer too
PullRequest: graal/19862
2 parents e4117f0 + 0ad99d6 commit 33aadeb

File tree

3 files changed

+7
-0
lines changed

3 files changed

+7
-0
lines changed

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisMethod.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -475,6 +475,7 @@ public void setReachableInCurrentLayer() {
475475
if (imageLayerLoader != null) {
476476
imageLayerLoader.loadPriorStrengthenedGraphAnalysisElements(this);
477477
}
478+
ConcurrentLightHashSet.forEach(this, allImplementationsUpdater, AnalysisMethod::setReachableInCurrentLayer);
478479
});
479480
}
480481
}

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisType.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -670,6 +670,9 @@ private void prepareMethodImplementations(AnalysisType superType) {
670670
AnalysisMethod override = resolveConcreteMethod(method, null);
671671
if (override != null && !override.equals(method)) {
672672
ConcurrentLightHashSet.addElement(method, AnalysisMethod.allImplementationsUpdater, override);
673+
if (method.reachableInCurrentLayer()) {
674+
override.setReachableInCurrentLayer();
675+
}
673676
}
674677
});
675678
}

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisUniverse.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -452,6 +452,9 @@ private static void prepareMethodImplementations(AnalysisMethod method) {
452452
AnalysisMethod override = subtype.resolveConcreteMethod(method, null);
453453
if (override != null && !override.equals(method)) {
454454
ConcurrentLightHashSet.addElement(method, AnalysisMethod.allImplementationsUpdater, override);
455+
if (method.reachableInCurrentLayer()) {
456+
override.setReachableInCurrentLayer();
457+
}
455458
}
456459
}
457460
}

0 commit comments

Comments
 (0)