Renamed implementation class TypeReachedCondtion into TypeCondition. Simplification of MetadataCondition API.

Author: mihailo

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

@@ -42,11 +42,14 @@
 
 public interface MetadataCondition {
 
-    /* Cached to save space: it is used as a marker for all non-conditional elements */
-    TypeReachedCondition JAVA_LANG_OBJECT_REACHED = new TypeReachedCondition(Object.class, true);
-
+    /**
+     * Creates the type-reached condition that is always satisfied. Any element that is predicated
+     * with this condition will always be included.
+     * 
+     * @return instance of the condition
+     */
     static MetadataCondition alwaysTrue() {
-        return MetadataCondition.JAVA_LANG_OBJECT_REACHED;
+        return TypeCondition.JAVA_LANG_OBJECT_REACHED;
     }
 
     /**
@@ -56,10 +59,8 @@ static MetadataCondition alwaysTrue() {
      * @param type that has to be reached for this condition to be satisfied
      * @return instance of the condition
      */
-    static MetadataCondition create(Class<?> type) {
-        return TypeReachedCondition.create(type, true);
+    static MetadataCondition typeReached(Class<?> type) {
+        return TypeCondition.create(type, true);
     }
 
-    boolean isAlwaysTrue();
-
 }

sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/TypeReachedCondition.java renamed to sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/TypeCondition.java

@@ -54,11 +54,13 @@
  * <li><code>typeReachable</code> (legacy) that signifies that the type must be reachable by static
  * analysis at build time.</li>
  * <p>
- * When {@link TypeReachedCondition#runtimeChecked} is <code>true</code> denotes that this is a
+ * When {@link TypeCondition#runtimeChecked} is <code>true</code> denotes that this is a
  * <code>typeReached</code> condition.
  */
-public class TypeReachedCondition implements MetadataCondition {
+public class TypeCondition implements MetadataCondition {
 
+    /* Cached to save space: it is used as a marker for all non-conditional elements */
+    public static final TypeCondition JAVA_LANG_OBJECT_REACHED = new TypeCondition(Object.class, true);
     private final Class<?> type;
 
     final boolean runtimeChecked;
@@ -72,20 +74,19 @@ public class TypeReachedCondition implements MetadataCondition {
      * @return instance of the condition
      */
 
-    public static TypeReachedCondition create(Class<?> type, boolean runtimeChecked) {
+    public static TypeCondition create(Class<?> type, boolean runtimeChecked) {
         Objects.requireNonNull(type);
-        if (MetadataCondition.JAVA_LANG_OBJECT_REACHED.getKey().equals(type)) {
-            return MetadataCondition.JAVA_LANG_OBJECT_REACHED;
+        if (TypeCondition.JAVA_LANG_OBJECT_REACHED.getKey().equals(type)) {
+            return TypeCondition.JAVA_LANG_OBJECT_REACHED;
         }
-        return new TypeReachedCondition(type, runtimeChecked);
+        return new TypeCondition(type, runtimeChecked);
     }
 
-    @Override
     public boolean isAlwaysTrue() {
         return MetadataCondition.alwaysTrue().equals(this);
     }
 
-    TypeReachedCondition(Class<?> type, boolean runtimeChecked) {
+    TypeCondition(Class<?> type, boolean runtimeChecked) {
         this.runtimeChecked = runtimeChecked;
         this.type = type;
     }
@@ -102,7 +103,7 @@ public boolean equals(Object o) {
         if (o == null || getClass() != o.getClass()) {
             return false;
         }
-        TypeReachedCondition that = (TypeReachedCondition) o;
+        TypeCondition that = (TypeCondition) o;
         return runtimeChecked == that.runtimeChecked && Objects.equals(type, that.type);
     }
 

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

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

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

@@ -35,7 +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 org.graalvm.nativeimage.impl.TypeCondition;
 
 import com.oracle.svm.core.configure.ConditionalRuntimeValue;
 import com.oracle.svm.core.configure.RuntimeConditionSet;
@@ -103,7 +103,7 @@ public DynamicProxySupport() {
     @Override
     @Platforms(Platform.HOSTED_ONLY.class)
     public synchronized void addProxyClass(MetadataCondition condition, Class<?>... interfaces) {
-        VMError.guarantee(((TypeReachedCondition) condition).isRuntimeChecked(), "The condition used must be a runtime condition.");
+        VMError.guarantee(((TypeCondition) 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,7 +33,7 @@
 
 import org.graalvm.nativeimage.hosted.Feature;
 import org.graalvm.nativeimage.impl.MetadataCondition;
-import org.graalvm.nativeimage.impl.TypeReachedCondition;
+import org.graalvm.nativeimage.impl.TypeCondition;
 
 import com.oracle.svm.core.util.VMError;
 import com.oracle.svm.hosted.classinitialization.ClassInitializationSupport;
@@ -45,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 (((TypeReachedCondition) condition).isRuntimeChecked() && !condition.isAlwaysTrue()) {
+        if (((TypeCondition) condition).isRuntimeChecked() && !((TypeCondition) 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(((TypeReachedCondition) condition).getKey());
+            ClassInitializationSupport.singleton().addForTypeReachedTracking(((TypeCondition) 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 (((TypeReachedCondition) condition).isRuntimeChecked()) {
+            if (((TypeCondition) condition).isRuntimeChecked()) {
                 runtimeCondition = condition;
             } else {
                 runtimeCondition = MetadataCondition.alwaysTrue();
             }
             if (beforeAnalysisAccess == null) {
-                Collection<Runnable> handlers = pendingReachabilityHandlers.computeIfAbsent(((TypeReachedCondition) condition).getKey(), key -> new ConcurrentLinkedQueue<>());
+                Collection<Runnable> handlers = pendingReachabilityHandlers.computeIfAbsent(((TypeCondition) condition).getKey(), key -> new ConcurrentLinkedQueue<>());
                 handlers.add(() -> consumer.accept(runtimeCondition));
             } else {
-                beforeAnalysisAccess.registerReachabilityHandler(access -> consumer.accept(runtimeCondition), ((TypeReachedCondition) condition).getKey());
+                beforeAnalysisAccess.registerReachabilityHandler(access -> consumer.accept(runtimeCondition), ((TypeCondition) condition).getKey());
             }
 
         }

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

@@ -59,7 +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 org.graalvm.nativeimage.impl.TypeCondition;
 
 import com.oracle.svm.configure.ConfigurationFile;
 import com.oracle.svm.configure.ResourceConfigurationParser;
@@ -203,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(((TypeReachedCondition) condition).getKey());
+                classInitializationSupport.addForTypeReachedTracking(((TypeCondition) condition).getKey());
                 conditionalResource.getConditions().addCondition(condition);
             }
         }
@@ -656,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(((TypeReachedCondition) conditionWithOrigin.condition()).getKey()));
+        CompressedGlobTrie.removeNodes(root, (conditionWithOrigin) -> !access.isReachable(((TypeCondition) conditionWithOrigin.condition()).getKey()));
         CompressedGlobTrie.finalize(root);
     }
 

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

@@ -25,7 +25,7 @@
 package com.oracle.svm.hosted.reflect;
 
 import org.graalvm.nativeimage.impl.MetadataCondition;
-import org.graalvm.nativeimage.impl.TypeReachedCondition;
+import org.graalvm.nativeimage.impl.TypeCondition;
 import org.graalvm.nativeimage.impl.UnresolvedConfigurationCondition;
 
 import com.oracle.svm.configure.ConfigurationTypeDescriptor;
@@ -53,7 +53,7 @@ public TypeResult<MetadataCondition> resolveCondition(UnresolvedConfigurationCon
              * reachability checks.
              */
             var runtimeChecked = !classInitializationSupport.isAlwaysReached(type) && unresolvedCondition.isRuntimeChecked();
-            return TypeReachedCondition.create(type, runtimeChecked);
+            return TypeCondition.create(type, runtimeChecked);
         });
     }
 

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

@@ -72,7 +72,7 @@
 import org.graalvm.nativeimage.hosted.RuntimeReflection;
 import org.graalvm.nativeimage.impl.MetadataCondition;
 import org.graalvm.nativeimage.impl.RuntimeReflectionSupport;
-import org.graalvm.nativeimage.impl.TypeReachedCondition;
+import org.graalvm.nativeimage.impl.TypeCondition;
 
 import com.oracle.graal.pointsto.ObjectScanner.ScanReason;
 import com.oracle.graal.pointsto.constraints.UnsupportedFeatureException;
@@ -180,7 +180,7 @@ public void beforeAnalysis(BeforeAnalysisAccessImpl beforeAnalysisAccess) {
     }
 
     private void runConditionalInAnalysisTask(MetadataCondition condition, Consumer<MetadataCondition> task) {
-        if (sealed || (ClassInitializationSupport.singleton().getConfigurationSealed() && !condition.isAlwaysTrue())) {
+        if (sealed || (ClassInitializationSupport.singleton().getConfigurationSealed() && !((TypeCondition) 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.");
         }
 
@@ -231,7 +231,7 @@ 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() || !((TypeReachedCondition) cnd).isRuntimeChecked(),
+            VMError.guarantee(!queriedOnly || ((TypeCondition) cnd).isAlwaysTrue() || !((TypeCondition) cnd).isRuntimeChecked(),
                             "Bulk queries can only be set with 'name' which does not allow run-time conditions.");
         }
     }