Skip to content

Commit 46235c9

Browse files
committed
[GR-40905] Introduce methods to query annotation information from with Features.
PullRequest: graal/12658
2 parents e8054af + 5ff3f1a commit 46235c9

File tree

4 files changed

+217
-1
lines changed

4 files changed

+217
-1
lines changed

sdk/src/org.graalvm.nativeimage/snapshot.sigtest

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,11 +119,24 @@ CLSS public abstract interface java.util.function.BooleanSupplier
119119
anno 0 java.lang.FunctionalInterface()
120120
meth public abstract boolean getAsBoolean()
121121

122+
CLSS public final org.graalvm.nativeimage.AnnotationAccess
123+
meth public static <%0 extends java.lang.annotation.Annotation> {%%0} getAnnotation(java.lang.reflect.AnnotatedElement,java.lang.Class<{%%0}>)
124+
meth public static boolean isAnnotationPresent(java.lang.reflect.AnnotatedElement,java.lang.Class<? extends java.lang.annotation.Annotation>)
125+
meth public static java.lang.Class<? extends java.lang.annotation.Annotation>[] getAnnotationTypes(java.lang.reflect.AnnotatedElement)
126+
supr java.lang.Object
127+
122128
CLSS public final org.graalvm.nativeimage.CurrentIsolate
123129
meth public static org.graalvm.nativeimage.Isolate getIsolate()
124130
meth public static org.graalvm.nativeimage.IsolateThread getCurrentThread()
125131
supr java.lang.Object
126132

