avoid searching for inherited annotations unnecessarily

Author: dougxc

sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/AnnotationAccess.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -93,7 +93,7 @@ public static boolean isAnnotationPresent(AnnotatedElement element, Class<? exte
     @SuppressWarnings("unchecked")
     public static <T extends Annotation> T getAnnotation(AnnotatedElement element, Class<T> annotationType) {
         if (ImageInfo.inImageBuildtimeCode()) {
-            return ImageSingletons.lookup(AnnotationExtractor.class).extractAnnotation(element, annotationType, false);
+            return ImageSingletons.lookup(AnnotationExtractor.class).extractAnnotation(element, annotationType);
         } else {
             return element.getAnnotation(annotationType);
         }

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

@@ -41,6 +41,7 @@
 package org.graalvm.nativeimage.impl;
 
 import java.lang.annotation.Annotation;
+import java.lang.annotation.Inherited;
 import java.lang.reflect.AnnotatedElement;
 
 import org.graalvm.nativeimage.Platform;
@@ -67,6 +68,16 @@ public interface AnnotationExtractor {
      */
     <T extends Annotation> T extractAnnotation(AnnotatedElement element, Class<T> annotationType, boolean declaredOnly);
 
+    /**
+     * Gets {@code element}'s annotation of type {@code annotationType} if such an annotation is
+     * present, else null. This method will also search {@code element}'s superclasses if
+     * {@code annotationType} is {@linkplain Inherited inherited}.
+     */
+    default <T extends Annotation> T extractAnnotation(AnnotatedElement element, Class<T> annotationType) {
+        Inherited inherited = annotationType.getAnnotation(Inherited.class);
+        return extractAnnotation(element, annotationType, inherited == null);
+    }
+
     /**
      * Gets the {@link Annotation#annotationType()}s for all annotations on {@code element}. This
      * method includes inherited annotations.

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisMethod.java

@@ -287,7 +287,7 @@ protected AnalysisMethod(AnalysisUniverse universe, ResolvedJavaMethod wrapped,
         if (universe.hostVM.buildingImageLayer()) {
             var annotationExtractor = universe.getAnnotationExtractor();
             if (annotationExtractor.hasAnnotation(wrapped, LayeredCompilationBehavior.class)) {
-                LayeredCompilationBehavior behavior = annotationExtractor.extractAnnotation(wrapped, LayeredCompilationBehavior.class, true);
+                LayeredCompilationBehavior behavior = annotationExtractor.extractAnnotation(wrapped, LayeredCompilationBehavior.class);
                 compilationBehavior = behavior.value();
                 if (compilationBehavior == LayeredCompilationBehavior.Behavior.PINNED_TO_INITIAL_LAYER && universe.hostVM.buildingExtensionLayer() && !isInBaseLayer) {
                     var errorMessage = String.format("User methods with layered compilation behavior %s must be registered via %s in the initial layer",

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

@@ -134,7 +134,7 @@ private void findSystemElements(Class<?> systemClass) {
 
     private boolean isInPlatform(AnnotatedElement element) {
         try {
-            Platforms platformAnnotation = classLoaderSupport.annotationExtractor.extractAnnotation(element, Platforms.class, false);
+            Platforms platformAnnotation = classLoaderSupport.annotationExtractor.extractAnnotation(element, Platforms.class);
             return NativeImageGenerator.includedIn(platform, platformAnnotation);
         } catch (Throwable t) {
             handleClassLoadingError(t);
@@ -167,7 +167,7 @@ void handleClass(Class<?> clazz) {
         do {
             Platforms platformsAnnotation;
             try {
-                platformsAnnotation = classLoaderSupport.annotationExtractor.extractAnnotation(cur, Platforms.class, false);
+                platformsAnnotation = classLoaderSupport.annotationExtractor.extractAnnotation(cur, Platforms.class);
             } catch (Throwable t) {
                 handleClassLoadingError(t);
                 return;

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

@@ -207,7 +207,7 @@ void seal() {
         static SingletonTraitMap getAnnotatedTraits(Class<?> singletonClass, AnnotationExtractor extractor, boolean layeredBuild) {
             SingletonTraitMap traitMap = SingletonTraitMap.create();
             if (extractor != null) {
-                SingletonTraits annotation = extractor.extractAnnotation(singletonClass, SingletonTraits.class, false);
+                SingletonTraits annotation = extractor.extractAnnotation(singletonClass, SingletonTraits.class);
 
                 if (annotation != null) {
                     if (annotation.access() != null) {
@@ -630,7 +630,7 @@ public SingletonTraitMap getUninstalledSingletonTraitMap(Class<?> key) {
 
             SingletonInfo info = configObjects.computeIfAbsent(key, k -> {
 
-                SingletonTraits annotation = extractor.extractAnnotation(k, SingletonTraits.class, false);
+                SingletonTraits annotation = extractor.extractAnnotation(k, SingletonTraits.class);
                 if (annotation != null) {
                     if (annotation.layeredInstallationKind() != null) {
                         var installationKindSupplierClass = annotation.layeredInstallationKind();

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

@@ -45,7 +45,7 @@ default boolean isAnnotationPresent(Class<? extends Annotation> annotationClass)
 
     @Override
     default <T extends Annotation> T getAnnotation(Class<T> annotationClass) {
-        return ImageSingletons.lookup(AnnotationExtractor.class).extractAnnotation(this, annotationClass, false);
+        return ImageSingletons.lookup(AnnotationExtractor.class).extractAnnotation(this, annotationClass);
     }
 
     @Override