Skip to content

Commit ea24318

Browse files
olpawolpaw
committed
Rename CustomGraalClassLoader to LibGraalClassLoaderBase
1 parent 0043d2d commit ea24318

File tree

7 files changed

+45
-45
lines changed

7 files changed

+45
-45
lines changed

‎compiler/src/jdk.graal.compiler.libgraal.loader/src/jdk/graal/compiler/hotspot/libgraal/LibGraalClassLoader.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
*/
6161
@SuppressWarnings("unused")
6262
@Platforms(Platform.HOSTED_ONLY.class)
63-
final class HostedLibGraalClassLoader extends ClassLoader implements CustomGraalClassLoader {
63+
final class HostedLibGraalClassLoader extends ClassLoader implements LibGraalClassLoaderBase {
6464

6565
private static final String JAVA_HOME_PROPERTY_KEY = "jdk.graal.internal.libgraal.javahome";
6666
private static final String JAVA_HOME_PROPERTY_VALUE = System.getProperty(JAVA_HOME_PROPERTY_KEY, System.getProperty("java.home"));

‎compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/libgraal/CustomGraalClassLoader.java‎ renamed to ‎compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/libgraal/LibGraalClassLoaderBase.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import java.util.Map;
2929
import java.util.Set;
3030

31-
public interface CustomGraalClassLoader {
31+
public interface LibGraalClassLoaderBase {
3232

3333
/**
3434
* @return instance of ClassLoader that implements this interface.

‎substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/ClassForNameSupport.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@
4949
@AutomaticallyRegisteredImageSingleton
5050
public final class ClassForNameSupport implements MultiLayeredImageSingleton, UnsavedSingleton {
5151

52-
private ClassLoader customGraalLoader;
52+
private ClassLoader libGraalLoader;
5353

54-
public void setCustomGraalLoader(ClassLoader customGraalLoader) {
55-
this.customGraalLoader = customGraalLoader;
54+
public void setLibGraalLoader(ClassLoader libGraalLoader) {
55+
this.libGraalLoader = libGraalLoader;
5656
}
5757

5858
public static ClassForNameSupport singleton() {
@@ -124,7 +124,7 @@ accessible through the builder class loader, and it was already registered by na
124124

125125
@Platforms(HOSTED_ONLY.class)
126126
private boolean isLibGraalClass(Class<?> clazz) {
127-
return customGraalLoader != null && clazz.getClassLoader() == customGraalLoader;
127+
return libGraalLoader != null && clazz.getClassLoader() == libGraalLoader;
128128
}
129129

130130
public static ConditionalRuntimeValue<Object> updateConditionalValue(ConditionalRuntimeValue<Object> existingConditionalValue, Object newValue,

‎substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/LibGraalFeature.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
import jdk.graal.compiler.debug.DebugContext;
7474
import jdk.graal.compiler.hotspot.CompilerConfigurationFactory;
7575
import jdk.graal.compiler.hotspot.libgraal.BuildTime;
76-
import jdk.graal.compiler.hotspot.libgraal.CustomGraalClassLoader;
76+
import jdk.graal.compiler.hotspot.libgraal.LibGraalClassLoaderBase;
7777
import jdk.graal.compiler.nodes.graphbuilderconf.GeneratedInvocationPlugin;
7878
import jdk.graal.compiler.options.OptionDescriptor;
7979
import jdk.graal.compiler.options.OptionKey;
@@ -111,7 +111,7 @@ public List<Class<? extends Feature>> getRequiredFeatures() {
111111

112112
final MethodHandles.Lookup mhl = MethodHandles.lookup();
113113

114-
CustomGraalClassLoader customGraalClassLoader;
114+
LibGraalClassLoaderBase libGraalClassLoader;
115115

116116
/**
117117
* Loader used for loading classes from the guest GraalVM.
@@ -187,9 +187,9 @@ public void afterRegistration(AfterRegistrationAccess access) {
187187
// org.graalvm.nativeimage.impl.IsolateSupport
188188
accessModulesToClass(ModuleSupport.Access.EXPORT, LibGraalFeature.class, "org.graalvm.nativeimage");
189189

190-
customGraalClassLoader = createHostedLibGraalClassLoader(access);
191-
loader = customGraalClassLoader.getClassLoader();
192-
ImageSingletons.lookup(ClassForNameSupport.class).setCustomGraalLoader(loader);
190+
libGraalClassLoader = createHostedLibGraalClassLoader(access);
191+
loader = libGraalClassLoader.getClassLoader();
192+
ImageSingletons.lookup(ClassForNameSupport.class).setLibGraalLoader(loader);
193193

194194
buildTimeClass = loadClassOrFail("jdk.graal.compiler.hotspot.libgraal.BuildTime");
195195

@@ -211,10 +211,10 @@ public void afterRegistration(AfterRegistrationAccess access) {
211211
}
212212

213213
@SuppressWarnings("unchecked")
214-
private static CustomGraalClassLoader createHostedLibGraalClassLoader(AfterRegistrationAccess access) {
214+
private static LibGraalClassLoaderBase createHostedLibGraalClassLoader(AfterRegistrationAccess access) {
215215
var hostedLibGraalClassLoaderClass = access.findClassByName("jdk.graal.compiler.hotspot.libgraal.HostedLibGraalClassLoader");
216216
ModuleSupport.accessPackagesToClass(Access.EXPORT, hostedLibGraalClassLoaderClass, false, "java.base", "jdk.internal.module");
217-
return ReflectionUtil.newInstance((Class<CustomGraalClassLoader>) hostedLibGraalClassLoaderClass);
217+
return ReflectionUtil.newInstance((Class<LibGraalClassLoaderBase>) hostedLibGraalClassLoaderClass);
218218
}
219219

220220
private static void accessModulesToClass(ModuleSupport.Access access, Class<?> accessingClass, String... moduleNames) {
@@ -236,7 +236,7 @@ public void duringSetup(DuringSetupAccess access) {
236236
* HostedLibGraalClassLoader provides runtime-replacement loader instance. Make sure
237237
* HostedLibGraalClassLoader gets replaced by customRuntimeLoader instance in image.
238238
*/
239-
ClassLoader customRuntimeLoader = customGraalClassLoader.getRuntimeClassLoader();
239+
ClassLoader customRuntimeLoader = libGraalClassLoader.getRuntimeClassLoader();
240240
access.registerObjectReplacer(obj -> obj == loader ? customRuntimeLoader : obj);
241241

242242
try {

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
import com.oracle.svm.hosted.jdk.HostedClassLoaderPackageManagement;
4242
import com.oracle.svm.util.ReflectionUtil;
4343

44-
import jdk.graal.compiler.hotspot.libgraal.CustomGraalClassLoader;
44+
import jdk.graal.compiler.hotspot.libgraal.LibGraalClassLoaderBase;
4545
import jdk.internal.loader.ClassLoaders;
4646
import jdk.vm.ci.meta.JavaConstant;
4747

@@ -121,18 +121,18 @@ public void duringSetup(DuringSetupAccess access) {
121121

122122
var config = (FeatureImpl.DuringSetupAccessImpl) access;
123123
if (ImageLayerBuildingSupport.firstImageBuild()) {
124-
CustomGraalClassLoader customGraalLoader = ((DuringSetupAccessImpl) access).imageClassLoader.classLoaderSupport.getCustomGraalLoader();
125-
if (customGraalLoader != null) {
126-
ClassLoader customLoader = customGraalLoader.getClassLoader();
127-
ClassForNameSupport.singleton().setCustomGraalLoader(customLoader);
124+
LibGraalClassLoaderBase libGraalLoader = ((DuringSetupAccessImpl) access).imageClassLoader.classLoaderSupport.getLibGraalLoader();
125+
if (libGraalLoader != null) {
126+
ClassLoader libGraalClassLoader = libGraalLoader.getClassLoader();
127+
ClassForNameSupport.singleton().setLibGraalLoader(libGraalClassLoader);
128128

129-
ClassLoader customRuntimeLoader = customGraalLoader.getRuntimeClassLoader();
130-
if (customRuntimeLoader != null) {
129+
ClassLoader runtimeLibGraalClassLoader = libGraalLoader.getRuntimeClassLoader();
130+
if (runtimeLibGraalClassLoader != null) {
131131
/*
132-
* CustomLoader provides runtime-replacement ClassLoader instance. Make sure
133-
* customLoader gets replaced by customRuntimeLoader instance in image.
132+
* LibGraalLoader provides runtime-replacement ClassLoader instance. Make sure
133+
* LibGraalLoader gets replaced by runtimeLibGraalClassLoader instance in image.
134134
*/
135-
access.registerObjectReplacer(obj -> obj == customLoader ? customRuntimeLoader : obj);
135+
access.registerObjectReplacer(obj -> obj == libGraalClassLoader ? runtimeLibGraalClassLoader : obj);
136136
}
137137
}
138138
access.registerObjectReplacer(this::runtimeClassLoaderObjectReplacer);

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

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
import com.oracle.svm.util.ReflectionUtil;
102102

103103
import jdk.graal.compiler.debug.GraalError;
104-
import jdk.graal.compiler.hotspot.libgraal.CustomGraalClassLoader;
104+
import jdk.graal.compiler.hotspot.libgraal.LibGraalClassLoaderBase;
105105
import jdk.graal.compiler.options.OptionKey;
106106
import jdk.graal.compiler.options.OptionValues;
107107
import jdk.internal.module.Modules;
@@ -132,7 +132,7 @@ public final class NativeImageClassLoaderSupport {
132132
private Set<Path> javaPathsToInclude;
133133
private boolean includeAllFromClassPath;
134134

135-
private Optional<CustomGraalClassLoader> customGraalLoader;
135+
private Optional<LibGraalClassLoaderBase> libGraalLoader;
136136
private List<ClassLoader> classLoaders;
137137

138138
private final Set<Class<?>> classesToIncludeUnconditionally = Collections.newSetFromMap(new ConcurrentHashMap<>());
@@ -225,9 +225,9 @@ public NativeImageClassLoader getClassLoader() {
225225
return classLoader;
226226
}
227227

228-
public CustomGraalClassLoader getCustomGraalLoader() {
229-
VMError.guarantee(customGraalLoader != null, "Invalid access to customGraalLoader before getting set up");
230-
return customGraalLoader.orElse(null);
228+
public LibGraalClassLoaderBase getLibGraalLoader() {
229+
VMError.guarantee(libGraalLoader != null, "Invalid access to libGraalLoader before getting set up");
230+
return libGraalLoader.orElse(null);
231231
}
232232

233233
public List<ClassLoader> getClassLoaders() {
@@ -263,7 +263,7 @@ public void loadAllClasses(ForkJoinPool executor, ImageClassLoader imageClassLoa
263263

264264
new LoadClassHandler(executor, imageClassLoader).run();
265265

266-
CustomGraalClassLoader graalLoader = getCustomGraalLoader();
266+
LibGraalClassLoaderBase graalLoader = getLibGraalLoader();
267267
if (graalLoader != null) {
268268
/* If we have a customLoader, register its classes to the image builder */
269269
for (String fqn : graalLoader.getAllClassNames()) {
@@ -565,26 +565,26 @@ private Stream<AddExportsAndOpensAndReadsFormatValue> processOption(OptionKey<Ac
565565
return parsedOptions;
566566
}
567567

568-
public void setupCustomGraalLoader() {
569-
var customGraalClassLoaderFQN = NativeImageOptions.LibGraalClassLoader.getValue(parsedHostedOptions);
570-
if (!customGraalClassLoaderFQN.isEmpty()) {
571-
ModuleSupport.accessModule(Access.EXPORT, classLoader.getUnnamedModule(), CustomGraalClassLoader.class.getModule(), CustomGraalClassLoader.class.getPackageName());
568+
public void setupLibGraalClassLoader() {
569+
var libGraalClassLoaderFQN = NativeImageOptions.LibGraalClassLoader.getValue(parsedHostedOptions);
570+
if (!libGraalClassLoaderFQN.isEmpty()) {
571+
ModuleSupport.accessModule(Access.EXPORT, classLoader.getUnnamedModule(), LibGraalClassLoaderBase.class.getModule(), LibGraalClassLoaderBase.class.getPackageName());
572572
try {
573-
Class<?> customLoaderClass = Class.forName(customGraalClassLoaderFQN, true, classLoader);
574-
CustomGraalClassLoader customLoaderClassInstance = (CustomGraalClassLoader) ReflectionUtil.newInstance(customLoaderClass);
575-
customGraalLoader = Optional.of(customLoaderClassInstance);
576-
classLoaders = List.of(customLoaderClassInstance.getClassLoader(), getClassLoader());
573+
Class<?> loaderClass = Class.forName(libGraalClassLoaderFQN, true, classLoader);
574+
LibGraalClassLoaderBase loaderInstance = (LibGraalClassLoaderBase) ReflectionUtil.newInstance(loaderClass);
575+
libGraalLoader = Optional.of(loaderInstance);
576+
classLoaders = List.of(loaderInstance.getClassLoader(), getClassLoader());
577577
} catch (ClassNotFoundException e) {
578-
throw VMError.shouldNotReachHere("Custom ClassLoader " + customGraalClassLoaderFQN +
579-
" set via " + SubstrateOptionsParser.commandArgument(NativeImageOptions.LibGraalClassLoader, customGraalClassLoaderFQN) +
578+
throw VMError.shouldNotReachHere("LibGraalClassLoader " + libGraalClassLoaderFQN +
579+
" set via " + SubstrateOptionsParser.commandArgument(NativeImageOptions.LibGraalClassLoader, libGraalClassLoaderFQN) +
580580
" could not be found.", e);
581581
} catch (ClassCastException e) {
582-
throw VMError.shouldNotReachHere("Custom ClassLoader " + customGraalClassLoaderFQN +
583-
" set via " + SubstrateOptionsParser.commandArgument(NativeImageOptions.LibGraalClassLoader, customGraalClassLoaderFQN) +
584-
" does not extend class " + CustomGraalClassLoader.class.getName() + '.', e);
582+
throw VMError.shouldNotReachHere("LibGraalClassLoader " + libGraalClassLoaderFQN +
583+
" set via " + SubstrateOptionsParser.commandArgument(NativeImageOptions.LibGraalClassLoader, libGraalClassLoaderFQN) +
584+
" does not extend class " + LibGraalClassLoaderBase.class.getName() + '.', e);
585585
}
586586
} else {
587-
customGraalLoader = Optional.empty();
587+
libGraalLoader = Optional.empty();
588588
classLoaders = List.of(getClassLoader());
589589
}
590590
}

‎substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGeneratorRunner.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ public static ImageClassLoader installNativeImageClassLoader(String[] classpath,
284284
NativeImageSystemClassLoader nativeImageSystemClassLoader = NativeImageSystemClassLoader.singleton();
285285
NativeImageClassLoaderSupport nativeImageClassLoaderSupport = new NativeImageClassLoaderSupport(nativeImageSystemClassLoader.defaultSystemClassLoader, classpath, modulepath);
286286
nativeImageClassLoaderSupport.setupHostedOptionParser(arguments);
287-
nativeImageClassLoaderSupport.setupCustomGraalLoader();
287+
nativeImageClassLoaderSupport.setupLibGraalClassLoader();
288288
/* Perform additional post-processing with the created nativeImageClassLoaderSupport */
289289
for (NativeImageClassLoaderPostProcessing postProcessing : ServiceLoader.load(NativeImageClassLoaderPostProcessing.class)) {
290290
postProcessing.apply(nativeImageClassLoaderSupport);

0 commit comments

Comments
 (0)