Skip to content

[GR-70562] [GR-70350] Load instantiated subtypes of all base layer types #12421

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 23, 2025
Merged

[GR-70562] [GR-70350] Load instantiated subtypes of all base layer types #12421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
501a82b
[GR-70562] Load instantiated subtypes of loaded base layer types, eve…
Zeavee Oct 6, 2025
76c5710
[GR-70350] Implement isClassInitializer for BaseLayerMethod
Zeavee Oct 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion ...evm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/BaseLayerMethod.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@
* method, using the information from the base layer.
*/
public class BaseLayerMethod extends BaseLayerElement implements ResolvedJavaMethod {
private static final String CLINIT = "<clinit>";

private final int id;
private final ResolvedJavaType declaringClass;
private final String name;
Expand Down Expand Up @@ -153,7 +155,7 @@ public boolean isDeclared() {

@Override
public boolean isClassInitializer() {
throw unimplemented();
return name.equals(CLINIT);
}

@Override
Expand Down
43 changes: 24 additions & 19 deletions ...m/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/imagelayer/SVMImageLayerLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -739,24 +739,29 @@ private void initializeBaseLayerTypeBeforePublishing(AnalysisType type, Persiste
public void initializeBaseLayerType(AnalysisType type) {
VMError.guarantee(type.isInBaseLayer());
PersistedAnalysisType.Reader td = findType(getBaseLayerTypeId(type));
registerFlag(td.getIsInstantiated(), _ -> type.registerAsInstantiated(PERSISTED));
registerFlag(td.getIsUnsafeAllocated(), _ -> type.registerAsUnsafeAllocated(PERSISTED));
registerFlag(td.getIsReachable(), _ -> type.registerAsReachable(PERSISTED));
postTask(td.getIsInstantiated(), _ -> type.registerAsInstantiated(PERSISTED));
postTask(td.getIsUnsafeAllocated(), _ -> type.registerAsUnsafeAllocated(PERSISTED));
postTask(td.getIsReachable(), _ -> type.registerAsReachable(PERSISTED));

if (!td.getIsInstantiated() && td.getIsAnySubtypeInstantiated()) {
if (td.getIsAnySubtypeInstantiated()) {
/*
* Once a base layer type is loaded, loading all its instantiated subtypes ensures that
* the application layer typestate is coherent with the base layer typestate. Otherwise,
* unwanted optimizations could occur as the typestate would not contain some missed
* types from the base layer.
*/
var subTypesReader = td.getSubTypes();
for (int i = 0; i < subTypesReader.size(); ++i) {
int tid = subTypesReader.get(i);
var subTypeReader = findType(tid);
if (subTypeReader.getIsInstantiated()) {
registerFlag(true, _ -> getAnalysisTypeForBaseLayerId(subTypeReader.getId()));
}
/* Only load instantiated subtypes. */
postTask(subTypeReader.getIsInstantiated(), _ -> getAnalysisTypeForBaseLayerId(subTypeReader.getId()));
}
}
}

private void registerFlag(boolean flag, DebugContextRunnable task) {
if (flag) {
private void postTask(boolean condition, DebugContextRunnable task) {
if (condition) {
if (universe.getBigbang() != null) {
universe.getBigbang().postTask(task);
} else {
Expand Down Expand Up @@ -1022,11 +1027,11 @@ public void addBaseLayerMethod(AnalysisMethod analysisMethod) {
methods.putIfAbsent(analysisMethod.getId(), analysisMethod);

PersistedAnalysisMethod.Reader md = getMethodData(analysisMethod);
registerFlag(md.getIsVirtualRootMethod(), _ -> analysisMethod.registerAsVirtualRootMethod(PERSISTED));
registerFlag(md.getIsDirectRootMethod(), _ -> analysisMethod.registerAsDirectRootMethod(PERSISTED));
registerFlag(md.getIsInvoked(), _ -> analysisMethod.registerAsInvoked(PERSISTED));
registerFlag(md.getIsImplementationInvoked(), _ -> analysisMethod.registerAsImplementationInvoked(PERSISTED));
registerFlag(md.getIsIntrinsicMethod(), _ -> analysisMethod.registerAsIntrinsicMethod(PERSISTED));
postTask(md.getIsVirtualRootMethod(), _ -> analysisMethod.registerAsVirtualRootMethod(PERSISTED));
postTask(md.getIsDirectRootMethod(), _ -> analysisMethod.registerAsDirectRootMethod(PERSISTED));
postTask(md.getIsInvoked(), _ -> analysisMethod.registerAsInvoked(PERSISTED));
postTask(md.getIsImplementationInvoked(), _ -> analysisMethod.registerAsImplementationInvoked(PERSISTED));
postTask(md.getIsIntrinsicMethod(), _ -> analysisMethod.registerAsIntrinsicMethod(PERSISTED));

AnalysisMethod.CompilationBehavior compilationBehavior = AnalysisMethod.CompilationBehavior.values()[md.getCompilationBehaviorOrdinal()];
analysisMethod.setCompilationBehavior(compilationBehavior);
Expand Down Expand Up @@ -1309,17 +1314,17 @@ public void initializeBaseLayerField(AnalysisField analysisField) {
if (!analysisField.isStatic() && (isAccessed || isRead)) {
analysisField.getDeclaringClass().getInstanceFields(true);
}
registerFlag(isAccessed, _ -> {
postTask(isAccessed, _ -> {
analysisField.injectDeclaredType();
analysisField.registerAsAccessed(PERSISTED);
});
registerFlag(isRead, _ -> analysisField.registerAsRead(PERSISTED));
registerFlag(fieldData.getIsWritten(), _ -> {
postTask(isRead, _ -> analysisField.registerAsRead(PERSISTED));
postTask(fieldData.getIsWritten(), _ -> {
analysisField.injectDeclaredType();
analysisField.registerAsWritten(PERSISTED);
});
registerFlag(fieldData.getIsFolded(), _ -> analysisField.registerAsFolded(PERSISTED));
registerFlag(fieldData.getIsUnsafeAccessed(), _ -> analysisField.registerAsUnsafeAccessed(PERSISTED));
postTask(fieldData.getIsFolded(), _ -> analysisField.registerAsFolded(PERSISTED));
postTask(fieldData.getIsUnsafeAccessed(), _ -> analysisField.registerAsUnsafeAccessed(PERSISTED));

/*
* Inject the base layer position. If the position computed for this layer, either before
Expand Down