Skip to content

[GR-65232] Refactor layer loader. #11312

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

Closed
wants to merge 2 commits into from
Closed

[GR-65232] Refactor layer loader. #11312

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
a5bf309
Separate lookupBaseLayerTypeId from getBaseLayerTypeId.
cstancu May 20, 2025
51b4a3e
Apply class init issue corner case to all extension layers.
cstancu Jun 2, 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
2 changes: 1 addition & 1 deletion ...vm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisUniverse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ public JavaType lookupAllowUnresolved(JavaType rawType) {
AnalysisType result = optionalLookup(type);
if (result == null) {
result = createType(type);
if (hostVM.useBaseLayer()) {
if (hostVM.useBaseLayer() && result.isInBaseLayer()) {
imageLayerLoader.initializeBaseLayerType(result);
}
}
Expand Down
2 changes: 1 addition & 1 deletion ....svm.hosted/src/com/oracle/svm/hosted/classinitialization/ClassInitializationSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ public void forceInitializeHosted(Class<?> clazz, String reason, boolean allowIn
InitKind initKind = ensureClassInitialized(clazz, allowInitializationErrors);
if (initKind == InitKind.RUN_TIME) {
assert allowInitializationErrors || !LinkAtBuildTimeSupport.singleton().linkAtBuildTime(clazz);
if (ImageLayerBuildingSupport.buildingApplicationLayer()) {
if (ImageLayerBuildingSupport.buildingExtensionLayer()) {
/*
* Special case for application layer building. If a base layer class was configured
* with --initialize-at-build-time but its initialization failed, then the computed
Expand Down
96 changes: 49 additions & 47 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 @@ -54,6 +54,7 @@
import java.util.stream.Stream;
import java.util.stream.StreamSupport;

import org.graalvm.collections.EconomicMap;
import org.graalvm.nativeimage.AnnotationAccess;
import org.graalvm.nativeimage.ImageSingletons;
import org.graalvm.nativeimage.c.function.CEntryPoint;
Expand Down Expand Up @@ -187,9 +188,9 @@ public class SVMImageLayerLoader extends ImageLayerLoader {
private final Map<ResolvedJavaMethod, Boolean> methodHandleCallers = new ConcurrentHashMap<>();

/** Map from {@link SVMImageLayerSnapshotUtil#getTypeDescriptor} to base layer type ids. */
private final Map<String, Integer> typeDescriptorToBaseLayerId = new HashMap<>();
private EconomicMap<String, Integer> typeDescriptorToBaseLayerId;
/** Map from {@link SVMImageLayerSnapshotUtil#getMethodDescriptor} to base layer method ids. */
private final Map<String, Integer> methodDescriptorToBaseLayerId = new HashMap<>();
private EconomicMap<String, Integer> methodDescriptorToBaseLayerId;

protected AnalysisUniverse universe;
protected AnalysisMetaAccess metaAccess;
Expand Down Expand Up @@ -261,12 +262,16 @@ public void loadLayerAnalysis() {
universe.setStartFieldId(snapshot.getNextFieldId());
ImageHeapConstant.setCurrentId(snapshot.getNextConstantId());

for (PersistedAnalysisType.Reader typeData : snapshot.getTypes()) {
StructList.Reader<PersistedAnalysisType.Reader> typesReader = snapshot.getTypes();
typeDescriptorToBaseLayerId = EconomicMap.create(typesReader.size());
for (PersistedAnalysisType.Reader typeData : typesReader) {
String descriptor = typeData.getDescriptor().toString();
typeDescriptorToBaseLayerId.put(descriptor, typeData.getId());
}

for (PersistedAnalysisMethod.Reader methodData : snapshot.getMethods()) {
StructList.Reader<PersistedAnalysisMethod.Reader> methodsReader = snapshot.getMethods();
methodDescriptorToBaseLayerId = EconomicMap.create(methodsReader.size());
for (PersistedAnalysisMethod.Reader methodData : methodsReader) {
String descriptor = methodData.getDescriptor().toString();
methodDescriptorToBaseLayerId.put(descriptor, methodData.getId());
}
Expand Down Expand Up @@ -397,7 +402,7 @@ public AnalysisType getAnalysisTypeForBaseLayerId(int tid) {
guarantee(types.containsKey(tid), "Type with id %d was not correctly loaded.", tid);
/*
* The type needs to be looked up because it ensures the type is completely created, as the
* types Map is populated before the type is created.
* types map is populated before the type is created.
*/
return universe.lookup(types.get(tid).getWrapped());
}
Expand All @@ -406,29 +411,35 @@ private PersistedAnalysisType.Reader findType(int tid) {
return binarySearchUnique(tid, snapshot.getTypes(), PersistedAnalysisType.Reader::getId);
}

/**
* Load the host VM type corresponding to the serialized type data.
* <p>
* First, find the corresponding host VM {@link Class} object by name using
* {@link #lookupBaseLayerTypeInHostVM(String)}.
* <p>
* Then, lookup the hosted {@link Class} in the {@link AnalysisMetaAccess} which will trigger
* creation of the corresponding {@link AnalysisType} object.
* <p>
* The {@link AnalysisType} constructor calls {@link #lookupHostedTypeInBaseLayer(AnalysisType)}
* to check if the newly created type already exists in the base layer. If that's the case, the
* {@link AnalysisType} object takes the same {@code id} as the corresponding base layer type
* and this mapping is also registered in the {@link #types} map.
*/
private void loadType(PersistedAnalysisType.Reader typeData) {
int tid = typeData.getId();

if (delegateLoadType(typeData)) {
return;
}

String name = typeData.getClassJavaName().toString();
Class<?> clazz = lookupBaseLayerTypeInHostVM(name);
Class<?> clazz = lookupBaseLayerTypeInHostVM(typeData.getClassJavaName().toString());

ResolvedJavaType superClass = getResolvedJavaTypeForBaseLayerId(typeData.getSuperClassTypeId());

ResolvedJavaType[] interfaces = streamInts(typeData.getInterfaces())
.mapToObj(this::getResolvedJavaTypeForBaseLayerId).toArray(ResolvedJavaType[]::new);

if (clazz != null) {
/*
* When looking up the class by name, the host VM will create the corresponding
* AnalysisType. During this process, the method lookupHostedTypeInBaseLayer will be
* called to see if the type already exists in the base layer. If it is the case, the id
* from the base layer will be reused and the ImageLayerLoader#types map will be
* populated.
*/
/* Lookup the host VM type and create the analysis type. */
metaAccess.lookupJavaType(clazz);
}

Expand Down Expand Up @@ -567,7 +578,6 @@ protected Class<?> lookupBaseLayerTypeInHostVM(String type) {
return null;
}
while (arrayType > 0) {
assert clazz != null;
clazz = clazz.arrayType();
arrayType--;
}
Expand Down Expand Up @@ -664,39 +674,31 @@ yield switch (JavaKind.fromPrimitiveOrVoidTypeChar(typeChar)) {

@Override
public int lookupHostedTypeInBaseLayer(AnalysisType type) {
int id = getBaseLayerTypeId(type);
/* Assume that the type was not reachable in the base image. */
int id = -1;
if (type.getWrapped() instanceof BaseLayerType baseLayerType) {
id = baseLayerType.getBaseLayerId();
} else {
String typeDescriptor = imageLayerSnapshotUtil.getTypeDescriptor(type);
Integer typeId = typeDescriptorToBaseLayerId.get(typeDescriptor);
if (typeId != null) {
id = typeId;
initializeBaseLayerTypeBeforePublishing(type, findType(typeId));
}
}
if (id == -1 || types.putIfAbsent(id, type) != null) {
/* A complete type is treated as a different type than its incomplete version */
return -1;
}
return id;
}

private int getBaseLayerTypeId(AnalysisType type) {
private static int getBaseLayerTypeId(AnalysisType type) {
VMError.guarantee(type.isInBaseLayer());
if (type.getWrapped() instanceof BaseLayerType baseLayerType) {
return baseLayerType.getBaseLayerId();
}
PersistedAnalysisType.Reader typeData = findBaseLayerType(type);
if (typeData == null) {
/* The type was not reachable in the base image */
return -1;
}
initializeBaseLayerTypeBeforePublishing(type, typeData);
int id = typeData.getId();
int hubIdentityHashCode = typeData.getHubIdentityHashCode();
typeToHubIdentityHashCode.put(id, hubIdentityHashCode);
return id;
}

protected PersistedAnalysisType.Reader findBaseLayerType(AnalysisType type) {
assert !(type.getWrapped() instanceof BaseLayerType);
String typeDescriptor = imageLayerSnapshotUtil.getTypeDescriptor(type);
Integer typeId = typeDescriptorToBaseLayerId.get(typeDescriptor);
if (typeId == null) {
/* The type was not reachable in the base image */
return null;
}
return findType(typeId);
return type.getId();
}

/**
Expand Down Expand Up @@ -726,6 +728,10 @@ private void initializeBaseLayerTypeBeforePublishing(AnalysisType type, Persiste
} else {
classInitializationSupport.withUnsealedConfiguration(() -> classInitializationSupport.initializeAtRunTime(clazz, "computed in a previous layer"));
}

/* Extract and record the base layer identity hashcode for this type. */
int hubIdentityHashCode = typeData.getHubIdentityHashCode();
typeToHubIdentityHashCode.put(typeData.getId(), hubIdentityHashCode);
}

/**
Expand All @@ -734,11 +740,8 @@ private void initializeBaseLayerTypeBeforePublishing(AnalysisType type, Persiste
*/
@Override
public void initializeBaseLayerType(AnalysisType type) {
int id = getBaseLayerTypeId(type);
if (id == -1) {
return;
}
PersistedAnalysisType.Reader td = findType(id);
VMError.guarantee(type.isInBaseLayer());
PersistedAnalysisType.Reader td = findType(getBaseLayerTypeId(type));
registerFlag(td.getIsInstantiated(), debug -> type.registerAsInstantiated(PERSISTED));
registerFlag(td.getIsUnsafeAllocated(), debug -> type.registerAsUnsafeAllocated(PERSISTED));
registerFlag(td.getIsReachable(), debug -> type.registerAsReachable(PERSISTED));
Expand Down Expand Up @@ -1782,9 +1785,8 @@ private void scanCompanionField(DynamicHub hub) {
}

public ClassInitializationInfo getClassInitializationInfo(AnalysisType type) {
PersistedAnalysisType.Reader typeMap = findType(type.getId());

var initInfo = typeMap.getClassInitializationInfo();
PersistedAnalysisType.Reader typeData = findType(type.getId());
var initInfo = typeData.getClassInitializationInfo();
if (initInfo.getIsNoInitializerNoTracking()) {
return ClassInitializationInfo.forNoInitializerInfo(false);
} else if (initInfo.getIsInitializedNoTracking()) {
Expand Down
Loading