[GR-63451] Move LibGraalLoader to org.graalvm.nativeimage.hosted

PullRequest: graal/20376

Author: dougxc

compiler/src/jdk.graal.compiler.libgraal.loader/src/jdk/graal/compiler/libgraal/loader/HostedLibGraalClassLoader.java

@@ -54,7 +54,7 @@
 
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
-import org.graalvm.nativeimage.libgraal.LibGraalLoader;
+import org.graalvm.nativeimage.libgraal.hosted.LibGraalLoader;
 
 import jdk.internal.jimage.BasicImageReader;
 import jdk.internal.module.ModulePath;

compiler/src/jdk.graal.compiler.libgraal/src/jdk/graal/compiler/libgraal/LibGraalClassLoader.java

@@ -25,10 +25,11 @@
 package jdk.graal.compiler.libgraal;
 
 import org.graalvm.nativeimage.hosted.Feature.DuringSetupAccess;
+import org.graalvm.nativeimage.libgraal.hosted.LibGraalLoader;
 
 /**
  * The image runtime class loader that {@linkplain DuringSetupAccess#registerObjectReplacer
- * replaces} the build-time instance of the {@link org.graalvm.nativeimage.libgraal.LibGraalLoader}.
+ * replaces} the build-time instance of the {@link LibGraalLoader}.
  */
 final class LibGraalClassLoader extends ClassLoader {
 

compiler/src/jdk.graal.compiler.libgraal/src/jdk/graal/compiler/libgraal/LibGraalFeature.java

@@ -59,7 +59,7 @@
 import org.graalvm.nativeimage.hosted.FieldValueTransformer;
 import org.graalvm.nativeimage.hosted.RuntimeClassInitialization;
 import org.graalvm.nativeimage.hosted.RuntimeReflection;
-import org.graalvm.nativeimage.libgraal.LibGraalLoader;
+import org.graalvm.nativeimage.libgraal.hosted.LibGraalLoader;
 
 import jdk.graal.compiler.core.common.Fields;
 import jdk.graal.compiler.core.common.LibGraalSupport.HostedOnly;

compiler/src/jdk.graal.compiler.libgraal/src/jdk/graal/compiler/libgraal/LibGraalSupportImpl.java

@@ -48,7 +48,7 @@
 import org.graalvm.nativeimage.RuntimeOptions;
 import org.graalvm.nativeimage.StackValue;
 import org.graalvm.nativeimage.VMRuntime;
-import org.graalvm.nativeimage.libgraal.LibGraalLoader;
+import org.graalvm.nativeimage.libgraal.hosted.LibGraalLoader;
 import org.graalvm.nativeimage.libgraal.LibGraalRuntime;
 import org.graalvm.nativeimage.libgraal.hosted.GlobalData;
 

sdk/src/org.graalvm.nativeimage.libgraal/snapshot.sigtest

@@ -1,9 +1,6 @@
 #Signature file v4.1
 #Version
 
-CLSS public abstract interface org.graalvm.nativeimage.libgraal.LibGraalLoader
-meth public abstract java.util.Map getClassModuleMap()
-
 CLSS public final org.graalvm.nativeimage.libgraal.LibGraalRuntime
 meth public static long getIsolateID()
 meth public static void notifyLowMemoryPoint(boolean)
@@ -15,6 +12,9 @@ CLSS public final org.graalvm.nativeimage.libgraal.hosted.GlobalData
 meth public static java.util.function.Supplier<java.lang.Long> createGlobal(long)
 supr java.lang.Object
 
+CLSS public abstract interface org.graalvm.nativeimage.libgraal.hosted.LibGraalLoader
+meth public abstract java.util.Map getClassModuleMap()
+
 CLSS public java.lang.Object
 cons public init()
 meth protected java.lang.Object clone() throws java.lang.CloneNotSupportedException

sdk/src/org.graalvm.nativeimage.libgraal/src/org/graalvm/nativeimage/libgraal/LibGraalLoader.java renamed to sdk/src/org.graalvm.nativeimage.libgraal/src/org/graalvm/nativeimage/libgraal/hosted/LibGraalLoader.java

@@ -38,7 +38,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package org.graalvm.nativeimage.libgraal;
+package org.graalvm.nativeimage.libgraal.hosted;
+
+import org.graalvm.nativeimage.Platform;
+import org.graalvm.nativeimage.Platforms;
 
 import java.util.Map;
 
@@ -48,6 +51,7 @@
  *
  * @since 25
  */
+@Platforms(Platform.HOSTED_ONLY.class)
 public interface LibGraalLoader {
 
     /**

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ClassLoaderFeature.java

@@ -41,7 +41,7 @@
 import com.oracle.svm.hosted.jdk.HostedClassLoaderPackageManagement;
 import com.oracle.svm.util.ReflectionUtil;
 
-import org.graalvm.nativeimage.libgraal.LibGraalLoader;
+import org.graalvm.nativeimage.libgraal.hosted.LibGraalLoader;
 import jdk.internal.loader.ClassLoaders;
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.ResolvedJavaField;

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageClassLoaderSupport.java

@@ -75,7 +75,7 @@
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.collections.MapCursor;
 import org.graalvm.nativeimage.impl.AnnotationExtractor;
-import org.graalvm.nativeimage.libgraal.LibGraalLoader;
+import org.graalvm.nativeimage.libgraal.hosted.LibGraalLoader;
 
 import com.oracle.svm.core.NativeImageClassLoaderOptions;
 import com.oracle.svm.core.SubstrateOptions;

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/classinitialization/ClassInitializationSupport.java

@@ -45,7 +45,7 @@
 import java.util.stream.Collectors;
 
 import jdk.graal.compiler.core.common.ContextClassLoaderScope;
-import org.graalvm.nativeimage.libgraal.LibGraalLoader;
+import org.graalvm.nativeimage.libgraal.hosted.LibGraalLoader;
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.impl.RuntimeClassInitializationSupport;