Skip to content

[GR-69972] Add tracking of JDK internal methods that might require metadata to the DynamicAccessDetectionPhase #12311

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
Oct 7, 2025
Merged

[GR-69972] Add tracking of JDK internal methods that might require metadata to the DynamicAccessDetectionPhase #12311

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
42 changes: 38 additions & 4 deletions ...vm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/DynamicAccessDetectionSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@

import com.oracle.graal.pointsto.meta.AnalysisMetaAccess;
import com.oracle.svm.util.ReflectionUtil;
import jdk.vm.ci.meta.ResolvedJavaMethod;
import jdk.vm.ci.meta.ResolvedJavaType;

import org.graalvm.collections.EconomicMap;
import org.graalvm.nativeimage.ImageSingletons;

Expand All @@ -51,8 +50,17 @@
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
import java.util.HashSet;
import java.util.Locale;
import java.util.ResourceBundle;
import java.util.Set;

import jdk.internal.access.JavaLangAccess;
import jdk.internal.loader.BuiltinClassLoader;
import jdk.internal.misc.Unsafe;
import jdk.internal.reflect.ReflectionFactory;
import jdk.vm.ci.meta.ResolvedJavaMethod;
import jdk.vm.ci.meta.ResolvedJavaType;

/**
* Support class that caches a predetermined set of dynamic-access methods which may require
* metadata at runtime.
Expand Down Expand Up @@ -91,6 +99,7 @@ public static DynamicAccessDetectionSupport instance() {

public DynamicAccessDetectionSupport(AnalysisMetaAccess metaAccess) {
this.metaAccess = metaAccess;
boolean jdkUnsupportedModulePresent = ModuleLayer.boot().findModule("jdk.unsupported").isPresent();

put(reflectionMethods, Class.class, Set.of(
new MethodSignature("forName", String.class),
Expand Down Expand Up @@ -174,9 +183,11 @@ public DynamicAccessDetectionSupport(AnalysisMetaAccess metaAccess) {
new MethodSignature("resolveConstantDesc", MethodHandles.Lookup.class)));
put(reflectionMethods, MethodHandleProxies.class, Set.of(
new MethodSignature("asInterfaceInstance", Class.class, MethodHandle.class)));
put(reflectionMethods, jdk.internal.misc.Unsafe.class, Set.of(
put(reflectionMethods, JavaLangAccess.class, Set.of(
new MethodSignature("getDeclaredPublicMethods", Class.class, String.class, Class[].class)));
put(reflectionMethods, Unsafe.class, Set.of(
new MethodSignature("allocateInstance", Class.class)));
if (ModuleLayer.boot().findModule("jdk.unsupported").isPresent()) {
if (jdkUnsupportedModulePresent) {
Class<?> sunMiscUnsafeClass = ReflectionUtil.lookupClass("sun.misc.Unsafe");
put(reflectionMethods, sunMiscUnsafeClass, Set.of(
new MethodSignature("allocateInstance", Class.class)));
Expand All @@ -192,6 +203,15 @@ public DynamicAccessDetectionSupport(AnalysisMetaAccess metaAccess) {
new MethodSignature("readUnshared")));
put(reflectionMethods, ObjectStreamClass.class, Set.of(
new MethodSignature("lookup", Class.class)));
put(reflectionMethods, ReflectionFactory.class, Set.of(
new MethodSignature("newConstructorForSerialization", Class.class),
new MethodSignature("newConstructorForSerialization", Class.class, Constructor.class)));
if (jdkUnsupportedModulePresent) {
Class<?> sunReflectReflectionFactoryClass = ReflectionUtil.lookupClass("sun.reflect.ReflectionFactory");
put(reflectionMethods, sunReflectReflectionFactoryClass, Set.of(
new MethodSignature("newConstructorForSerialization", Class.class),
new MethodSignature("newConstructorForSerialization", Class.class, Constructor.class)));
}

put(reflectionMethods, Proxy.class, Set.of(
new MethodSignature("getProxyClass", ClassLoader.class, Class[].class),
Expand All @@ -209,6 +229,20 @@ public DynamicAccessDetectionSupport(AnalysisMetaAccess metaAccess) {
put(resourceMethods, Class.class, Set.of(
new MethodSignature("getResource", String.class),
new MethodSignature("getResourceAsStream", String.class)));
put(resourceMethods, ResourceBundle.class, Set.of(
new MethodSignature("getBundle", String.class),
new MethodSignature("getBundle", String.class, ResourceBundle.Control.class),
new MethodSignature("getBundle", String.class, Locale.class),
new MethodSignature("getBundle", String.class, Module.class),
new MethodSignature("getBundle", String.class, Locale.class, Module.class),
new MethodSignature("getBundle", String.class, Locale.class, ResourceBundle.Control.class),
new MethodSignature("getBundle", String.class, Locale.class, ClassLoader.class),
new MethodSignature("getBundle", String.class, Locale.class, ClassLoader.class, ResourceBundle.Control.class)));
put(resourceMethods, BuiltinClassLoader.class, Set.of(
new MethodSignature("findResource", String.class),
new MethodSignature("findResource", String.class, String.class),
new MethodSignature("findResources", String.class),
new MethodSignature("findResourceAsStream", String.class, String.class)));

put(foreignMethods, Linker.class, Set.of(
new MethodSignature("downcallHandle", MemorySegment.class, FunctionDescriptor.class, Linker.Option[].class),
Expand Down