Skip to content

[GR-66797] Remove LayeredImageSingleton. #12388

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
Oct 17, 2025
Merged

[GR-66797] Remove LayeredImageSingleton. #12388

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
6 changes: 3 additions & 3 deletions substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/IsolateArgumentParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
import com.oracle.svm.core.imagelayer.ImageLayerBuildingSupport;
import com.oracle.svm.core.layeredimagesingleton.ImageSingletonLoader;
import com.oracle.svm.core.layeredimagesingleton.ImageSingletonWriter;
import com.oracle.svm.core.layeredimagesingleton.LayeredImageSingleton;
import com.oracle.svm.core.layeredimagesingleton.LayeredPersistFlags;
import com.oracle.svm.core.memory.UntrackedNullableNativeMemory;
import com.oracle.svm.core.option.RuntimeOptionKey;
import com.oracle.svm.core.traits.BuiltinTraits.AllAccess;
Expand Down Expand Up @@ -677,15 +677,15 @@ static class LayeredCallbacks extends SingletonLayeredCallbacksSupplier {
public SingletonTrait getLayeredCallbacksTrait() {
return new SingletonTrait(SingletonTraitKind.LAYERED_CALLBACKS, new SingletonLayeredCallbacks<LayeredOptionInfo>() {
@Override
public LayeredImageSingleton.PersistFlags doPersist(ImageSingletonWriter writer, LayeredOptionInfo singleton) {
public LayeredPersistFlags doPersist(ImageSingletonWriter writer, LayeredOptionInfo singleton) {
if (ImageLayerBuildingSupport.firstImageBuild()) {
writer.writeInt("numOptions", IsolateArgumentParser.getOptionCount());
writer.writeStringList("optionNames", IsolateArgumentParser.getOptions().stream().map(OptionKey::getName).toList());
} else {
writer.writeInt("numOptions", singleton.getNumOptions());
writer.writeStringList("optionNames", singleton.optionNames);
}
return LayeredImageSingleton.PersistFlags.CREATE;
return LayeredPersistFlags.CREATE;
}

@Override
Expand Down
7 changes: 3 additions & 4 deletions substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/RuntimeAssertionsSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@
import com.oracle.svm.core.feature.AutomaticallyRegisteredImageSingleton;
import com.oracle.svm.core.layeredimagesingleton.ImageSingletonLoader;
import com.oracle.svm.core.layeredimagesingleton.ImageSingletonWriter;
import com.oracle.svm.core.layeredimagesingleton.LayeredImageSingleton;
import com.oracle.svm.core.layeredimagesingleton.LayeredImageSingleton.PersistFlags;
import com.oracle.svm.core.layeredimagesingleton.LayeredPersistFlags;
import com.oracle.svm.core.option.APIOption;
import com.oracle.svm.core.option.AccumulatingLocatableMultiOptionValue;
import com.oracle.svm.core.option.HostedOptionKey;
Expand Down Expand Up @@ -231,12 +230,12 @@ static class LayeredCallbacks extends SingletonLayeredCallbacksSupplier {
public SingletonTrait getLayeredCallbacksTrait() {
var action = new SingletonLayeredCallbacks<RuntimeAssertionsSupport>() {
@Override
public LayeredImageSingleton.PersistFlags doPersist(ImageSingletonWriter writer, RuntimeAssertionsSupport singleton) {
public LayeredPersistFlags doPersist(ImageSingletonWriter writer, RuntimeAssertionsSupport singleton) {
persistAssertionStatus(writer, PACKAGE, singleton.packageAssertionStatus);
persistAssertionStatus(writer, CLASS, singleton.classAssertionStatus);
writer.writeInt(DEFAULT_ASSERTION_STATUS, singleton.defaultAssertionStatus ? 1 : 0);
writer.writeInt(SYSTEM_ASSERTION_STATUS, singleton.systemAssertionStatus ? 1 : 0);
return PersistFlags.CALLBACK_ON_REGISTRATION;
return LayeredPersistFlags.CALLBACK_ON_REGISTRATION;
}

private void persistAssertionStatus(ImageSingletonWriter writer, String type, Map<String, Boolean> assertionStatus) {
Expand Down
7 changes: 3 additions & 4 deletions substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateTargetDescription.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@
import com.oracle.svm.core.code.RuntimeCodeCache;
import com.oracle.svm.core.layeredimagesingleton.ImageSingletonLoader;
import com.oracle.svm.core.layeredimagesingleton.ImageSingletonWriter;
import com.oracle.svm.core.layeredimagesingleton.LayeredImageSingleton;
import com.oracle.svm.core.layeredimagesingleton.LayeredImageSingleton.PersistFlags;
import com.oracle.svm.core.layeredimagesingleton.LayeredPersistFlags;
import com.oracle.svm.core.traits.BuiltinTraits.AllAccess;
import com.oracle.svm.core.traits.SingletonLayeredCallbacks;
import com.oracle.svm.core.traits.SingletonLayeredCallbacksSupplier;
Expand Down Expand Up @@ -77,9 +76,9 @@ static class LayeredCallbacks extends SingletonLayeredCallbacksSupplier {
public SingletonTrait getLayeredCallbacksTrait() {
var action = new SingletonLayeredCallbacks<SubstrateTargetDescription>() {
@Override
public LayeredImageSingleton.PersistFlags doPersist(ImageSingletonWriter writer, SubstrateTargetDescription singleton) {
public LayeredPersistFlags doPersist(ImageSingletonWriter writer, SubstrateTargetDescription singleton) {
writer.writeStringList(RUNTIME_CHECKED_CPU_FEATURES, getCPUFeaturesList(singleton));
return PersistFlags.CALLBACK_ON_REGISTRATION;
return LayeredPersistFlags.CALLBACK_ON_REGISTRATION;
}

@Override
Expand Down
7 changes: 3 additions & 4 deletions substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/c/locale/LocaleSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@
import com.oracle.svm.core.jdk.UserSystemProperty;
import com.oracle.svm.core.layeredimagesingleton.ImageSingletonLoader;
import com.oracle.svm.core.layeredimagesingleton.ImageSingletonWriter;
import com.oracle.svm.core.layeredimagesingleton.LayeredImageSingleton;
import com.oracle.svm.core.layeredimagesingleton.LayeredImageSingleton.PersistFlags;
import com.oracle.svm.core.layeredimagesingleton.LayeredPersistFlags;
import com.oracle.svm.core.traits.BuiltinTraits.BuildtimeAccessOnly;
import com.oracle.svm.core.traits.SingletonLayeredCallbacks;
import com.oracle.svm.core.traits.SingletonLayeredCallbacksSupplier;
Expand Down Expand Up @@ -220,9 +219,9 @@ static class LayeredCallbacks extends SingletonLayeredCallbacksSupplier {
public SingletonTrait getLayeredCallbacksTrait() {
var action = new SingletonLayeredCallbacks<LocaleSupport>() {
@Override
public LayeredImageSingleton.PersistFlags doPersist(ImageSingletonWriter writer, LocaleSupport singleton) {
public LayeredPersistFlags doPersist(ImageSingletonWriter writer, LocaleSupport singleton) {
writer.writeString(LOCALE, getLocaleString(singleton.locale));
return PersistFlags.CALLBACK_ON_REGISTRATION;
return LayeredPersistFlags.CALLBACK_ON_REGISTRATION;
}

@Override
Expand Down
6 changes: 3 additions & 3 deletions substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/CodeInfoEncoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
import com.oracle.svm.core.jfr.HasJfrSupport;
import com.oracle.svm.core.layeredimagesingleton.ImageSingletonLoader;
import com.oracle.svm.core.layeredimagesingleton.ImageSingletonWriter;
import com.oracle.svm.core.layeredimagesingleton.LayeredImageSingleton;
import com.oracle.svm.core.layeredimagesingleton.LayeredPersistFlags;
import com.oracle.svm.core.meta.SharedField;
import com.oracle.svm.core.meta.SharedMethod;
import com.oracle.svm.core.meta.SharedType;
Expand Down Expand Up @@ -936,11 +936,11 @@ static class LayeredCallbacks extends SingletonLayeredCallbacksSupplier {
public SingletonTrait getLayeredCallbacksTrait() {
return new SingletonTrait(SingletonTraitKind.LAYERED_CALLBACKS, new SingletonLayeredCallbacks<MethodTableFirstIDTracker>() {
@Override
public LayeredImageSingleton.PersistFlags doPersist(ImageSingletonWriter writer, MethodTableFirstIDTracker singleton) {
public LayeredPersistFlags doPersist(ImageSingletonWriter writer, MethodTableFirstIDTracker singleton) {
int nextStartingId = singleton.nextStartingId;
assert nextStartingId > 0 : nextStartingId;
writer.writeInt("startingID", nextStartingId);
return LayeredImageSingleton.PersistFlags.CREATE;
return LayeredPersistFlags.CREATE;
}

@Override
Expand Down
7 changes: 4 additions & 3 deletions substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/code/ImageCodeInfoStorage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@
import com.oracle.svm.core.config.ConfigurationValues;
import com.oracle.svm.core.feature.AutomaticallyRegisteredFeature;
import com.oracle.svm.core.feature.InternalFeature;
import com.oracle.svm.core.layeredimagesingleton.FeatureSingleton;
import com.oracle.svm.core.layeredimagesingleton.UnsavedSingleton;
import com.oracle.svm.core.traits.BuiltinTraits.BuildtimeAccessOnly;
import com.oracle.svm.core.traits.BuiltinTraits.NoLayeredCallbacks;
import com.oracle.svm.core.traits.BuiltinTraits.RuntimeAccessOnly;
import com.oracle.svm.core.traits.SingletonLayeredInstallationKind.Independent;
import com.oracle.svm.core.traits.SingletonLayeredInstallationKind.MultiLayer;
import com.oracle.svm.core.traits.SingletonTraits;

Expand Down Expand Up @@ -81,7 +81,8 @@ public CodeInfoImpl getCodeInfo() {
}

@AutomaticallyRegisteredFeature
class ImageCodeInfoStorageFeature implements InternalFeature, UnsavedSingleton, FeatureSingleton {
@SingletonTraits(access = BuildtimeAccessOnly.class, layeredCallbacks = NoLayeredCallbacks.class, layeredInstallationKind = Independent.class)
class ImageCodeInfoStorageFeature implements InternalFeature {
@Override
public void duringSetup(DuringSetupAccess access) {
ImageSingletons.add(ImageCodeInfoStorage.class, new ImageCodeInfoStorage());
Expand Down
6 changes: 3 additions & 3 deletions substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/config/ObjectLayout.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
import com.oracle.svm.core.config.ObjectLayout.LayeredCallbacks;
import com.oracle.svm.core.layeredimagesingleton.ImageSingletonLoader;
import com.oracle.svm.core.layeredimagesingleton.ImageSingletonWriter;
import com.oracle.svm.core.layeredimagesingleton.LayeredImageSingleton.PersistFlags;
import com.oracle.svm.core.layeredimagesingleton.LayeredPersistFlags;
import com.oracle.svm.core.traits.BuiltinTraits.AllAccess;
import com.oracle.svm.core.traits.SingletonLayeredCallbacks;
import com.oracle.svm.core.traits.SingletonLayeredCallbacksSupplier;
Expand Down Expand Up @@ -342,10 +342,10 @@ static class LayeredCallbacks extends SingletonLayeredCallbacksSupplier {
public SingletonTrait getLayeredCallbacksTrait() {
var action = new SingletonLayeredCallbacks<ObjectLayout>() {
@Override
public PersistFlags doPersist(ImageSingletonWriter writer, ObjectLayout singleton) {
public LayeredPersistFlags doPersist(ImageSingletonWriter writer, ObjectLayout singleton) {
List<Integer> currentValues = singleton.getCurrentValues();
writer.writeIntList("priorValues", currentValues);
return PersistFlags.CALLBACK_ON_REGISTRATION;
return LayeredPersistFlags.CALLBACK_ON_REGISTRATION;
}

@Override
Expand Down
6 changes: 3 additions & 3 deletions substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/graal/meta/KnownOffsets.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
import com.oracle.svm.core.imagelayer.ImageLayerBuildingSupport;
import com.oracle.svm.core.layeredimagesingleton.ImageSingletonLoader;
import com.oracle.svm.core.layeredimagesingleton.ImageSingletonWriter;
import com.oracle.svm.core.layeredimagesingleton.LayeredImageSingleton;
import com.oracle.svm.core.layeredimagesingleton.LayeredPersistFlags;
import com.oracle.svm.core.traits.BuiltinTraits.BuildtimeAccessOnly;
import com.oracle.svm.core.traits.SingletonLayeredCallbacks;
import com.oracle.svm.core.traits.SingletonLayeredCallbacksSupplier;
Expand Down Expand Up @@ -175,9 +175,9 @@ static class LayeredCallbacks extends SingletonLayeredCallbacksSupplier {
public SingletonTrait getLayeredCallbacksTrait() {
return new SingletonTrait(SingletonTraitKind.LAYERED_CALLBACKS, new SingletonLayeredCallbacks<PriorKnownOffsets>() {
@Override
public LayeredImageSingleton.PersistFlags doPersist(ImageSingletonWriter writer, PriorKnownOffsets singleton) {
public LayeredPersistFlags doPersist(ImageSingletonWriter writer, PriorKnownOffsets singleton) {
writer.writeIntList("priorValues", Arrays.stream(singleton.priorValues).boxed().toList());
return LayeredImageSingleton.PersistFlags.CREATE;
return LayeredPersistFlags.CREATE;
}

@Override
Expand Down
6 changes: 3 additions & 3 deletions substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/GCCause.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
import com.oracle.svm.core.imagelayer.ImageLayerBuildingSupport;
import com.oracle.svm.core.layeredimagesingleton.ImageSingletonLoader;
import com.oracle.svm.core.layeredimagesingleton.ImageSingletonWriter;
import com.oracle.svm.core.layeredimagesingleton.LayeredImageSingleton;
import com.oracle.svm.core.layeredimagesingleton.LayeredPersistFlags;
import com.oracle.svm.core.traits.BuiltinTraits.AllAccess;
import com.oracle.svm.core.traits.BuiltinTraits.SingleLayer;
import com.oracle.svm.core.traits.SingletonLayeredCallbacks;
Expand Down Expand Up @@ -186,7 +186,7 @@ static class LayeredCallbacks extends SingletonLayeredCallbacksSupplier {
public SingletonTrait getLayeredCallbacksTrait() {
return new SingletonTrait(SingletonTraitKind.LAYERED_CALLBACKS, new SingletonLayeredCallbacks<GCCauseFeature>() {
@Override
public LayeredImageSingleton.PersistFlags doPersist(ImageSingletonWriter writer, GCCauseFeature singleton) {
public LayeredPersistFlags doPersist(ImageSingletonWriter writer, GCCauseFeature singleton) {
List<String> gcCauses;
if (ImageLayerBuildingSupport.buildingInitialLayer()) {
gcCauses = GCCause.getGCCauses().stream().map(gcCause -> {
Expand All @@ -202,7 +202,7 @@ public LayeredImageSingleton.PersistFlags doPersist(ImageSingletonWriter writer,
}
writer.writeStringList("registeredGCCauses", gcCauses);

return LayeredImageSingleton.PersistFlags.CALLBACK_ON_REGISTRATION;
return LayeredPersistFlags.CALLBACK_ON_REGISTRATION;
}

@Override
Expand Down
6 changes: 3 additions & 3 deletions substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/ClassForNameSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@
import com.oracle.svm.core.hub.registry.ClassRegistries;
import com.oracle.svm.core.layeredimagesingleton.ImageSingletonLoader;
import com.oracle.svm.core.layeredimagesingleton.ImageSingletonWriter;
import com.oracle.svm.core.layeredimagesingleton.LayeredImageSingleton;
import com.oracle.svm.core.layeredimagesingleton.LayeredImageSingletonSupport;
import com.oracle.svm.core.layeredimagesingleton.LayeredPersistFlags;
import com.oracle.svm.core.layeredimagesingleton.MultiLayeredImageSingleton;
import com.oracle.svm.core.metadata.MetadataTracer;
import com.oracle.svm.core.option.HostedOptionKey;
Expand Down Expand Up @@ -514,7 +514,7 @@ public SingletonTrait getLayeredCallbacksTrait() {
return new SingletonTrait(SingletonTraitKind.LAYERED_CALLBACKS, new SingletonLayeredCallbacks<ClassForNameSupport>() {

@Override
public LayeredImageSingleton.PersistFlags doPersist(ImageSingletonWriter writer, ClassForNameSupport singleton) {
public LayeredPersistFlags doPersist(ImageSingletonWriter writer, ClassForNameSupport singleton) {
List<String> classNames = new ArrayList<>();
List<Boolean> classStates = new ArrayList<>();
Set<String> unsafeNames = new HashSet<>(singleton.previousLayerUnsafe);
Expand Down Expand Up @@ -549,7 +549,7 @@ public LayeredImageSingleton.PersistFlags doPersist(ImageSingletonWriter writer,
*/
writer.writeInt(RESPECTS_CLASS_LOADER, respectClassLoader() ? 1 : 0);

return LayeredImageSingleton.PersistFlags.CREATE;
return LayeredPersistFlags.CREATE;
}

@Override
Expand Down
6 changes: 3 additions & 3 deletions ...c/com.oracle.svm.core/src/com/oracle/svm/core/hub/LayeredReflectionMetadataSingleton.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
import com.oracle.svm.core.imagelayer.BuildingImageLayerPredicate;
import com.oracle.svm.core.layeredimagesingleton.ImageSingletonLoader;
import com.oracle.svm.core.layeredimagesingleton.ImageSingletonWriter;
import com.oracle.svm.core.layeredimagesingleton.LayeredImageSingleton;
import com.oracle.svm.core.layeredimagesingleton.LayeredImageSingletonSupport;
import com.oracle.svm.core.layeredimagesingleton.LayeredPersistFlags;
import com.oracle.svm.core.layeredimagesingleton.MultiLayeredImageSingleton;
import com.oracle.svm.core.traits.BuiltinTraits;
import com.oracle.svm.core.traits.SingletonLayeredCallbacks;
Expand Down Expand Up @@ -123,7 +123,7 @@ public SingletonTrait getLayeredCallbacksTrait() {
return new SingletonTrait(SingletonTraitKind.LAYERED_CALLBACKS, new SingletonLayeredCallbacks<LayeredReflectionMetadataSingleton>() {

@Override
public LayeredImageSingleton.PersistFlags doPersist(ImageSingletonWriter writer, LayeredReflectionMetadataSingleton singleton) {
public LayeredPersistFlags doPersist(ImageSingletonWriter writer, LayeredReflectionMetadataSingleton singleton) {
List<Integer> hubs = new ArrayList<>();
List<Integer> classFlagsList = new ArrayList<>();

Expand All @@ -148,7 +148,7 @@ public LayeredImageSingleton.PersistFlags doPersist(ImageSingletonWriter writer,
writer.writeIntList(LAYERED_REFLECTION_METADATA_HUBS, hubs);
writer.writeIntList(LAYERED_REFLECTION_METADATA_CLASS_FLAGS, classFlagsList);

return LayeredImageSingleton.PersistFlags.CREATE;
return LayeredPersistFlags.CREATE;
}

@Override
Expand Down
6 changes: 3 additions & 3 deletions substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Resources.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@
import com.oracle.svm.core.jdk.resources.CompressedGlobTrie.GlobTrieNode;
import com.oracle.svm.core.layeredimagesingleton.ImageSingletonLoader;
import com.oracle.svm.core.layeredimagesingleton.ImageSingletonWriter;
import com.oracle.svm.core.layeredimagesingleton.LayeredImageSingleton;
import com.oracle.svm.core.layeredimagesingleton.LayeredImageSingletonSupport;
import com.oracle.svm.core.layeredimagesingleton.LayeredPersistFlags;
import com.oracle.svm.core.layeredimagesingleton.MultiLayeredImageSingleton;
import com.oracle.svm.core.metadata.MetadataTracer;
import com.oracle.svm.core.traits.BuiltinTraits.AllAccess;
Expand Down Expand Up @@ -755,7 +755,7 @@ public SingletonTrait getLayeredCallbacksTrait() {
return new SingletonTrait(SingletonTraitKind.LAYERED_CALLBACKS, new SingletonLayeredCallbacks<Resources>() {

@Override
public LayeredImageSingleton.PersistFlags doPersist(ImageSingletonWriter writer, Resources singleton) {
public LayeredPersistFlags doPersist(ImageSingletonWriter writer, Resources singleton) {
List<String> resourceKeys = new ArrayList<>();
List<Boolean> resourceRegistrationStates = new ArrayList<>();
Set<String> patterns = new HashSet<>(singleton.previousLayerPatterns);
Expand Down Expand Up @@ -785,7 +785,7 @@ public LayeredImageSingleton.PersistFlags doPersist(ImageSingletonWriter writer,
writer.writeBoolList(RESOURCE_REGISTRATION_STATES, resourceRegistrationStates);
writer.writeStringList(PATTERNS, patterns.stream().toList());

return LayeredImageSingleton.PersistFlags.CREATE;
return LayeredPersistFlags.CREATE;
}

@Override
Expand Down
Loading