Changed typeReachable conditions in typeReached in all places in codebase where it does not affect semantics. Conditions can't be registered during analysis anymore, except alwaysTrue conditions. Removed methods from MetadataCondition API to implementation.

Author: mihailo

sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/MetadataCondition.java

@@ -62,13 +62,4 @@ static MetadataCondition create(Class<?> type) {
 
     boolean isAlwaysTrue();
 
-    /**
-     * GR-62516, this should be deleted.
-     */
-    default boolean isRuntimeChecked() {
-        TypeReachedCondition typeReachedCondition = (TypeReachedCondition) this;
-        return typeReachedCondition.runtimeChecked;
-    }
-
-    Class<?> getKey();
 }

sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/TypeReachedCondition.java

@@ -71,6 +71,7 @@ public class TypeReachedCondition implements MetadataCondition {
      * @param runtimeChecked makes this a type-reachable condition when false
      * @return instance of the condition
      */
+
     public static TypeReachedCondition create(Class<?> type, boolean runtimeChecked) {
         Objects.requireNonNull(type);
         if (MetadataCondition.JAVA_LANG_OBJECT_REACHED.getKey().equals(type)) {
@@ -84,12 +85,11 @@ public boolean isAlwaysTrue() {
         return MetadataCondition.alwaysTrue().equals(this);
     }
 
-    public TypeReachedCondition(Class<?> type, boolean runtimeChecked) {
+    TypeReachedCondition(Class<?> type, boolean runtimeChecked) {
         this.runtimeChecked = runtimeChecked;
         this.type = type;
     }
 
-    @Override
     public Class<?> getKey() {
         return type;
     }
@@ -118,4 +118,8 @@ public String toString() {
                         ", runtimeChecked=" + runtimeChecked +
                         ')';
     }
+
+    public boolean isRuntimeChecked() {
+        return runtimeChecked;
+    }
 }

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/configure/RuntimeConditionSet.java

@@ -34,6 +34,7 @@
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.nativeimage.impl.MetadataCondition;
+import org.graalvm.nativeimage.impl.TypeReachedCondition;
 
 import com.oracle.svm.core.hub.DynamicHub;
 import com.oracle.svm.core.util.VMError;
@@ -68,7 +69,7 @@ public static RuntimeConditionSet createHosted(MetadataCondition condition) {
 
     @Platforms(Platform.HOSTED_ONLY.class)
     public synchronized void addCondition(MetadataCondition cnd) {
-        VMError.guarantee(cnd.isRuntimeChecked(), "Only runtime conditions can be added to the ConditionalRuntimeValue.");
+        VMError.guarantee(((TypeReachedCondition) cnd).isRuntimeChecked(), "Only runtime conditions can be added to the ConditionalRuntimeValue.");
         if (satisfied) {
             return;
         } else if (cnd.isAlwaysTrue()) {
@@ -160,10 +161,10 @@ private void setConditions(Object[] conditions) {
     }
 
     private static Object createRuntimeCondition(MetadataCondition cnd) {
-        if (cnd.isAlwaysTrue() || !cnd.isRuntimeChecked()) {
+        if (cnd.isAlwaysTrue() || !((TypeReachedCondition) cnd).isRuntimeChecked()) {
             throw VMError.shouldNotReachHere("We should never create run-time conditions from conditions that are always true at build time. Condition: " + cnd);
         }
-        return cnd.getKey();
+        return ((TypeReachedCondition) cnd).getKey();
     }
 
     private static boolean isSatisfied(Object condition) {

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/reflect/proxy/DynamicProxySupport.java

@@ -35,6 +35,7 @@
 import org.graalvm.nativeimage.hosted.RuntimeClassInitialization;
 import org.graalvm.nativeimage.hosted.RuntimeReflection;
 import org.graalvm.nativeimage.impl.MetadataCondition;
+import org.graalvm.nativeimage.impl.TypeReachedCondition;
 
 import com.oracle.svm.core.configure.ConditionalRuntimeValue;
 import com.oracle.svm.core.configure.RuntimeConditionSet;
@@ -102,7 +103,7 @@ public DynamicProxySupport() {
     @Override
     @Platforms(Platform.HOSTED_ONLY.class)
     public synchronized void addProxyClass(MetadataCondition condition, Class<?>... interfaces) {
-        VMError.guarantee(condition.isRuntimeChecked(), "The condition used must be a runtime condition.");
+        VMError.guarantee(((TypeReachedCondition) condition).isRuntimeChecked(), "The condition used must be a runtime condition.");
         /*
          * Make a defensive copy of the interfaces array to protect against the caller modifying the
          * array.

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

@@ -33,6 +33,7 @@
 
 import org.graalvm.nativeimage.hosted.Feature;
 import org.graalvm.nativeimage.impl.MetadataCondition;
+import org.graalvm.nativeimage.impl.TypeReachedCondition;
 
 import com.oracle.svm.core.util.VMError;
 import com.oracle.svm.hosted.classinitialization.ClassInitializationSupport;
@@ -44,29 +45,29 @@ public abstract class ConditionalConfigurationRegistry {
     protected void registerConditionalConfiguration(MetadataCondition condition, Consumer<MetadataCondition> consumer) {
         Objects.requireNonNull(condition, "Cannot use null value as condition for conditional configuration. Please ensure that you register a non-null condition.");
         Objects.requireNonNull(consumer, "Cannot use null value as runnable for conditional configuration. Please ensure that you register a non-null runnable.");
-        if (condition.isRuntimeChecked() && !condition.isAlwaysTrue()) {
+        if (((TypeReachedCondition) condition).isRuntimeChecked() && !condition.isAlwaysTrue()) {
             /*
              * We do this before the type is reached as the handler runs during analysis when it is
              * too late to register types for reached tracking. If the type is never reached, there
              * is no damage as subtypes will also never be reached.
              */
-            ClassInitializationSupport.singleton().addForTypeReachedTracking(condition.getKey());
+            ClassInitializationSupport.singleton().addForTypeReachedTracking(((TypeReachedCondition) condition).getKey());
         }
         if (MetadataCondition.alwaysTrue().equals(condition)) {
             /* analysis optimization to include new types as early as possible */
             consumer.accept(MetadataCondition.alwaysTrue());
         } else {
             MetadataCondition runtimeCondition;
-            if (condition.isRuntimeChecked()) {
+            if (((TypeReachedCondition) condition).isRuntimeChecked()) {
                 runtimeCondition = condition;
             } else {
                 runtimeCondition = MetadataCondition.alwaysTrue();
             }
             if (beforeAnalysisAccess == null) {
-                Collection<Runnable> handlers = pendingReachabilityHandlers.computeIfAbsent(condition.getKey(), key -> new ConcurrentLinkedQueue<>());
+                Collection<Runnable> handlers = pendingReachabilityHandlers.computeIfAbsent(((TypeReachedCondition) condition).getKey(), key -> new ConcurrentLinkedQueue<>());
                 handlers.add(() -> consumer.accept(runtimeCondition));
             } else {
-                beforeAnalysisAccess.registerReachabilityHandler(access -> consumer.accept(runtimeCondition), condition.getKey());
+                beforeAnalysisAccess.registerReachabilityHandler(access -> consumer.accept(runtimeCondition), ((TypeReachedCondition) condition).getKey());
             }
 
         }

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

@@ -59,6 +59,7 @@
 import org.graalvm.nativeimage.hosted.RuntimeResourceAccess;
 import org.graalvm.nativeimage.impl.MetadataCondition;
 import org.graalvm.nativeimage.impl.RuntimeResourceSupport;
+import org.graalvm.nativeimage.impl.TypeReachedCondition;
 
 import com.oracle.svm.configure.ConfigurationFile;
 import com.oracle.svm.configure.ResourceConfigurationParser;
@@ -202,7 +203,7 @@ public void addGlob(MetadataCondition condition, String module, String glob, Obj
         public void addCondition(MetadataCondition condition, Module module, String resourcePath) {
             var conditionalResource = Resources.currentLayer().getResource(createStorageKey(module, resourcePath));
             if (conditionalResource != null) {
-                classInitializationSupport.addForTypeReachedTracking(condition.getKey());
+                classInitializationSupport.addForTypeReachedTracking(((TypeReachedCondition) condition).getKey());
                 conditionalResource.getConditions().addCondition(condition);
             }
         }
@@ -655,7 +656,7 @@ public void afterAnalysis(AfterAnalysisAccess access) {
 
         /* prepare resources GlobTrie for runtime */
         GlobTrieNode<ConditionWithOrigin> root = Resources.currentLayer().getResourcesTrieRoot();
-        CompressedGlobTrie.removeNodes(root, (conditionWithOrigin) -> !access.isReachable(conditionWithOrigin.condition().getKey()));
+        CompressedGlobTrie.removeNodes(root, (conditionWithOrigin) -> !access.isReachable(((TypeReachedCondition) conditionWithOrigin.condition()).getKey()));
         CompressedGlobTrie.finalize(root);
     }
 

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/NativeImageConditionResolver.java

@@ -53,9 +53,6 @@ public TypeResult<MetadataCondition> resolveCondition(UnresolvedConfigurationCon
              * reachability checks.
              */
             var runtimeChecked = !classInitializationSupport.isAlwaysReached(type) && unresolvedCondition.isRuntimeChecked();
-            /*
-             * GR-62516, this should be deleted
-             */
             return TypeReachedCondition.create(type, runtimeChecked);
         });
     }

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/ReflectionDataBuilder.java

@@ -71,8 +71,8 @@
 import org.graalvm.nativeimage.hosted.RuntimeProxyCreation;
 import org.graalvm.nativeimage.hosted.RuntimeReflection;
 import org.graalvm.nativeimage.impl.MetadataCondition;
-import org.graalvm.nativeimage.impl.TypeReachedCondition;
 import org.graalvm.nativeimage.impl.RuntimeReflectionSupport;
+import org.graalvm.nativeimage.impl.TypeReachedCondition;
 
 import com.oracle.graal.pointsto.ObjectScanner.ScanReason;
 import com.oracle.graal.pointsto.constraints.UnsupportedFeatureException;
@@ -96,13 +96,13 @@
 import com.oracle.svm.hosted.annotation.AnnotationValue;
 import com.oracle.svm.hosted.annotation.SubstrateAnnotationExtractor;
 import com.oracle.svm.hosted.annotation.TypeAnnotationValue;
+import com.oracle.svm.hosted.classinitialization.ClassInitializationSupport;
 import com.oracle.svm.hosted.substitute.SubstitutionReflectivityFilter;
 import com.oracle.svm.util.LogUtils;
 import com.oracle.svm.util.ReflectionUtil;
 
 import jdk.vm.ci.meta.ResolvedJavaField;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
-
 import sun.reflect.annotation.ExceptionProxy;
 
 public class ReflectionDataBuilder extends ConditionalConfigurationRegistry implements RuntimeReflectionSupport, ReflectionHostedSupport {
@@ -180,8 +180,8 @@ public void beforeAnalysis(BeforeAnalysisAccessImpl beforeAnalysisAccess) {
     }
 
     private void runConditionalInAnalysisTask(MetadataCondition condition, Consumer<MetadataCondition> task) {
-        if (sealed) {
-            throw new UnsupportedFeatureException("Too late to add classes, methods, and fields for reflective access. Registration must happen in a Feature before the analysis has finished.");
+        if (sealed || (ClassInitializationSupport.singleton().getConfigurationSealed() && !condition.isAlwaysTrue())) {
+            throw new UnsupportedFeatureException("Too late to add classes, methods, and fields for reflective access. Registration must happen in a Feature before the analysis has started.");
         }
 
         if (universe != null) {
@@ -231,7 +231,8 @@ public void registerAllClassesQuery(MetadataCondition condition, Class<?> clazz)
     @SuppressWarnings("unused")
     private static void guaranteeNotRuntimeConditionForQueries(MetadataCondition cnd, boolean queriedOnly) {
         if (!TreatAllTypeReachableConditionsAsTypeReached.getValue()) {
-            VMError.guarantee(!queriedOnly || cnd.isAlwaysTrue() || !cnd.isRuntimeChecked(), "Bulk queries can only be set with 'name' which does not allow run-time conditions.");
+            VMError.guarantee(!queriedOnly || cnd.isAlwaysTrue() || !((TypeReachedCondition) cnd).isRuntimeChecked(),
+                            "Bulk queries can only be set with 'name' which does not allow run-time conditions.");
         }
     }
 
@@ -650,11 +651,7 @@ private void processAnnotationMethod(boolean queriedOnly, Method method) {
         Class<?> annotationClass = method.getDeclaringClass();
         Class<?> proxyClass = Proxy.getProxyClass(annotationClass.getClassLoader(), annotationClass);
         try {
-            /*
-             * build-time condition as it is registered during analysis GR-62516, this should be
-             * deleted
-             */
-            var condition = TypeReachedCondition.create(proxyClass, false);
+            var condition = MetadataCondition.alwaysTrue();
             register(condition, queriedOnly, proxyClass.getDeclaredMethod(method.getName(), method.getParameterTypes()));
         } catch (NoSuchMethodException e) {
             /*