Skip to content

[GR-67659] Ensure SVMImageLayerLoader looks up information via the base layer type id. #11716

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 1 commit into from
Jul 22, 2025
Merged

[GR-67659] Ensure SVMImageLayerLoader looks up information via the base layer type id. #11716

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 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 @@ -1018,7 +1018,7 @@ public StructList.Reader<SharedLayerSnapshotCapnProtoSchemaHolder.DynamicHubInfo
}

public DynamicHubInfo.Reader getDynamicHubInfo(AnalysisType aType) {
DynamicHubInfo.Reader result = CapnProtoAdapters.binarySearchUnique(aType.getId(), snapshot.getDynamicHubInfos(), DynamicHubInfo.Reader::getTypeId);
DynamicHubInfo.Reader result = CapnProtoAdapters.binarySearchUnique(getBaseLayerTypeId(aType), snapshot.getDynamicHubInfos(), DynamicHubInfo.Reader::getTypeId);
assert result != null : aType;
return result;
}
Expand Down Expand Up @@ -1794,8 +1794,8 @@ private void scanCompanionField(DynamicHub hub) {
instance.readFieldValue(metaAccess.lookupJavaField(dynamicHubCompanionField));
}

public ClassInitializationInfo getClassInitializationInfo(AnalysisType type) {
PersistedAnalysisType.Reader typeData = findType(type.getId());
public ClassInitializationInfo getClassInitializationInfo(AnalysisType aType) {
PersistedAnalysisType.Reader typeData = findType(getBaseLayerTypeId(aType));
var initInfo = typeData.getClassInitializationInfo();
if (initInfo.getIsNoInitializerNoTracking()) {
return ClassInitializationInfo.forNoInitializerInfo(false);
Expand Down
Loading