Move registerBuildTimeIndy/CondyIncludeList to the public API

Author: Zeavee

sdk/CHANGELOG.md

@@ -2,6 +2,9 @@
 
 This changelog summarizes major changes between GraalVM SDK versions. The main focus is on APIs exported by GraalVM SDK.
 
+## Version 25.4.4
+* GR-72910: Added `Feature.DuringSetupAccess#registerBuildTimeBootstrapIndy` and `Feature.DuringSetupAccess#registerBuildTimeBootstrapCondy`, allowing frameworks to register invokedynamic and constant-dynamic bootstrap methods for execution at image build time.
+
 ## Version 25.3.4
 * GR-76904: Isolated polyglot contexts now warn when host access is enabled without host method scoping. The warning can be disabled with the `engine.WarnMethodScoping=false` option.
 

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

@@ -1077,6 +1077,8 @@ CLSS public abstract interface static org.graalvm.nativeimage.hosted.Feature$Dur
 intf org.graalvm.nativeimage.hosted.Feature$FeatureAccess
 meth public abstract <%0 extends java.lang.Object> void registerObjectReachabilityHandler(java.util.function.Consumer<{%%0}>,java.lang.Class<{%%0}>)
 meth public abstract void registerObjectReplacer(java.util.function.Function<java.lang.Object,java.lang.Object>)
+meth public abstract void registerBuildTimeBootstrapIndy(java.lang.reflect.Executable)
+meth public abstract void registerBuildTimeBootstrapCondy(java.lang.reflect.Executable)
 
 CLSS public abstract interface static org.graalvm.nativeimage.hosted.Feature$FeatureAccess
  outer org.graalvm.nativeimage.hosted.Feature

sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/hosted/Feature.java

@@ -54,10 +54,10 @@
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
-import org.graalvm.nativeimage.dynamicaccess.ResourceAccess;
-import org.graalvm.nativeimage.dynamicaccess.ReflectiveAccess;
-import org.graalvm.nativeimage.dynamicaccess.JNIAccess;
 import org.graalvm.nativeimage.dynamicaccess.ForeignAccess;
+import org.graalvm.nativeimage.dynamicaccess.JNIAccess;
+import org.graalvm.nativeimage.dynamicaccess.ReflectiveAccess;
+import org.graalvm.nativeimage.dynamicaccess.ResourceAccess;
 
 /**
  * Features allow clients to intercept the native image generation and run custom initialization
@@ -240,6 +240,26 @@ interface DuringSetupAccess extends FeatureAccess {
          * @since 24.2
          */
         <T> void registerObjectReachabilityHandler(Consumer<T> callback, Class<T> clazz);
+
+        /**
+         * Registers a method that is allowed to be executed at build time if called as the
+         * bootstrap method for an invokedynamic, in which case each call site outputted will be
+         * constant-folded. Other bootstrap methods will be executed at run time by default,
+         * creating the call site at run time.
+         *
+         * @since 25.4
+         */
+        void registerBuildTimeBootstrapIndy(Executable method);
+
+        /**
+         * Registers a method that is allowed to be executed at build time if called as the
+         * bootstrap method for a constantdynamic, in which case each call site outputted will be
+         * constant-folded. Other bootstrap methods will be executed at run time by default,
+         * creating the call site at run time.
+         *
+         * @since 25.4
+         */
+        void registerBuildTimeBootstrapCondy(Executable method);
     }
 
     /**

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/feature/JVMCIFeatureAccess.java

@@ -33,6 +33,7 @@
 
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
+
 import com.oracle.svm.util.JVMCIFieldValueTransformer;
 import com.oracle.svm.util.dynamicaccess.JVMCIJNIAccess;
 import com.oracle.svm.util.dynamicaccess.JVMCIReflectiveAccess;
@@ -126,6 +127,18 @@ public interface DuringSetupAccess extends FeatureAccess {
          * {@link org.graalvm.nativeimage.hosted.Feature.DuringSetupAccess#registerObjectReachabilityHandler(Consumer, Class)}.
          */
         void registerObjectReachabilityHandler(Consumer<JavaConstant> callback, ResolvedJavaType type);
