Only register RuntimeSystemPropertiesSupport.class in ImageSingletons

Author: olpaw

substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/darwin/DarwinSystemPropertiesSupport.java

@@ -38,7 +38,6 @@
 import com.oracle.svm.core.feature.InternalFeature;
 import com.oracle.svm.core.graal.stackvalue.UnsafeStackValue;
 import com.oracle.svm.core.headers.LibC;
-import com.oracle.svm.core.jdk.SystemPropertiesSupport;
 import com.oracle.svm.core.posix.PosixSystemPropertiesSupport;
 import com.oracle.svm.core.posix.headers.Limits;
 import com.oracle.svm.core.posix.headers.Stdlib;
@@ -132,7 +131,6 @@ class DarwinSystemPropertiesFeature implements InternalFeature {
     @Override
     public void duringSetup(DuringSetupAccess access) {
         DarwinSystemPropertiesSupport systemPropertiesSupport = new DarwinSystemPropertiesSupport();
-        ImageSingletons.add(SystemPropertiesSupport.class, systemPropertiesSupport);
         ImageSingletons.add(RuntimeSystemPropertiesSupport.class, systemPropertiesSupport);
     }
 }

substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/linux/LinuxSystemPropertiesSupport.java

@@ -33,7 +33,6 @@
 import com.oracle.svm.core.feature.AutomaticallyRegisteredFeature;
 import com.oracle.svm.core.feature.InternalFeature;
 import com.oracle.svm.core.graal.stackvalue.UnsafeStackValue;
-import com.oracle.svm.core.jdk.SystemPropertiesSupport;
 import com.oracle.svm.core.posix.PosixSystemPropertiesSupport;
 import com.oracle.svm.core.posix.headers.Stdlib;
 import com.oracle.svm.core.posix.headers.Utsname;
@@ -94,7 +93,6 @@ class LinuxSystemPropertiesFeature implements InternalFeature {
     @Override
     public void duringSetup(DuringSetupAccess access) {
         LinuxSystemPropertiesSupport systemPropertiesSupport = new LinuxSystemPropertiesSupport();
-        ImageSingletons.add(SystemPropertiesSupport.class, systemPropertiesSupport);
         ImageSingletons.add(RuntimeSystemPropertiesSupport.class, systemPropertiesSupport);
     }
 }

substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/WindowsSystemPropertiesSupport.java

@@ -392,7 +392,6 @@ class WindowsSystemPropertiesFeature implements InternalFeature {
     @Override
     public void duringSetup(DuringSetupAccess access) {
         WindowsSystemPropertiesSupport systemPropertiesSupport = new WindowsSystemPropertiesSupport();
-        ImageSingletons.add(SystemPropertiesSupport.class, systemPropertiesSupport);
         ImageSingletons.add(RuntimeSystemPropertiesSupport.class, systemPropertiesSupport);
     }
 }

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/FileSystemProviderSupport.java

@@ -379,7 +379,7 @@ private static synchronized void reinitialize(Target_sun_nio_fs_WindowsFileSyste
             return;
         }
         that.needsReinitialization = NeedsReinitializationProvider.STATUS_IN_REINITIALIZATION;
-        that.originalConstructor(that.provider, ImageSingletons.lookup(SystemPropertiesSupport.class).userDir());
+        that.originalConstructor(that.provider, SystemPropertiesSupport.singleton().userDir());
         that.needsReinitialization = NeedsReinitializationProvider.STATUS_REINITIALIZED;
     }
 }
@@ -433,7 +433,7 @@ static String getUserDir(Target_java_io_FileSystem that) {
          */
         return Platform.includedIn(Platform.WINDOWS.class)
                         ? that.normalize(System.getProperty("user.dir"))
-                        : ImageSingletons.lookup(SystemPropertiesSupport.class).userDir();
+                        : SystemPropertiesSupport.singleton().userDir();
     }
 }
 

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JVMCISubstitutions.java

@@ -27,7 +27,6 @@
 import java.util.Map;
 import java.util.function.BooleanSupplier;
 
