remove parsedCallback field

Author: teshull

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/api/ImageLayerWriter.java

@@ -24,6 +24,7 @@
  */
 package com.oracle.graal.pointsto.api;
 
+import com.oracle.graal.pointsto.flow.AnalysisParsedGraph;
 import com.oracle.graal.pointsto.meta.AnalysisMethod;
 import com.oracle.graal.pointsto.util.AnalysisError;
 
@@ -35,7 +36,7 @@ public void onTrackedAcrossLayer(AnalysisMethod method, Object reason) {
     }
 
     @SuppressWarnings("unused")
-    public void persistAnalysisParsedGraph(AnalysisMethod method) {
+    public void persistAnalysisParsedGraph(AnalysisMethod method, AnalysisParsedGraph analysisParsedGraph) {
         throw AnalysisError.shouldNotReachHere("This method should not be called");
     }
 }

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

@@ -39,6 +39,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
 import java.util.concurrent.locks.ReentrantLock;
@@ -61,7 +62,6 @@
 import com.oracle.graal.pointsto.infrastructure.WrappedJavaMethod;
 import com.oracle.graal.pointsto.reports.ReportUtils;
 import com.oracle.graal.pointsto.util.AnalysisError;
-import com.oracle.graal.pointsto.util.AnalysisFuture;
 import com.oracle.graal.pointsto.util.AtomicUtils;
 import com.oracle.graal.pointsto.util.ConcurrentLightHashSet;
 import com.oracle.svm.common.meta.MultiMethod;
@@ -143,8 +143,6 @@ public record Signature(String name, AnalysisType[] parameterTypes) {
 
     private final MultiMethodKey multiMethodKey;
 
-    private AnalysisFuture<Void> parsedCallBack;
-
     /**
      * Map from a key to the corresponding implementation. All multi-method implementations for a
      * given Java method share the same map. This allows one to easily switch between different
@@ -178,6 +176,7 @@ public record Signature(String name, AnalysisType[] parameterTypes) {
     private final boolean enableReachableInCurrentLayer;
 
     private final AtomicReference<GraphCacheEntry> parsedGraphCacheState = new AtomicReference<>(GraphCacheEntry.UNPARSED);
+    private final AtomicBoolean trackedGraphPersisted = new AtomicBoolean(false);
 
     private EncodedGraph analyzedGraph;
 
@@ -551,17 +550,10 @@ protected void notifyImplementationInvokedCallbacks() {
         ConcurrentLightHashSet.removeElementIf(this, implementationInvokedNotificationsUpdater, ElementNotification::isNotified);
     }
 
-    public void registerParsedGraphCallback(AnalysisFuture<Void> parsingCallBack) {
-        this.parsedCallBack = parsingCallBack;
-        if (getParsedGraphCacheStateObject() instanceof AnalysisParsedGraph) {
-            notifyParsedCallback();
-        }
-    }
-
-    private void notifyParsedCallback() {
-        if (parsedCallBack != null) {
-            parsedCallBack.ensureDone();
-            parsedCallBack = null;
+    private void persistTrackedGraph(AnalysisParsedGraph graph) {
+        if (isTrackedAcrossLayers() && trackedGraphPersisted.compareAndSet(false, true)) {
+            ImageLayerWriter imageLayerWriter = getUniverse().getImageLayerWriter();
+            imageLayerWriter.persistAnalysisParsedGraph(this, graph);
         }
     }
 
@@ -696,15 +688,16 @@ public void onReachable(Object reason) {
     @Override
     protected void onTrackedAcrossLayers(Object reason) {
         AnalysisError.guarantee(!getUniverse().sealed(), "Method %s was marked as tracked after the universe was sealed", this);
-        ImageLayerWriter imageLayerWriter = getUniverse().getImageLayerWriter();
-        imageLayerWriter.onTrackedAcrossLayer(this, reason);
+        getUniverse().getImageLayerWriter().onTrackedAcrossLayer(this, reason);
         declaringClass.registerAsTrackedAcrossLayers(reason);
         for (AnalysisType parameter : toParameterList()) {
             parameter.registerAsTrackedAcrossLayers(reason);
         }
         signature.getReturnType().registerAsTrackedAcrossLayers(reason);
 
-        registerParsedGraphCallback(new AnalysisFuture<>(() -> imageLayerWriter.persistAnalysisParsedGraph(this)));
+        if (getParsedGraphCacheStateObject() instanceof AnalysisParsedGraph analysisParsedGraph) {
+            persistTrackedGraph(analysisParsedGraph);
+        }
     }
 
     public void registerOverrideReachabilityNotification(MethodOverrideReachableNotification notification) {
@@ -1254,9 +1247,13 @@ private AnalysisParsedGraph setGraph(BigBang bb, Stage stage, GraphCacheEntry ex
             boolean result = parsedGraphCacheState.compareAndSet(lockState, newEntry);
             AnalysisError.guarantee(result, "State transition failed");
 
-            notifyParsedCallback();
+            AnalysisParsedGraph analysisParsedGraph = (AnalysisParsedGraph) newEntry.get(stage);
+
+            if (stage == Stage.finalStage()) {
+                persistTrackedGraph(analysisParsedGraph);
+            }
 
-            return (AnalysisParsedGraph) newEntry.get(stage);
+            return analysisParsedGraph;
 
         } catch (Throwable ex) {
             parsedGraphCacheState.set(GraphCacheEntry.createParsingError(stage, expectedValue, ex));

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/imagelayer/SVMImageLayerLoader.java

@@ -823,8 +823,9 @@ private PersistedAnalysisMethod.Reader getMethodData(AnalysisMethod analysisMeth
     }
 
     /**
-     * See {@link SVMImageLayerWriter#persistAnalysisParsedGraph(AnalysisMethod)} for
-     * implementation.
+     * See
+     * {@link SVMImageLayerWriter#persistAnalysisParsedGraph(AnalysisMethod, AnalysisParsedGraph)}
+     * for implementation.
      */
     @Override
     public boolean hasAnalysisParsedGraph(AnalysisMethod analysisMethod) {

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/imagelayer/SVMImageLayerWriter.java

@@ -904,8 +904,7 @@ private static AnalysisMethod getRelocatableConstantMethod(MethodPointer methodP
     }
 
     @Override
-    public void persistAnalysisParsedGraph(AnalysisMethod method) {
-        AnalysisParsedGraph analysisParsedGraph = (AnalysisParsedGraph) method.getParsedGraphCacheStateObject();
+    public void persistAnalysisParsedGraph(AnalysisMethod method, AnalysisParsedGraph analysisParsedGraph) {
         String name = imageLayerSnapshotUtil.getMethodDescriptor(method);
         MethodGraphsInfo graphsInfo = methodsMap.get(name);
         if (graphsInfo == null || graphsInfo.analysisGraphLocation == null) {