moved most SubstrateAnnotationExtractor logic in com.oracle.svm.util

Author: dougxc

substratevm/mx.substratevm/suite.py

@@ -228,7 +228,10 @@
                 "compiler:GRAAL",
             ],
             "requiresConcealed" : {
-                "java.base" : ["jdk.internal.module"],
+                "java.base" : [
+                    "jdk.internal.module",
+                    "sun.reflect.annotation"
+                ],
                 "jdk.internal.vm.ci": [
                     "jdk.vm.ci.meta",
                     "jdk.vm.ci.meta.annotation",
@@ -1590,6 +1593,7 @@
             "requiresConcealed": {
                 "jdk.internal.vm.ci": [
                     "jdk.vm.ci.meta",
+                    "jdk.vm.ci.meta.annotation",
                     "jdk.vm.ci.code",
                     "jdk.vm.ci.common",
                 ]
@@ -1639,6 +1643,7 @@
             "requiresConcealed" : {
                 "jdk.internal.vm.ci" : [
                     "jdk.vm.ci.meta",
+                    "jdk.vm.ci.meta.annotation",
                     "jdk.vm.ci.code",
                 ],
                 "java.base" : [

substratevm/src/com.oracle.graal.pointsto.standalone/src/com/oracle/graal/pointsto/standalone/StandaloneAnnotationExtractor.java

@@ -26,12 +26,12 @@
 
 package com.oracle.graal.pointsto.standalone;
 
-import org.graalvm.nativeimage.impl.AnnotationExtractor;
-
 import java.lang.annotation.Annotation;
 import java.lang.reflect.AnnotatedElement;
 import java.util.Arrays;
 
+import org.graalvm.nativeimage.impl.AnnotationExtractor;
+
 public class StandaloneAnnotationExtractor implements AnnotationExtractor {
     // Checkstyle: allow direct annotation access
     @Override

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/infrastructure/WrappedJavaField.java

@@ -24,10 +24,18 @@
  */
 package com.oracle.graal.pointsto.infrastructure;
 
+import com.oracle.svm.util.AnnotatedWrapper;
+
 import jdk.vm.ci.meta.ResolvedJavaField;
+import jdk.vm.ci.meta.annotation.Annotated;
 
-public interface WrappedJavaField extends ResolvedJavaField, WrappedElement {
+public interface WrappedJavaField extends ResolvedJavaField, WrappedElement, AnnotatedWrapper {
 
     @Override
     ResolvedJavaField getWrapped();
+
+    @Override
+    default Annotated getWrappedAnnotated() {
+        return getWrapped();
+    }
 }

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/infrastructure/WrappedJavaMethod.java

@@ -24,10 +24,18 @@
  */
 package com.oracle.graal.pointsto.infrastructure;
 
+import com.oracle.svm.util.AnnotatedWrapper;
+
 import jdk.vm.ci.meta.ResolvedJavaMethod;
+import jdk.vm.ci.meta.annotation.Annotated;
 
-public interface WrappedJavaMethod extends WrappedElement, ResolvedJavaMethod {
+public interface WrappedJavaMethod extends WrappedElement, AnnotatedWrapper, ResolvedJavaMethod {
 
     @Override
     ResolvedJavaMethod getWrapped();
+
+    @Override
+    default Annotated getWrappedAnnotated() {
+        return getWrapped();
+    }
 }

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/infrastructure/WrappedJavaType.java

@@ -24,10 +24,18 @@
  */
 package com.oracle.graal.pointsto.infrastructure;
 
+import com.oracle.svm.util.AnnotatedWrapper;
+
 import jdk.vm.ci.meta.ResolvedJavaType;
+import jdk.vm.ci.meta.annotation.Annotated;
 
-public interface WrappedJavaType extends WrappedElement, ResolvedJavaType {
+public interface WrappedJavaType extends WrappedElement, AnnotatedWrapper, ResolvedJavaType {
 
     @Override
     ResolvedJavaType getWrapped();
+
+    @Override
+    default Annotated getWrappedAnnotated() {
+        return getWrapped();
+    }
 }

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

@@ -26,6 +26,8 @@
 
 import java.lang.annotation.Annotation;
 
+import com.oracle.svm.util.AnnotationsContainer;
+
 import jdk.graal.compiler.debug.GraalError;
 import jdk.vm.ci.meta.JavaType;
 import jdk.vm.ci.meta.ResolvedJavaField;
@@ -37,7 +39,7 @@
  * If a field cannot be looked up by name, a {@link BaseLayerField} is created and put in an
  * {@link AnalysisField} to represent this missing field, using the information from the base layer.
  */
-public class BaseLayerField extends BaseLayerElement implements ResolvedJavaField {
+public class BaseLayerField extends AnnotationsContainer implements ResolvedJavaField {
     private final int id;
     private final String name;
     private final ResolvedJavaType declaringClass;

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

@@ -28,6 +28,7 @@
 import java.lang.reflect.Type;
 
 import com.oracle.graal.pointsto.infrastructure.ResolvedSignature;
+import com.oracle.svm.util.AnnotationsContainer;
 
 import jdk.graal.compiler.debug.GraalError;
 import jdk.vm.ci.meta.Constant;
@@ -50,7 +51,7 @@
  * {@link BaseLayerMethod} is created and put in an {@link AnalysisMethod} to represent this missing
  * method, using the information from the base layer.
  */
-public class BaseLayerMethod extends BaseLayerElement implements ResolvedJavaMethod {
+public class BaseLayerMethod extends AnnotationsContainer implements ResolvedJavaMethod {
     private static final String CLINIT = "<clinit>";
 
     private final int id;

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

@@ -28,6 +28,7 @@
 import java.util.List;
 
 import com.oracle.graal.pointsto.util.AnalysisError;
+import com.oracle.svm.util.AnnotationsContainer;
 import com.oracle.svm.util.OriginalClassProvider;
 
 import jdk.vm.ci.meta.Assumptions;
@@ -47,7 +48,7 @@
  * this case, a {@link BaseLayerType} is created using information from the base layer and wrapped
  * in an {@link AnalysisType} to replace this missing type is the new layer.
  */
-public class BaseLayerType extends BaseLayerElement implements ResolvedJavaType, OriginalClassProvider {
+public class BaseLayerType extends AnnotationsContainer implements ResolvedJavaType, OriginalClassProvider {
     /**
      * The type corresponding to this {@link BaseLayerType} can be created later while building the
      * new layer. To avoid both types having the same name, the name of the {@link BaseLayerType} is

substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/SubstrateField.java

@@ -48,6 +48,7 @@
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.PrimitiveConstant;
 import jdk.vm.ci.meta.ResolvedJavaField;
+import jdk.vm.ci.meta.annotation.AnnotationsInfo;
 
 public class SubstrateField implements SharedField {
 
@@ -157,19 +158,33 @@ public SubstrateType getDeclaringClass() {
         return declaringClass;
     }
 
+    private RuntimeException annotationsUnimplemented() {
+        return VMError.unimplemented("Annotations are not available for JIT compilation at image run time: " + format("%H.%n"));
+    }
+
+    @Override
+    public AnnotationsInfo getDeclaredAnnotationInfo() {
+        throw annotationsUnimplemented();
+    }
+
+    @Override
+    public AnnotationsInfo getTypeAnnotationInfo() {
+        throw annotationsUnimplemented();
+    }
+
     @Override
     public Annotation[] getAnnotations() {
-        throw VMError.unimplemented("Annotations are not available for JIT compilation at image run time");
+        throw annotationsUnimplemented();
     }
 
     @Override
     public Annotation[] getDeclaredAnnotations() {
-        throw VMError.unimplemented("Annotations are not available for JIT compilation at image run time");
+        throw annotationsUnimplemented();
     }
 
     @Override
     public <T extends Annotation> T getAnnotation(Class<T> annotationClass) {
-        throw VMError.unimplemented("Annotations are not available for JIT compilation at image run time");
+        throw annotationsUnimplemented();
     }
 
     @Override

substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/meta/SubstrateMethod.java

@@ -70,6 +70,7 @@
 import jdk.vm.ci.meta.Signature;
 import jdk.vm.ci.meta.SpeculationLog;
 import jdk.vm.ci.meta.TriState;
+import jdk.vm.ci.meta.annotation.AnnotationsInfo;
 
 public class SubstrateMethod implements SharedRuntimeMethod {
 
@@ -416,19 +417,33 @@ public ConstantPool getConstantPool() {
         throw intentionallyUnimplemented(); // ExcludeFromJacocoGeneratedReport
     }
 
+    private RuntimeException annotationsUnimplemented() {
+        return VMError.unimplemented("Annotations are not available for JIT compilation at image run time: " + format("%H.%n(%p)"));
+    }
+
+    @Override
+    public AnnotationsInfo getDeclaredAnnotationInfo() {
+        throw annotationsUnimplemented();
+    }
+
+    @Override
+    public AnnotationsInfo getTypeAnnotationInfo() {
+        throw annotationsUnimplemented();
+    }
+
     @Override
     public Annotation[] getAnnotations() {
-        throw VMError.unimplemented("Annotations are not available for JIT compilation at image run time");
+        throw annotationsUnimplemented();
     }
 
     @Override
     public Annotation[] getDeclaredAnnotations() {
-        throw VMError.unimplemented("Annotations are not available for JIT compilation at image run time");
+        throw annotationsUnimplemented();
     }
 
     @Override
     public <T extends Annotation> T getAnnotation(Class<T> annotationClass) {
-        throw VMError.unimplemented("Annotations are not available for JIT compilation at image run time");
+        throw annotationsUnimplemented();
     }
 
     @Override