+
+        /**
+         * JVMCI-based counterpart of
+         * {@link org.graalvm.nativeimage.hosted.Feature.DuringSetupAccess#registerBuildTimeBootstrapIndy(java.lang.reflect.Executable)}.
+         */
+        void registerBuildTimeBootstrapIndy(ResolvedJavaMethod method);
+
+        /**
+         * JVMCI-based counterpart of
+         * {@link org.graalvm.nativeimage.hosted.Feature.DuringSetupAccess#registerBuildTimeBootstrapCondy(java.lang.reflect.Executable)}.
+         */
+        void registerBuildTimeBootstrapCondy(ResolvedJavaMethod method);
     }
 
     /**

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

@@ -44,7 +44,6 @@
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
-import com.oracle.svm.core.image.ImageHeapLayoutInfo;
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.dynamicaccess.AccessCondition;
@@ -80,6 +79,7 @@
 import com.oracle.svm.core.feature.InternalFeature;
 import com.oracle.svm.core.feature.JVMCIFeatureAccess;
 import com.oracle.svm.core.graal.meta.RuntimeConfiguration;
+import com.oracle.svm.core.image.ImageHeapLayoutInfo;
 import com.oracle.svm.core.meta.SharedField;
 import com.oracle.svm.core.meta.SharedMethod;
 import com.oracle.svm.core.meta.SharedType;
@@ -105,8 +105,8 @@
 import com.oracle.svm.hosted.reflect.ReflectionDataBuilder;
 import com.oracle.svm.shared.util.ReflectionUtil;
 import com.oracle.svm.shared.util.VMError;
-import com.oracle.svm.util.GuestAnnotationAccess;
 import com.oracle.svm.util.GuestAccess;
+import com.oracle.svm.util.GuestAnnotationAccess;
 import com.oracle.svm.util.JVMCIFieldValueTransformer;
 import com.oracle.svm.util.OriginalFieldProvider;
 import com.oracle.svm.util.dynamicaccess.JVMCIJNIAccess;
@@ -446,6 +446,16 @@ public void registerJVMCIObjectReplacer(Function<JavaConstant, JavaConstant> rep
             });
         }
 
+        @Override
+        public void registerBuildTimeBootstrapIndy(ResolvedJavaMethod method) {
+            BootstrapMethodConfiguration.singleton().addBuildTimeIndy(method);
+        }
+
+        @Override
+        public void registerBuildTimeBootstrapCondy(ResolvedJavaMethod method) {
+            BootstrapMethodConfiguration.singleton().addBuildTimeCondy(method);
+        }
+
         /**
          * Register an object replacer which may return an ImageHeapConstant. Note only one replacer
          * can be triggered for a given object; otherwise an error will be thrown. Too, if the
@@ -515,27 +525,13 @@ public void registerClassReachabilityListener(BiConsumer<DuringAnalysisAccess, C
             getHostVM().registerClassReachabilityListener(listener);
         }
 
-        /**
-         * Registers a method that is allowed to be executed at build time if called as the
-         * bootstrap method for an invokedynamic, in which case each call site outputted will be
-         * constant-folded. Other bootstrap methods will be executed at run time by default,
-         * creating the call site at run time.
-         *
-         * @since 25.1
-         */
-        public void registerBuildTimeIndyIncludeList(Executable method) {
+        @Override
+        public void registerBuildTimeBootstrapIndy(Executable method) {
             BootstrapMethodConfiguration.singleton().addBuildTimeIndy(getUniverse().getOriginalMetaAccess().lookupJavaMethod(method));
         }
 
-        /**
-         * Registers a method that is allowed to be executed at build time if called as the
-         * bootstrap method for a constantdynamic, in which case each call site outputted will be
-         * constant-folded. Other bootstrap methods will be executed at run time by default,
-         * creating the call site at run time.
-         *
-         * @since 25.1
-         */
-        public void registerBuildTimeCondyIncludeList(Executable method) {
+        @Override
+        public void registerBuildTimeBootstrapCondy(Executable method) {
             BootstrapMethodConfiguration.singleton().addBuildTimeCondy(getUniverse().getOriginalMetaAccess().lookupJavaMethod(method));
         }
 

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/bootstrap/BootstrapMethodConfiguration.java

@@ -38,15 +38,15 @@
 
 import org.graalvm.nativeimage.ImageSingletons;
 
-import com.oracle.graal.pointsto.meta.AnalysisMethod;
-import com.oracle.svm.shared.feature.AutomaticallyRegisteredFeature;
 import com.oracle.svm.core.feature.InternalFeature;
+import com.oracle.svm.hosted.reflect.proxy.ProxyRenamingSubstitutionProcessor;
+import com.oracle.svm.shared.feature.AutomaticallyRegisteredFeature;
 import com.oracle.svm.shared.singletons.traits.BuiltinTraits.BuildtimeAccessOnly;
 import com.oracle.svm.shared.singletons.traits.BuiltinTraits.NoLayeredCallbacks;
 import com.oracle.svm.shared.singletons.traits.SingletonTraits;
-import com.oracle.svm.hosted.reflect.proxy.ProxyRenamingSubstitutionProcessor;
 import com.oracle.svm.util.GuestAccess;
 import com.oracle.svm.util.JVMCIReflectionUtil;
+import com.oracle.svm.util.OriginalMethodProvider;
 
 import jdk.vm.ci.meta.MetaAccessProvider;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
@@ -120,37 +120,29 @@ public void duringSetup(DuringSetupAccess access) {
     }
 
     public void addBuildTimeIndy(ResolvedJavaMethod method) {
-        buildTimeIndy.add(method);
+        buildTimeIndy.add(OriginalMethodProvider.getOriginalMethod(method));
     }
 
     public void addBuildTimeCondy(ResolvedJavaMethod method) {
-        buildTimeCondy.add(method);
+        buildTimeCondy.add(OriginalMethodProvider.getOriginalMethod(method));
     }
 
     /**
      * Check if the provided method is allowed to be executed at build time.
      */
     public boolean isIndyAllowedAtBuildTime(ResolvedJavaMethod method) {
-        ResolvedJavaMethod m = getWrapped(method);
+        ResolvedJavaMethod m = OriginalMethodProvider.getOriginalMethod(method);
         return m != null && buildTimeIndy.contains(m);
     }
 
     /**
      * Check if the provided method is allowed to be executed at build time.
      */
     public boolean isCondyAllowedAtBuildTime(ResolvedJavaMethod method) {
-        ResolvedJavaMethod m = getWrapped(method);
+        ResolvedJavaMethod m = OriginalMethodProvider.getOriginalMethod(method);
         return m != null && (buildTimeCondy.contains(m) || isProxyCondy(m));
     }
 
-    private static ResolvedJavaMethod getWrapped(ResolvedJavaMethod method) {
-        if (method instanceof AnalysisMethod analysisMethod) {
-            return analysisMethod.getWrapped();
-        } else {
-            return method;
-        }
-    }
-
     /**
      * Every {@link Proxy} class has its own bootstrap method that is used for a constant dynamic.
      */