Skip to content

[GR-64959] Support InitialLayerOnlyImageSingleton with different key #11458

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
Jun 23, 2025
Merged

[GR-64959] Support InitialLayerOnlyImageSingleton with different key #11458

Show file tree
Hide file tree
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
2 changes: 2 additions & 0 deletions ....svm.core/src/com/oracle/svm/core/layeredimagesingleton/LayeredImageSingletonSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,5 +53,7 @@ static LayeredImageSingletonSupport singleton() {

void freezeLayeredImageSingletonMetadata();

boolean isInitialLayerOnlyImageSingleton(Class<?> key);

JavaConstant getInitialLayerOnlyImageSingleton(Class<?> key);
}
1 change: 1 addition & 0 deletions substratevm/src/com.oracle.svm.hosted/resources/SharedLayerSnapshotCapnProtoSchema.capnp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,7 @@ struct ImageSingletonKey {
persistFlag @1 :Int32;
objectId @2 :SingletonObjId;
constantId @3 :ConstantId;
isInitialLayerOnly @4 :Bool;
}

struct ImageSingletonObject {
Expand Down
6 changes: 6 additions & 0 deletions ...atevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ImageSingletonsSupportImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,12 @@ public void freezeLayeredImageSingletonMetadata() {
HostedManagement.getAndAssertExists().freezeLayeredImageSingletonMetadata();
}

@Override
public boolean isInitialLayerOnlyImageSingleton(Class<?> key) {
var loader = HostedImageLayerBuildingSupport.singleton().getSingletonLoader();
return loader.isInitialLayerOnlyImageSingleton(key);
}

@Override
public JavaConstant getInitialLayerOnlyImageSingleton(Class<?> key) {
var loader = HostedImageLayerBuildingSupport.singleton().getSingletonLoader();
Expand Down
11 changes: 6 additions & 5 deletions ....oracle.svm.hosted/src/com/oracle/svm/hosted/imagelayer/SVMImageLayerSingletonLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
import org.graalvm.collections.UnmodifiableEconomicMap;

import com.oracle.svm.core.layeredimagesingleton.ImageSingletonLoader;
import com.oracle.svm.core.layeredimagesingleton.InitialLayerOnlyImageSingleton;
import com.oracle.svm.core.layeredimagesingleton.LayeredImageSingleton.PersistFlags;
import com.oracle.svm.core.util.UserError;
import com.oracle.svm.core.util.VMError;
Expand Down Expand Up @@ -107,11 +106,9 @@ public Map<Object, Set<Class<?>>> loadImageSingletons(Object forbiddenObject) {
Class<?> clazz = imageLayerBuildingSupport.lookupClass(false, className);
singletonInitializationMap.computeIfAbsent(forbiddenObject, (k) -> new HashSet<>());
singletonInitializationMap.get(forbiddenObject).add(clazz);
if (InitialLayerOnlyImageSingleton.class.isAssignableFrom(clazz)) {
if (entry.getIsInitialLayerOnly()) {
int constantId = entry.getConstantId();
if (constantId != -1) {
initialLayerKeyToIdMap.put(clazz, constantId);
}
initialLayerKeyToIdMap.put(clazz, constantId);
}
} else {
assert persistInfo == PersistFlags.NOTHING : "Unexpected PersistFlags value: " + persistInfo;
Expand All @@ -124,6 +121,10 @@ public Map<Object, Set<Class<?>>> loadImageSingletons(Object forbiddenObject) {
return singletonInitializationMap;
}

public boolean isInitialLayerOnlyImageSingleton(Class<?> key) {
return initialLayerOnlySingletonConstantIds.containsKey(key);
}

public JavaConstant loadInitialLayerOnlyImageSingleton(Class<?> key) {
int constantId = initialLayerOnlySingletonConstantIds.getOrDefault(key, -1);
if (constantId != -1) {
Expand Down
1 change: 1 addition & 0 deletions ...m/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/imagelayer/SVMImageLayerWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1117,6 +1117,7 @@ public void writeImageSingletonInfo(List<Map.Entry<Class<?>, Object>> layeredIma
constantId = initialLayerOnlySingletonMap.getOrDefault(initialLayerOnlyImageSingleton, -1);
}
sb.setConstantId(constantId);
sb.setIsInitialLayerOnly(singleton instanceof InitialLayerOnlyImageSingleton);
}

var sortedByIDs = singletonInfoMap.entrySet().stream()
Expand Down
11 changes: 11 additions & 0 deletions ...hosted/src/com/oracle/svm/hosted/imagelayer/SharedLayerSnapshotCapnProtoSchemaHolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3948,6 +3948,13 @@ public final void setConstantId(int value) {
_setIntField(2, value);
}

public final boolean getIsInitialLayerOnly() {
return _getBooleanField(96);
}
public final void setIsInitialLayerOnly(boolean value) {
_setBooleanField(96, value);
}

}

public static final class Reader extends com.oracle.svm.shaded.org.capnproto.StructReader {
Expand All @@ -3974,6 +3981,10 @@ public final int getConstantId() {
return _getIntField(2);
}

public final boolean getIsInitialLayerOnly() {
return _getBooleanField(96);
}

}

}
Expand Down
40 changes: 21 additions & 19 deletions ...om.oracle.svm.hosted/src/com/oracle/svm/hosted/snippets/SubstrateGraphBuilderPlugins.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@
import com.oracle.svm.core.imagelayer.LoadImageSingletonFactory;
import com.oracle.svm.core.jdk.proxy.DynamicProxyRegistry;
import com.oracle.svm.core.layeredimagesingleton.ApplicationLayerOnlyImageSingleton;
import com.oracle.svm.core.layeredimagesingleton.InitialLayerOnlyImageSingleton;
import com.oracle.svm.core.layeredimagesingleton.LayeredImageSingletonBuilderFlags;
import com.oracle.svm.core.layeredimagesingleton.LayeredImageSingletonSupport;
import com.oracle.svm.core.layeredimagesingleton.MultiLayeredImageSingleton;
Expand Down Expand Up @@ -1204,27 +1203,30 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver unused, ValueNode classNode) {
Class<?> key = constantObjectParameter(b, targetMethod, 0, Class.class, classNode);

if (ApplicationLayerOnlyImageSingleton.isAssignableFrom(key) &&
ImageLayerBuildingSupport.buildingSharedLayer()) {
/*
* This singleton is only installed in the application layer heap. All other
* layers looks refer to this singleton.
*/
b.addPush(JavaKind.Object, LoadImageSingletonFactory.loadApplicationOnlyImageSingleton(key, b.getMetaAccess()));
return true;
}
var layeredSingletonSupport = LayeredImageSingletonSupport.singleton();
if (ImageLayerBuildingSupport.buildingImageLayer()) {
if (ApplicationLayerOnlyImageSingleton.isAssignableFrom(key) &&
ImageLayerBuildingSupport.buildingSharedLayer()) {
/*
* This singleton is only installed in the application layer heap. All other
* layers looks refer to this singleton.
*/
b.addPush(JavaKind.Object, LoadImageSingletonFactory.loadApplicationOnlyImageSingleton(key, b.getMetaAccess()));
return true;
}

if (InitialLayerOnlyImageSingleton.class.isAssignableFrom(key) && ImageLayerBuildingSupport.buildingExtensionLayer()) {
/*
* This singleton is only installed in the initial layer heap. When allowed, all
* other layers lookups refer to this singleton.
*/
JavaConstant initialSingleton = LayeredImageSingletonSupport.singleton().getInitialLayerOnlyImageSingleton(key);
b.addPush(JavaKind.Object, ConstantNode.forConstant(initialSingleton, b.getMetaAccess(), b.getGraph()));
return true;
if (ImageLayerBuildingSupport.buildingExtensionLayer() && layeredSingletonSupport.isInitialLayerOnlyImageSingleton(key)) {
/*
* This singleton is only installed in the initial layer heap. When allowed,
* all other layers lookups refer to this singleton.
*/
JavaConstant initialSingleton = layeredSingletonSupport.getInitialLayerOnlyImageSingleton(key);
b.addPush(JavaKind.Object, ConstantNode.forConstant(initialSingleton, b.getMetaAccess(), b.getGraph()));
return true;
}
}

Object singleton = LayeredImageSingletonSupport.singleton().lookup(key, true, true);
Object singleton = layeredSingletonSupport.lookup(key, true, true);
LayeredImageSingletonBuilderFlags.validateRuntimeLookup(singleton);
b.addPush(JavaKind.Object, ConstantNode.forConstant(b.getSnippetReflection().forObject(singleton), b.getMetaAccess()));
return true;
Expand Down