133+
CLSS public org.graalvm.nativeimage.AnnotationAccess
134+
cons public init()
135+
meth public static <%0 extends java.lang.annotation.Annotation> {%%0} getAnnotation(java.lang.reflect.AnnotatedElement,java.lang.Class<{%%0}>)
136+
meth public static boolean isAnnotationPresent(java.lang.reflect.AnnotatedElement,java.lang.Class<? extends java.lang.annotation.Annotation>)
137+
meth public static java.lang.Class<? extends java.lang.annotation.Annotation>[] getAnnotationTypes(java.lang.reflect.AnnotatedElement)
138+
supr java.lang.Object
139+
127140
CLSS public final org.graalvm.nativeimage.ImageInfo
128141
fld public final static java.lang.String PROPERTY_IMAGE_CODE_KEY = "org.graalvm.nativeimage.imagecode"
129142
fld public final static java.lang.String PROPERTY_IMAGE_CODE_VALUE_BUILDTIME = "buildtime"
Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
1+
/*
2+
* Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* The Universal Permissive License (UPL), Version 1.0
6+
*
7+
* Subject to the condition set forth below, permission is hereby granted to any
8+
* person obtaining a copy of this software, associated documentation and/or
9+
* data (collectively the "Software"), free of charge and under any and all
10+
* copyright rights in the Software, and any and all patent rights owned or
11+
* freely licensable by each licensor hereunder covering either (i) the
12+
* unmodified Software as contributed to or provided by such licensor, or (ii)
13+
* the Larger Works (as defined below), to deal in both
14+
*
15+
* (a) the Software, and
16+
*
17+
* (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
18+
* one is included with the Software each a "Larger Work" to which the Software
19+
* is contributed by such licensors),
20+
*
21+
* without restriction, including without limitation the rights to copy, create
22+
* derivative works of, display, perform, and distribute the Software and make,
23+
* use, sell, offer for sale, import, export, have made, and have sold the
24+
* Software and the Larger Work(s), and to sublicense the foregoing rights on
25+
* either these or other terms.
26+
*
27+
* This license is subject to the following condition:
28+
*
29+
* The above copyright notice and either this complete permission notice or at a
30+
* minimum a reference to the UPL must be included in all copies or substantial
31+
* portions of the Software.
32+
*
33+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
34+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
35+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
36+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
37+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
38+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
39+
* SOFTWARE.
40+
*/
41+
package org.graalvm.nativeimage;
42+
43+
import java.lang.annotation.Annotation;
44+
import java.lang.reflect.AnnotatedElement;
45+
import java.util.Arrays;
46+
47+
import org.graalvm.nativeimage.impl.ImageBuildtimeCodeAnnotationAccessSupport;
48+
49+
/**
50+
* This class provides methods to query annotation information on {@link AnnotatedElement}s while
51+
* trying to prevent, at image build time, side-effecting changes that impact the analysis results.
52+
*
53+
* The getAnnotation implementation in the JDK for Class, Field, and Method initializes the classes
54+
* of all annotations present on that element, not just the class of the queried annotation. This
55+
* leads to problems when not all annotation classes are present on the classpath/modulepath:
56+
* querying an annotation whose class is present can fail with an exception because not all
57+
* annotation classes are present. When this class's methods are called at image build time, then
58+
* the minimal amount of class initialization is done: {@link #getAnnotation} only initializes the
59+
* queried annotation class (when the annotation is actually present and therefore instantiated);
60+
* {@link #isAnnotationPresent} and {@link #getAnnotationTypes} do not initialize any classes.
61+
*
62+
* When methods of this class are called not at image build time, i.e., at image run time or during
63+
* the execution of a Java application not involving native image, then the JDK method to query the
64+
* annotation is invoked. In these cases, there is no difference to the class initialization
65+
* behavior of the JDK.
66+
*
67+
* Note that there is intentionally no `getAnnotations` method to query all annotations: all
68+
* annotation classes must be initialized anyways by this method, so the JDK method can be invoke
69+
* directly. In the image generator it should be generally avoided to use `getAnnotations`.
70+
*
71+
* @since 22.3
72+
*/
73+
public final class AnnotationAccess {
74+
75+
/**
76+
* Implementation of {@link AnnotatedElement#isAnnotationPresent(Class)}.
77+
*
78+
* @since 22.3
79+
*/
80+
public static boolean isAnnotationPresent(AnnotatedElement element, Class<? extends Annotation> annotationClass) {
81+
if (ImageInfo.inImageBuildtimeCode()) {
82+
return ImageSingletons.lookup(ImageBuildtimeCodeAnnotationAccessSupport.class).isAnnotationPresent(element, annotationClass);
83+
} else {
84+
return element.isAnnotationPresent(annotationClass);
85+
}
86+
}
87+
88+
/**
89+
* Implementation of {@link AnnotatedElement#getAnnotation(Class)} .
90+
*
91+
* @since 22.3
92+
*/
93+
@SuppressWarnings("unchecked")
94+
public static <T extends Annotation> T getAnnotation(AnnotatedElement element, Class<T> annotationType) {
95+
if (ImageInfo.inImageBuildtimeCode()) {
96+
return (T) ImageSingletons.lookup(ImageBuildtimeCodeAnnotationAccessSupport.class).getAnnotation(element, annotationType);
97+
} else {
98+
return element.getAnnotation(annotationType);
99+
}
100+
}
101+
102+
/**
103+
* Implementation for retrieving all {@link Annotation#annotationType()}s for a {@code element}.
104+
*
105+
* @since 22.3
106+
*/
107+
@SuppressWarnings("unchecked")
108+
public static Class<? extends Annotation>[] getAnnotationTypes(AnnotatedElement element) {
109+
if (ImageInfo.inImageBuildtimeCode()) {
110+
return ImageSingletons.lookup(ImageBuildtimeCodeAnnotationAccessSupport.class).getAnnotationTypes(element);
111+
} else {
112+
return Arrays.stream(element.getAnnotations()).map(Annotation::annotationType).toArray(Class[]::new);
113+
}
114+
}
115+
116+
private AnnotationAccess() {
117+
}
118+
}
Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
/*
2+
* Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* The Universal Permissive License (UPL), Version 1.0
6+
*
7+
* Subject to the condition set forth below, permission is hereby granted to any
8+
* person obtaining a copy of this software, associated documentation and/or
9+
* data (collectively the "Software"), free of charge and under any and all
10+
* copyright rights in the Software, and any and all patent rights owned or
11+
* freely licensable by each licensor hereunder covering either (i) the
12+
* unmodified Software as contributed to or provided by such licensor, or (ii)
13+
* the Larger Works (as defined below), to deal in both
14+
*
15+
* (a) the Software, and
16+
*
17+
* (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
18+
* one is included with the Software each a "Larger Work" to which the Software
19+
* is contributed by such licensors),
20+
*
21+
* without restriction, including without limitation the rights to copy, create
22+
* derivative works of, display, perform, and distribute the Software and make,
23+
* use, sell, offer for sale, import, export, have made, and have sold the
24+
* Software and the Larger Work(s), and to sublicense the foregoing rights on
25+
* either these or other terms.
26+
*
27+
* This license is subject to the following condition:
28+
*
29+
* The above copyright notice and either this complete permission notice or at a
30+
* minimum a reference to the UPL must be included in all copies or substantial
31+
* portions of the Software.
32+
*
33+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
34+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
35+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
36+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
37+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
38+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
39+
* SOFTWARE.
40+
*/
41+
package org.graalvm.nativeimage.impl;
42+
43+
import java.lang.annotation.Annotation;
44+
import java.lang.reflect.AnnotatedElement;
45+
46+
public interface ImageBuildtimeCodeAnnotationAccessSupport {
47+
// needed as Annotation Access-specific ImageSingletons key
48+
49+
boolean isAnnotationPresent(AnnotatedElement element, Class<? extends Annotation> annotationClass);
50+
51+
Annotation getAnnotation(AnnotatedElement element, Class<? extends Annotation> annotationType);
52+
53+
Class<? extends Annotation>[] getAnnotationTypes(AnnotatedElement element);
54+
}

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/annotation/AnnotationSupport.java

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
*/
2525
package com.oracle.svm.hosted.annotation;
2626

