Provide com.oracle.svm.core.jdk.SystemInOutErrFeature backward compatibility

Author: olpaw

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

@@ -63,27 +63,32 @@ private static PrintStream newPrintStream(FileOutputStream fos, String enc) {
         return new PrintStream(new BufferedOutputStream(fos, 128), true);
     }
 
-    public static InputStream in() {
-        return ImageSingletons.lookup(SystemInOutErrSupport.class).in;
+    public InputStream in() {
+        return in;
     }
 
     public static void setIn(InputStream in) {
         ImageSingletons.lookup(SystemInOutErrSupport.class).in = Objects.requireNonNull(in);
     }
 
-    public static PrintStream out() {
-        return ImageSingletons.lookup(SystemInOutErrSupport.class).out;
+    public PrintStream out() {
+        return out;
     }
 
     public static void setOut(PrintStream out) {
         ImageSingletons.lookup(SystemInOutErrSupport.class).out = Objects.requireNonNull(out);
     }
 
-    public static PrintStream err() {
-        return ImageSingletons.lookup(SystemInOutErrSupport.class).err;
+    public PrintStream err() {
+        return err;
     }
 
     public static void setErr(PrintStream err) {
         ImageSingletons.lookup(SystemInOutErrSupport.class).err = Objects.requireNonNull(err);
     }
 }
+
+@SuppressWarnings("unused")
+class SystemInOutErrFeature implements Feature {
+    /* Dummy for backward compatibility. */
+}

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/SystemInOutErrFeature.java

@@ -48,11 +48,17 @@ public class SystemInOutErrFeature implements Feature {
     private final PrintStream hostedOut = System.out;
     private final PrintStream hostedErr = System.err;
 
+    private SystemInOutErrSupport runtime;
+
+    @Override
+    public void afterRegistration(AfterRegistrationAccess access) {
+        runtime = new SystemInOutErrSupport();
+        ImageSingletons.add(SystemInOutErrSupport.class, runtime);
+    }
+
     @Override
     public void duringSetup(DuringSetupAccess access) {
         NativeImageSystemIOWrappers.singleton().verifySystemOutErrReplacement();
-
-        ImageSingletons.add(SystemInOutErrSupport.class, new SystemInOutErrSupport());
         access.registerObjectReplacer(this::replaceStreams);
     }
 
@@ -63,11 +69,11 @@ public void cleanup() {
 
     Object replaceStreams(Object object) {
         if (object == hostedIn) {
-            return SystemInOutErrSupport.in();
+            return runtime.in();
         } else if (object == hostedOut) {
-            return SystemInOutErrSupport.out();
+            return runtime.out();
         } else if (object == hostedErr) {
-            return SystemInOutErrSupport.err();
+            return runtime.err();
         } else {
             return object;
         }