moved implementation of LibGraalRuntimeSupport into its own class

Author: dougxc

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

@@ -28,13 +28,10 @@
 import java.util.Objects;
 import java.util.concurrent.atomic.AtomicReference;
 
-import com.oracle.svm.core.heap.Heap;
-import jdk.graal.nativeimage.impl.LibGraalRuntimeSupport;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.nativeimage.VMRuntime;
-import org.graalvm.nativeimage.impl.IsolateSupport;
 import org.graalvm.nativeimage.impl.VMRuntimeSupport;
 
 import com.oracle.svm.core.IsolateArgumentParser;
@@ -45,28 +42,8 @@
 
 import jdk.graal.compiler.api.replacements.Fold;
 
-@AutomaticallyRegisteredImageSingleton({VMRuntimeSupport.class, RuntimeSupport.class, LibGraalRuntimeSupport.class})
-public final class RuntimeSupport implements VMRuntimeSupport, LibGraalRuntimeSupport {
-
-    @Override
-    public void processReferences() {
-        Heap.getHeap().doReferenceHandling();
-    }
-
-    @Override
-    public void notifyLowMemoryPoint(boolean suggestFullGC) {
-        Heap.getHeap().getGC().collectionHint(suggestFullGC);
-    }
-
-    @Override
-    public long getIsolateID() {
-        return ImageSingletons.lookup(IsolateSupport.class).getIsolateID();
-    }
-
-    @Override
-    public void fatalError(String message) {
-        throw VMError.shouldNotReachHere(message);
-    }
+@AutomaticallyRegisteredImageSingleton({VMRuntimeSupport.class, RuntimeSupport.class})
+public final class RuntimeSupport implements VMRuntimeSupport {
 
     @FunctionalInterface
     public interface Hook {

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/libgraal/LibGraalRuntimeSupportImpl.java

@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2025, 2025, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.oracle.svm.core.libgraal;
+
+import org.graalvm.nativeimage.ImageSingletons;
+import org.graalvm.nativeimage.impl.IsolateSupport;
+
+import com.oracle.svm.core.feature.AutomaticallyRegisteredImageSingleton;
+import com.oracle.svm.core.heap.Heap;
+import com.oracle.svm.core.util.VMError;
+
+import jdk.graal.nativeimage.impl.LibGraalRuntimeSupport;
+
+@AutomaticallyRegisteredImageSingleton({LibGraalRuntimeSupport.class})
+public final class LibGraalRuntimeSupportImpl implements LibGraalRuntimeSupport {
+
+    @Override
+    public void processReferences() {
+        Heap.getHeap().doReferenceHandling();
+    }
+
+    @Override
+    public void notifyLowMemoryPoint(boolean suggestFullGC) {
+        Heap.getHeap().getGC().collectionHint(suggestFullGC);
+    }
+
+    @Override
+    public long getIsolateID() {
+        return ImageSingletons.lookup(IsolateSupport.class).getIsolateID();
+    }
+
+    @Override
+    public void fatalError(String message) {
+        throw VMError.shouldNotReachHere(message);
+    }
+}