27+
import java.lang.annotation.Annotation;
28+
import java.lang.reflect.AnnotatedElement;
2729
import java.lang.reflect.InvocationHandler;
2830
import java.lang.reflect.Modifier;
2931
import java.lang.reflect.Proxy;
@@ -60,20 +62,24 @@
6062
import org.graalvm.compiler.nodes.java.LoadFieldNode;
6163
import org.graalvm.compiler.replacements.nodes.MacroNode.MacroParams;
6264
import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
65+
import org.graalvm.nativeimage.ImageInfo;
66+
import org.graalvm.nativeimage.impl.ImageBuildtimeCodeAnnotationAccessSupport;
6367

6468
import com.oracle.graal.pointsto.constraints.UnsupportedFeatureException;
6569
import com.oracle.graal.pointsto.infrastructure.OriginalClassProvider;
6670
import com.oracle.graal.pointsto.meta.HostedProviders;
6771
import com.oracle.graal.pointsto.util.GraalAccess;
6872
import com.oracle.svm.core.SubstrateAnnotationInvocationHandler;
73+
import com.oracle.svm.core.feature.AutomaticallyRegisteredFeature;
74+
import com.oracle.svm.core.feature.AutomaticallyRegisteredImageSingleton;
6975
import com.oracle.svm.core.feature.InternalFeature;
7076
import com.oracle.svm.core.graal.jdk.SubstrateObjectCloneWithExceptionNode;
7177
import com.oracle.svm.core.jdk.AnnotationSupportConfig;
7278
import com.oracle.svm.core.meta.SubstrateObjectConstant;
73-
import com.oracle.svm.core.feature.AutomaticallyRegisteredFeature;
7479
import com.oracle.svm.core.util.VMError;
7580
import com.oracle.svm.hosted.analysis.NativeImagePointsToAnalysis;
7681
import com.oracle.svm.hosted.phases.HostedGraphKit;
82+
import com.oracle.svm.util.GuardedAnnotationAccess;
7783

7884
import jdk.vm.ci.meta.DeoptimizationAction;
7985
import jdk.vm.ci.meta.DeoptimizationReason;
@@ -734,3 +740,28 @@ private static Object replacementComputer(Object original) {
734740
return Proxy.newProxyInstance(original.getClass().getClassLoader(), extendedInterfaces, new SubstrateAnnotationInvocationHandler(Proxy.getInvocationHandler(original)));
735741
}
736742
}
743+
744+
@AutomaticallyRegisteredImageSingleton(ImageBuildtimeCodeAnnotationAccessSupport.class)
745+
class ImageBuildtimeCodeAnnotationAccessSupportSingleton implements ImageBuildtimeCodeAnnotationAccessSupport {
746+
747+
@Override
748+
public boolean isAnnotationPresent(AnnotatedElement element, Class<? extends Annotation> annotationClass) {
749+
assert ImageInfo.inImageBuildtimeCode() : "This method should only be called from within image buildtime code";
750+
751+
return GuardedAnnotationAccess.isAnnotationPresent(element, annotationClass);
752+
}
753+
754+
@Override
755+
public Annotation getAnnotation(AnnotatedElement element, Class<? extends Annotation> annotationType) {
756+
assert ImageInfo.inImageBuildtimeCode() : "This method should only be called from within image buildtime code";
757+
758+
return GuardedAnnotationAccess.getAnnotation(element, annotationType);
759+
}
760+
761+
@Override
762+
public Class<? extends Annotation>[] getAnnotationTypes(AnnotatedElement element) {
763+
assert ImageInfo.inImageBuildtimeCode() : "This method should only be called from within image buildtime code";
764+
765+
return GuardedAnnotationAccess.getAnnotationTypes(element);
766+
}
767+
}

0 commit comments

Comments
 (0)