Allow re-scanning after analysis.

Author: cstancu

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/heap/HeapSnapshotVerifier.java

@@ -27,6 +27,7 @@
 import static com.oracle.graal.pointsto.ObjectScanner.ScanReason;
 
 import java.util.Objects;
+import java.util.concurrent.ForkJoinPool;
 import java.util.function.Consumer;
 
 import org.graalvm.compiler.options.Option;
@@ -73,6 +74,12 @@ public HeapSnapshotVerifier(BigBang bb, ImageHeap imageHeap, ImageHeapScanner sc
         verbosity = Options.HeapVerifierVerbosity.getValue(bb.getOptions());
     }
 
+    public boolean checkHeapSnapshot(UniverseMetaAccess metaAccess, ForkJoinPool threadPool, String stage) {
+        CompletionExecutor executor = new CompletionExecutor(bb, threadPool, bb.getHeartbeatCallback());
+        executor.init();
+        return checkHeapSnapshot(metaAccess, executor, stage, false);
+    }
+
     /**
      * Heap verification does a complete scan from roots (static fields and embedded constant) and
      * compares the object graph against the shadow heap. If any new reachable objects or primitive

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/heap/ImageHeapScanner.java

@@ -522,15 +522,7 @@ public JavaConstant readFieldValue(AnalysisField field, JavaConstant receiver) {
         return constantReflection.readFieldValue(field, receiver);
     }
 
-    protected boolean skipScanning() {
-        return false;
-    }
-
     public void rescanRoot(Field reflectionField) {
-        if (skipScanning()) {
-            return;
-        }
-
         maybeRunInExecutor(unused -> {
             AnalysisType type = metaAccess.lookupJavaType(reflectionField.getDeclaringClass());
             if (type.isReachable()) {
@@ -546,9 +538,6 @@ public void rescanRoot(Field reflectionField) {
     }
 
     public void rescanField(Object receiver, Field reflectionField) {
-        if (skipScanning()) {
-            return;
-        }
         maybeRunInExecutor(unused -> {
             AnalysisType type = metaAccess.lookupJavaType(reflectionField.getDeclaringClass());
             if (type.isReachable()) {
@@ -618,9 +607,6 @@ public void rescanObject(Object object) {
      * Add the object to the image heap.
      */
     public void rescanObject(Object object, ScanReason reason) {
-        if (skipScanning()) {
-            return;
-        }
         if (object == null) {
             return;
         }

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

@@ -186,9 +186,10 @@ public enum UsageKind {
     private final AnalysisFuture<Void> initializeMetaDataTask;
 
     /**
-     * Additional information that is only available for types that are marked as reachable.
+     * Additional information that is only available for types that are marked as reachable. It is
+     * preserved after analysis.
      */
-    private AnalysisFuture<TypeData> typeData;
+    private final AnalysisFuture<TypeData> typeData;
 
     /**
      * Contains reachability handlers that are notified when any of the subtypes are marked as
@@ -347,7 +348,6 @@ public void cleanupAfterAnalysis() {
         constantObjectsCache = null;
         uniqueConstant = null;
         unsafeAccessedFields = null;
-        typeData = null;
         scheduledTypeReachableNotifications = null;
     }
 

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

@@ -49,6 +49,8 @@
 public final class PointsToAnalysisMethod extends AnalysisMethod {
 
     private MethodTypeFlow typeFlow;
+    /** The parsing context in which given method was parsed, preserved after analysis. */
+    private final Object parsingReason;
 
     private Set<InvokeTypeFlow> invokedBy;
     private Set<InvokeTypeFlow> implementationInvokedBy;
@@ -69,11 +71,13 @@ public final class PointsToAnalysisMethod extends AnalysisMethod {
     public PointsToAnalysisMethod(AnalysisUniverse universe, ResolvedJavaMethod wrapped) {
         super(universe, wrapped, MultiMethod.ORIGINAL_METHOD, null);
         typeFlow = declaringClass.universe.analysisPolicy().createMethodTypeFlow(this);
+        parsingReason = typeFlow.getParsingReason();
     }
 
     private PointsToAnalysisMethod(AnalysisMethod original, MultiMethodKey multiMethodKey) {
         super(original, multiMethodKey);
         typeFlow = declaringClass.universe.analysisPolicy().createMethodTypeFlow(this);
+        parsingReason = typeFlow.getParsingReason();
     }
 
     @Override
@@ -149,7 +153,7 @@ public Iterable<? extends InvokeInfo> getInvokes() {
 
     @Override
     public Object getParsingReason() {
-        return typeFlow.getParsingReason();
+        return parsingReason;
     }
 
     public InvokeTypeFlow initAndGetContextInsensitiveInvoke(PointsToAnalysis bb, BytecodePosition originalLocation, boolean isSpecial, MultiMethodKey callerMultiMethodKey) {

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

@@ -688,6 +688,10 @@ protected void doRun(Map<Method, CEntryPointData> entryPoints,
                 featureHandler.forEachFeature(feature -> feature.afterCompilation(config));
                 BuildPhaseProvider.markCompilationFinished();
             }
+
+            /* Re-run shadow heap verification after compilation. */
+            aUniverse.getHeapVerifier().checkHeapSnapshot(hMetaAccess, compilationExecutor, "after compilation");
+
             CodeCacheProvider codeCacheProvider = runtimeConfiguration.getBackendForNormalMethod().getProviders().getCodeCache();
             reporter.printCreationStart();
             try (Indent indent = debug.logAndIndent("create native image")) {
@@ -704,6 +708,9 @@ protected void doRun(Map<Method, CEntryPointData> entryPoints,
                         AfterHeapLayoutAccessImpl config = new AfterHeapLayoutAccessImpl(featureHandler, loader, heap, hMetaAccess, debug);
                         featureHandler.forEachFeature(feature -> feature.afterHeapLayout(config));
 
+                        /* Re-run shadow heap verification after heap layout. */
+                        aUniverse.getHeapVerifier().checkHeapSnapshot(hMetaAccess, compilationExecutor, "after heap layout");
+
                         createAbstractImage(k, hostedEntryPoints, heap, hMetaAccess, codeCache);
 
                         if (ImageSingletons.contains(DynamicMethodAddressResolutionHostedSupport.class)) {

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/heap/SVMImageHeapScanner.java

@@ -46,7 +46,6 @@
 import com.oracle.graal.pointsto.heap.value.ValueSupplier;
 import com.oracle.graal.pointsto.meta.AnalysisField;
 import com.oracle.graal.pointsto.meta.AnalysisMetaAccess;
-import com.oracle.svm.core.BuildPhaseProvider;
 import com.oracle.svm.core.hub.DynamicHub;
 import com.oracle.svm.core.jdk.VarHandleFeature;
 import com.oracle.svm.core.util.VMError;
@@ -135,11 +134,6 @@ protected JavaConstant transformFieldValue(AnalysisField field, JavaConstant rec
         return ((AnalysisConstantReflectionProvider) constantReflection).interceptValue(metaAccess, field, originalValueConstant);
     }
 
-    @Override
-    protected boolean skipScanning() {
-        return BuildPhaseProvider.isAnalysisFinished();
-    }
-
     @Override
     protected void rescanEconomicMap(EconomicMap<?, ?> map) {
         super.rescanEconomicMap(map);