[GR-6661] Add annotation arrays to the image.

PullRequest: graal/820
orangejyc · Dec 29, 2017 · 66a2f6c · 66a2f6c
2 parents 39557dc + a1cffc9
commit 66a2f6c
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 3 deletions.
diff --git a/...ratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisType.java b/...ratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisType.java
@@ -39,7 +39,6 @@
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
 
-import com.oracle.graal.pointsto.infrastructure.OriginalClassProvider;
 import org.graalvm.compiler.graph.Node;
 import org.graalvm.word.WordBase;
 
@@ -53,6 +52,7 @@
 import com.oracle.graal.pointsto.flow.TypeFlow;
 import com.oracle.graal.pointsto.flow.context.object.AnalysisObject;
 import com.oracle.graal.pointsto.flow.context.object.ConstantContextSensitiveObject;
+import com.oracle.graal.pointsto.infrastructure.OriginalClassProvider;
 import com.oracle.graal.pointsto.infrastructure.WrappedJavaType;
 import com.oracle.graal.pointsto.typestate.TypeState;
 
@@ -963,4 +963,12 @@ public boolean equals(Object obj) {
         return this == obj;
     }
 
+    /* Value copied from java.lang.Class. */
+    private static final int ANNOTATION = 0x00002000;
+
+    /* Method copied from java.lang.Class. */
+    public boolean isAnnotation() {
+        return (getModifiers() & ANNOTATION) != 0;
+    }
+
 }
diff --git a/...vm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisUniverse.java b/...vm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/meta/AnalysisUniverse.java
@@ -182,7 +182,7 @@ public JavaType lookupAllowUnresolved(JavaType rawType) {
         if (!(rawType instanceof ResolvedJavaType)) {
             return rawType;
         }
-        assert !(rawType instanceof AnalysisType);
+        assert !(rawType instanceof AnalysisType) : "lookupAllowUnresolved does not support analysis types.";
 
         ResolvedJavaType type = (ResolvedJavaType) rawType;
         type = substitutions.lookup(type);

diff --git a/...src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/annotation/AnnotationTypeFeature.java b/...src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/annotation/AnnotationTypeFeature.java
@@ -32,6 +32,7 @@
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.util.EconomicSet;
 
+import com.oracle.graal.pointsto.meta.AnalysisType;
 import com.oracle.graal.pointsto.meta.AnalysisUniverse;
 import com.oracle.svm.core.annotate.AutomaticFeature;
 import com.oracle.svm.core.hub.AnnotationTypeSupport;
@@ -56,7 +57,23 @@ public void afterRegistration(AfterRegistrationAccess access) {
 
     @Override
     public void duringAnalysis(DuringAnalysisAccess access) {
-        AnalysisUniverse universe = ((DuringAnalysisAccessImpl) access).getUniverse();
+        DuringAnalysisAccessImpl accessImpl = (DuringAnalysisAccessImpl) access;
+        AnalysisUniverse universe = accessImpl.getUniverse();
+
+        /*
+         * JDK implementation of repeatable annotations always instantiates an array of a requested
+         * annotation. We need to mark arrays of all reachable annotations as in heap.
+         */
+        universe.getTypes().stream()
+                        .filter(AnalysisType::isAnnotation)
+                        .filter(AnalysisType::isInTypeCheck)
+                        .map(type -> universe.lookup(type.getWrapped()).getArrayClass())
+                        .filter(annotationArray -> !annotationArray.isInstantiated())
+                        .forEach(annotationArray -> {
+                            accessImpl.registerAsInHeap(annotationArray);
+                            access.requireAnalysisIteration();
+                        });
+
         Stream<AnnotatedElement> allElements = Stream.concat(Stream.concat(universe.getFields().stream(), universe.getMethods().stream()), universe.getTypes().stream());
         Stream<AnnotatedElement> newElements = allElements.filter(visitedElements::add);
         newElements.forEach(this::reportAnnotation);