Changed typeReachable conditions into typeReached.

Author: Mihailo Markovic

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

@@ -42,7 +42,6 @@
 
 import java.util.Objects;
 
-<<<<<<<< HEAD:sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/TypeReachabilityCondition.java
 import org.graalvm.nativeimage.hosted.RegistrationCondition;
 
 /**
@@ -54,19 +53,6 @@ public class TypeReachabilityCondition implements RegistrationCondition {
 
     /* Cached to save space: it is used as a marker for all non-conditional elements */
     public static final TypeReachabilityCondition JAVA_LANG_OBJECT_REACHED = new TypeReachabilityCondition(Object.class, true);
-========
-import org.graalvm.nativeimage.hosted.InclusionCondition;
-
-/**
- * Type that represents both type-reached and type-reachable condition. When
- * {@link TypeCondition#runtimeChecked} is <code>true</code> denotes that this is a
- * <code>typeReached</code> condition.
- */
-public class TypeCondition implements InclusionCondition {
-
-    /* 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);
->>>>>>>> 675ac0bf8ee (Introduced public API for registration conditions.):sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/TypeCondition.java
     private final Class<?> type;
 
     public final boolean runtimeChecked;
@@ -79,7 +65,6 @@ public class TypeCondition implements InclusionCondition {
      * @param runtimeChecked makes this a type-reachable condition when false
      * @return instance of the condition
      */
-<<<<<<<< HEAD:sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/TypeReachabilityCondition.java
     public static TypeReachabilityCondition create(Class<?> type, boolean runtimeChecked) {
         Objects.requireNonNull(type);
         if (TypeReachabilityCondition.JAVA_LANG_OBJECT_REACHED.getKey().equals(type)) {
@@ -93,21 +78,6 @@ public boolean isAlwaysTrue() {
     }
 
     public TypeReachabilityCondition(Class<?> type, boolean runtimeChecked) {
-========
-    public static TypeCondition create(Class<?> type, boolean runtimeChecked) {
-        Objects.requireNonNull(type);
-        if (TypeCondition.JAVA_LANG_OBJECT_REACHED.getKey().equals(type)) {
-            return TypeCondition.JAVA_LANG_OBJECT_REACHED;
-        }
-        return new TypeCondition(type, runtimeChecked);
-    }
-
-    public boolean isAlwaysTrue() {
-        return InclusionCondition.alwaysInclude().equals(this);
-    }
-
-    public TypeCondition(Class<?> type, boolean runtimeChecked) {
->>>>>>>> 675ac0bf8ee (Introduced public API for registration conditions.):sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/TypeCondition.java
         this.runtimeChecked = runtimeChecked;
         this.type = type;
     }
@@ -124,11 +94,7 @@ public boolean equals(Object o) {
         if (o == null || getClass() != o.getClass()) {
             return false;
         }
-<<<<<<<< HEAD:sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/TypeReachabilityCondition.java
         TypeReachabilityCondition that = (TypeReachabilityCondition) o;
-========
-        TypeCondition that = (TypeCondition) o;
->>>>>>>> 675ac0bf8ee (Introduced public API for registration conditions.):sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/TypeCondition.java
         return runtimeChecked == that.runtimeChecked && Objects.equals(type, that.type);
     }
 
@@ -139,11 +105,7 @@ public int hashCode() {
 
     @Override
     public String toString() {
-<<<<<<<< HEAD:sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/TypeReachabilityCondition.java
         return "TypeReachabilityCondition(" +
-========
-        return "TypeCondition(" +
->>>>>>>> 675ac0bf8ee (Introduced public API for registration conditions.):sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/impl/TypeCondition.java
                         "type=" + type +
                         ", runtimeChecked=" + runtimeChecked +
                         ')';

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

@@ -53,9 +53,7 @@ public TypeResult<RegistrationCondition> resolveCondition(UnresolvedConfiguratio
              * reachability checks.
              */
             var runtimeChecked = !classInitializationSupport.isAlwaysReached(type) && unresolvedCondition.isRuntimeChecked();
-            /*
-             * GR-62516, this should be deleted
-             */
+            /* This condition might be typeReachable */
             return TypeReachabilityCondition.create(type, runtimeChecked);
         });
     }

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

@@ -650,11 +650,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 = TypeReachabilityCondition.create(proxyClass, false);
+            var condition = RegistrationCondition.always();
             register(condition, queriedOnly, proxyClass.getDeclaredMethod(method.getName(), method.getParameterTypes()));
         } catch (NoSuchMethodException e) {
             /*