-import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 
@@ -54,7 +53,7 @@ public boolean getAsBoolean() {
 final class Target_jdk_vm_ci_services_Services {
     @Substitute
     public static Map<String, String> getSavedProperties() {
-        return ImageSingletons.lookup(SystemPropertiesSupport.class).getSavedProperties();
+        return SystemPropertiesSupport.singleton().getSavedProperties();
     }
 }
 

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JavaLangSubstitutions.java

@@ -305,30 +305,30 @@ private static int identityHashCode(Object obj) {
 
     @Substitute
     private static Properties getProperties() {
-        return ImageSingletons.lookup(SystemPropertiesSupport.class).getProperties();
+        return SystemPropertiesSupport.singleton().getProperties();
     }
 
     @Substitute
     private static void setProperties(Properties props) {
-        ImageSingletons.lookup(SystemPropertiesSupport.class).setProperties(props);
+        SystemPropertiesSupport.singleton().setProperties(props);
     }
 
     @Substitute
     public static String setProperty(String key, String value) {
         checkKey(key);
-        return ImageSingletons.lookup(SystemPropertiesSupport.class).setProperty(key, value);
+        return SystemPropertiesSupport.singleton().setProperty(key, value);
     }
 
     @Substitute
     private static String getProperty(String key) {
         checkKey(key);
-        return ImageSingletons.lookup(SystemPropertiesSupport.class).getProperty(key);
+        return SystemPropertiesSupport.singleton().getProperty(key);
     }
 
     @Substitute
     public static String clearProperty(String key) {
         checkKey(key);
-        return ImageSingletons.lookup(SystemPropertiesSupport.class).clearProperty(key);
+        return SystemPropertiesSupport.singleton().clearProperty(key);
     }
 
     @Substitute

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/SystemPropertiesSupport.java

@@ -30,6 +30,7 @@
 import java.util.Properties;
 import java.util.function.Supplier;
 
+import org.graalvm.compiler.api.replacements.Fold;
 import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
 import org.graalvm.nativeimage.ImageInfo;
 import org.graalvm.nativeimage.ImageSingletons;
@@ -89,6 +90,11 @@ public abstract class SystemPropertiesSupport implements RuntimeSystemProperties
 
     private volatile boolean fullyInitialized;
 
+    @Fold
+    public static SystemPropertiesSupport singleton() {
+        return (SystemPropertiesSupport) ImageSingletons.lookup(RuntimeSystemPropertiesSupport.class);
+    }
+
     @Platforms(Platform.HOSTED_ONLY.class)
     protected SystemPropertiesSupport() {
         properties = new Properties();

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Target_jdk_internal_misc_VM.java

@@ -26,19 +26,17 @@
 
 import java.util.Map;
 
-import org.graalvm.nativeimage.ImageSingletons;
-
+import com.oracle.svm.core.NeverInline;
 import com.oracle.svm.core.SubstrateOptions;
+import com.oracle.svm.core.Uninterruptible;
 import com.oracle.svm.core.annotate.Alias;
 import com.oracle.svm.core.annotate.AnnotateOriginal;
 import com.oracle.svm.core.annotate.Delete;
 import com.oracle.svm.core.annotate.InjectAccessors;
-import com.oracle.svm.core.NeverInline;
 import com.oracle.svm.core.annotate.RecomputeFieldValue;
 import com.oracle.svm.core.annotate.RecomputeFieldValue.Kind;
 import com.oracle.svm.core.annotate.Substitute;
 import com.oracle.svm.core.annotate.TargetClass;
-import com.oracle.svm.core.Uninterruptible;
 import com.oracle.svm.core.snippets.KnownIntrinsics;
 
 import jdk.internal.misc.Unsafe;
@@ -51,7 +49,7 @@ public final class Target_jdk_internal_misc_VM {
 
     @Substitute
     public static String getSavedProperty(String name) {
-        return ImageSingletons.lookup(SystemPropertiesSupport.class).getSavedProperties().get(name);
+        return SystemPropertiesSupport.singleton().getSavedProperties().get(name);
     }
 
     @AnnotateOriginal

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Target_jdk_internal_util_StaticProperty.java

@@ -27,8 +27,6 @@
 import java.nio.charset.Charset;
 import java.util.function.BooleanSupplier;
 
-import org.graalvm.nativeimage.ImageSingletons;
-
 import com.oracle.svm.core.annotate.Substitute;
 import com.oracle.svm.core.annotate.TargetClass;
 import com.oracle.svm.core.annotate.TargetElement;
@@ -56,47 +54,47 @@ private static String javaHome() {
 
     @Substitute
     private static String userHome() {
-        return ImageSingletons.lookup(SystemPropertiesSupport.class).userHome();
+        return SystemPropertiesSupport.singleton().userHome();
     }
 
     @Substitute
     private static String userDir() {
-        return ImageSingletons.lookup(SystemPropertiesSupport.class).userDir();
+        return SystemPropertiesSupport.singleton().userDir();
     }
 
     @Substitute
     private static String userName() {
-        return ImageSingletons.lookup(SystemPropertiesSupport.class).userName();
+        return SystemPropertiesSupport.singleton().userName();
     }
 
     @Substitute
     @TargetElement(onlyWith = JDK17OrLater.class)
     private static String javaIoTmpDir() {
-        return ImageSingletons.lookup(SystemPropertiesSupport.class).javaIoTmpDir();
+        return SystemPropertiesSupport.singleton().javaIoTmpDir();
     }
 
     @Substitute
     @TargetElement(onlyWith = JDK17OrLater.class)
     private static String javaLibraryPath() {
-        return ImageSingletons.lookup(SystemPropertiesSupport.class).javaLibraryPath();
+        return SystemPropertiesSupport.singleton().javaLibraryPath();
     }
 
     @Substitute
     @TargetElement(onlyWith = JDK17OrLater.class)
     private static String sunBootLibraryPath() {
-        String value = ImageSingletons.lookup(SystemPropertiesSupport.class).savedProperties.get("sun.boot.library.path");
+        String value = SystemPropertiesSupport.singleton().savedProperties.get("sun.boot.library.path");
         return value == null ? "" : value;
     }
 
     @Substitute
     private static String jdkSerialFilter() {
-        return ImageSingletons.lookup(SystemPropertiesSupport.class).savedProperties.get("jdk.serialFilter");
+        return SystemPropertiesSupport.singleton().savedProperties.get("jdk.serialFilter");
     }
 
     @Substitute
     @TargetElement(onlyWith = StaticPropertyJdkSerialFilterFactoryAvailable.class)
     private static String jdkSerialFilterFactory() {
-        return ImageSingletons.lookup(SystemPropertiesSupport.class).savedProperties.get("jdk.serialFilterFactory");
+        return SystemPropertiesSupport.singleton().savedProperties.get("jdk.serialFilterFactory");
     }
 
     private abstract static class StaticPropertyMethodAvailable implements BooleanSupplier {
@@ -127,31 +125,31 @@ protected StaticPropertyJdkSerialFilterFactoryAvailable() {
     @Substitute
     @TargetElement(onlyWith = JDK17OrLater.class)
     public static String nativeEncoding() {
-        return ImageSingletons.lookup(SystemPropertiesSupport.class).savedProperties.get("native.encoding");
+        return SystemPropertiesSupport.singleton().savedProperties.get("native.encoding");
     }
 
     @Substitute
     @TargetElement(onlyWith = JDK19OrLater.class)
     public static String fileEncoding() {
-        return ImageSingletons.lookup(SystemPropertiesSupport.class).savedProperties.get("file.encoding");
+        return SystemPropertiesSupport.singleton().savedProperties.get("file.encoding");
     }
 
     @Substitute
     @TargetElement(onlyWith = JDK19OrLater.class)
     public static String javaPropertiesDate() {
-        return ImageSingletons.lookup(SystemPropertiesSupport.class).savedProperties.getOrDefault("java.properties.date", null);
+        return SystemPropertiesSupport.singleton().savedProperties.getOrDefault("java.properties.date", null);
     }
 
     @Substitute
     @TargetElement(onlyWith = JDK19OrLater.class)
     public static String jnuEncoding() {
-        return ImageSingletons.lookup(SystemPropertiesSupport.class).savedProperties.get("sun.jnu.encoding");
+        return SystemPropertiesSupport.singleton().savedProperties.get("sun.jnu.encoding");
     }
 
     @Substitute
     @TargetElement(onlyWith = JDK19OrLater.class)
     public static Charset jnuCharset() {
-        String jnuEncoding = ImageSingletons.lookup(SystemPropertiesSupport.class).savedProperties.get("sun.jnu.encoding");
+        String jnuEncoding = SystemPropertiesSupport.singleton().savedProperties.get("sun.jnu.encoding");
         return Target_java_nio_charset_Charset.forName(jnuEncoding, Charset.defaultCharset());
     }
 }

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/properties/RuntimePropertyParser.java

@@ -26,8 +26,6 @@
 
 import java.util.Arrays;
 
-import org.graalvm.nativeimage.ImageSingletons;
-
 import com.oracle.svm.core.jdk.SystemPropertiesSupport;
 
 public final class RuntimePropertyParser {
@@ -69,7 +67,7 @@ private static boolean parseProperty(String property) {
         String key = property.substring(0, splitIndex);
         String value = property.substring(splitIndex + 1);
 
-        ImageSingletons.lookup(SystemPropertiesSupport.class).initializeProperty(key, value);
+        SystemPropertiesSupport.singleton().initializeProperty(key, value);
 
         return true;
     }