Changed typeReachable conditions into typeReached.

Author: kimeta

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/reflect/NativeImageConditionResolver.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/ReflectionDataBuilder.java

@@ -619,7 +619,7 @@ private void registerField(RegistrationCondition cnd, boolean queriedOnly, Field
             }
 
             if (declaringClass.isAnnotation()) {
-                processAnnotationField(cnd, reflectField);
+                processAnnotationField(reflectField);
             }
         }
 
@@ -660,12 +660,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);
-            register(condition, queriedOnly, proxyClass.getDeclaredMethod(method.getName(), method.getParameterTypes()));
+            register(RegistrationCondition.always(), queriedOnly, proxyClass.getDeclaredMethod(method.getName(), method.getParameterTypes()));
         } catch (NoSuchMethodException e) {
             /*
              * The annotation member is not present in the proxy class so we don't add it.
@@ -674,11 +669,11 @@ private void processAnnotationMethod(boolean queriedOnly, Method method) {
     }
 
     @SuppressWarnings("deprecation")
-    private void processAnnotationField(RegistrationCondition cnd, Field field) {
+    private void processAnnotationField(Field field) {
         Class<?> annotationClass = field.getDeclaringClass();
         Class<?> proxyClass = Proxy.getProxyClass(annotationClass.getClassLoader(), annotationClass);
         try {
-            register(cnd, false, proxyClass.getDeclaredField(field.getName()));
+            register(RegistrationCondition.always(), false, proxyClass.getDeclaredField(field.getName()));
         } catch (NoSuchFieldException e) {
             /*
              * The annotation member is not present in the proxy class so we don't add it.
@@ -1240,7 +1235,7 @@ public void registerHeapReflectionField(Field reflectField, ScanReason reason) {
             if (!SubstitutionReflectivityFilter.shouldExclude(reflectField, metaAccess, universe)) {
                 registerTypesForField(analysisField, reflectField, false);
                 if (analysisField.getDeclaringClass().isAnnotation()) {
-                    processAnnotationField(RegistrationCondition.always(), reflectField);
+                    processAnnotationField(reflectField);
                 }
             }
         }