Skip to content

[GR-42628] Load predefined classes during class initialization. #5722

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 18, 2023
Merged

[GR-42628] Load predefined classes during class initialization. #5722

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions ....oracle.svm.core/src/com/oracle/svm/core/classinitialization/ClassInitializationInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@

import org.graalvm.nativeimage.CurrentIsolate;
import org.graalvm.nativeimage.IsolateThread;
import com.oracle.svm.core.hub.PredefinedClassesSupport;
import org.graalvm.nativeimage.Platform;
import org.graalvm.nativeimage.Platforms;
import org.graalvm.nativeimage.c.function.CFunctionPointer;
Expand All @@ -44,6 +45,7 @@
import com.oracle.svm.core.util.VMError;

import jdk.internal.misc.Unsafe;
import jdk.internal.reflect.Reflection;

/**
* Information about the runtime class initialization state of a {@link DynamicHub class}, and
Expand Down Expand Up @@ -184,6 +186,21 @@ private boolean isReentrantInitialization(IsolateThread thread) {
private static void initialize(ClassInitializationInfo info, DynamicHub hub) {
IsolateThread self = CurrentIsolate.getCurrentThread();

/*
* GR-43118: If a predefined class is not loaded, and the caller class is loaded, set the
* classloader of the initialized class to the class loader of the caller class.
*
* This does not work in general as class loading happens in more places than class
* initialization, e.g., on class literals. However, this workaround makes most of the cases
* work until we have a proper implementation of class loading.
*/
if (!hub.isLoaded()) {
Class<?> callerClass = Reflection.getCallerClass();
if (DynamicHub.fromClass(callerClass).isLoaded()) {
PredefinedClassesSupport.loadClassIfNotLoaded(callerClass.getClassLoader(), null, DynamicHub.toClass(hub));
}
}

/*
* Step 1: Synchronize on the initialization lock, LC, for C. This involves waiting until
* the current thread can acquire LC
Expand Down