Skip to content

Commit 6e68bf8

Browse files
author
Mihailo Markovic
committed
Changed typeReachable conditions into typeReached.
1 parent 09cee49 commit 6e68bf8

File tree

2 files changed

+2
-9
lines changed

2 files changed

+2
-9
lines changed

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,7 @@ public TypeResult<RegistrationCondition> resolveCondition(UnresolvedConfiguratio
5353
* reachability checks.
5454
*/
5555
var runtimeChecked = !classInitializationSupport.isAlwaysReached(type) && unresolvedCondition.isRuntimeChecked();
56-
/*
57-
* GR-62516, this should be deleted
58-
*/
56+
/* This condition might be typeReachable */
5957
return TypeReachabilityCondition.create(type, runtimeChecked);
6058
});
6159
}

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -650,12 +650,7 @@ private void processAnnotationMethod(boolean queriedOnly, Method method) {
650650
Class<?> annotationClass = method.getDeclaringClass();
651651
Class<?> proxyClass = Proxy.getProxyClass(annotationClass.getClassLoader(), annotationClass);
652652
try {
653-
/*
654-
* build-time condition as it is registered during analysis GR-62516, this should be
655-
* deleted
656-
*/
657-
var condition = TypeReachabilityCondition.create(proxyClass, false);
658-
register(condition, queriedOnly, proxyClass.getDeclaredMethod(method.getName(), method.getParameterTypes()));
653+
register(RegistrationCondition.always(), queriedOnly, proxyClass.getDeclaredMethod(method.getName(), method.getParameterTypes()));
659654
} catch (NoSuchMethodException e) {
660655
/*
661656
* The annotation member is not present in the proxy class so we don't add it.

0 commit comments

Comments
 (0)