Make SystemPropertiesSupport.singleton() use ImageSingletons.lookup(SystemPropertiesSupport.class) for now

Author: olpaw

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

@@ -133,6 +133,6 @@ class DarwinSystemPropertiesFeature implements InternalFeature {
     public void duringSetup(DuringSetupAccess access) {
         ImageSingletons.add(RuntimeSystemPropertiesSupport.class, new DarwinSystemPropertiesSupport());
         /* GR-42971 - Remove once SystemPropertiesSupport.class ImageSingletons use is gone. */
-        ImageSingletons.add(SystemPropertiesSupport.class, SystemPropertiesSupport.singleton());
+        ImageSingletons.add(SystemPropertiesSupport.class, (SystemPropertiesSupport) ImageSingletons.lookup(RuntimeSystemPropertiesSupport.class));
     }
 }

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

@@ -95,6 +95,6 @@ class LinuxSystemPropertiesFeature implements InternalFeature {
     public void duringSetup(DuringSetupAccess access) {
         ImageSingletons.add(RuntimeSystemPropertiesSupport.class, new LinuxSystemPropertiesSupport());
         /* GR-42971 - Remove once SystemPropertiesSupport.class ImageSingletons use is gone. */
-        ImageSingletons.add(SystemPropertiesSupport.class, SystemPropertiesSupport.singleton());
+        ImageSingletons.add(SystemPropertiesSupport.class, (SystemPropertiesSupport) ImageSingletons.lookup(RuntimeSystemPropertiesSupport.class));
     }
 }

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

@@ -393,6 +393,6 @@ class WindowsSystemPropertiesFeature implements InternalFeature {
     public void duringSetup(DuringSetupAccess access) {
         ImageSingletons.add(RuntimeSystemPropertiesSupport.class, new WindowsSystemPropertiesSupport());
         /* GR-42971 - Remove once SystemPropertiesSupport.class ImageSingletons use is gone. */
-        ImageSingletons.add(SystemPropertiesSupport.class, SystemPropertiesSupport.singleton());
+        ImageSingletons.add(SystemPropertiesSupport.class, (SystemPropertiesSupport) ImageSingletons.lookup(RuntimeSystemPropertiesSupport.class));
     }
 }

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

@@ -92,7 +92,7 @@ public abstract class SystemPropertiesSupport implements RuntimeSystemProperties
 
     @Fold
     public static SystemPropertiesSupport singleton() {
-        return (SystemPropertiesSupport) ImageSingletons.lookup(RuntimeSystemPropertiesSupport.class);
+        return ImageSingletons.lookup(SystemPropertiesSupport.class);
     }
 
     @Platforms(Platform.HOSTED_ONLY.class)