Refactor TypeFlow init.

Author: cstancu

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/PointsToAnalysis.java

@@ -181,7 +181,7 @@ public void forceUnsafeUpdate(AnalysisField field) {
         // force update of the unsafe loads
         for (AbstractUnsafeLoadTypeFlow unsafeLoad : unsafeLoads.keySet()) {
             /* Force update for unsafe accessed static fields. */
-            unsafeLoad.initFlow(this);
+            unsafeLoad.forceUpdate(this);
 
             /*
              * Force update for unsafe accessed instance fields: post the receiver object flow for
@@ -194,7 +194,7 @@ public void forceUnsafeUpdate(AnalysisField field) {
         // force update of the unsafe stores
         for (AbstractUnsafeStoreTypeFlow unsafeStore : unsafeStores.keySet()) {
             /* Force update for unsafe accessed static fields. */
-            unsafeStore.initFlow(this);
+            unsafeStore.forceUpdate(this);
 
             /*
              * Force update for unsafe accessed instance fields: post the receiver object flow for

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/AbstractStaticInvokeTypeFlow.java

@@ -41,6 +41,12 @@ protected AbstractStaticInvokeTypeFlow(PointsToAnalysis bb, MethodFlowsGraph met
         super(bb, methodFlows, original);
     }
 
+    @Override
+    public void initFlow(PointsToAnalysis bb) {
+        /* Trigger the update for static invokes, there is no receiver to trigger it. */
+        bb.postFlow(this);
+    }
+
     @Override
     public String toString() {
         return "StaticInvoke<" + targetMethod.format("%h.%n") + ">" + ":" + getState();

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/MethodFlowsGraph.java

@@ -41,8 +41,6 @@
 import org.graalvm.compiler.nodes.EncodedGraph.EncodedNodeReference;
 
 import com.oracle.graal.pointsto.PointsToAnalysis;
-import com.oracle.graal.pointsto.flow.OffsetLoadTypeFlow.AbstractUnsafeLoadTypeFlow;
-import com.oracle.graal.pointsto.flow.OffsetStoreTypeFlow.AbstractUnsafeStoreTypeFlow;
 import com.oracle.graal.pointsto.meta.AnalysisMethod;
 import com.oracle.graal.pointsto.meta.PointsToAnalysisMethod;
 import com.oracle.graal.pointsto.util.AnalysisError;
@@ -115,23 +113,11 @@ public <T extends TypeFlow<?>> T lookupCloneOf(@SuppressWarnings("unused") Point
 
     public void init(final PointsToAnalysis bb) {
         for (TypeFlow<?> flow : flows()) {
-            if (flow instanceof AbstractUnsafeLoadTypeFlow) {
-                bb.registerUnsafeLoad((AbstractUnsafeLoadTypeFlow) flow);
-            }
-            if (flow instanceof AbstractUnsafeStoreTypeFlow) {
-                bb.registerUnsafeStore((AbstractUnsafeStoreTypeFlow) flow);
-            }
-
             /*
              * Run initialization code for corner case type flows. This can be used to add link from
              * 'outside' into the graph.
              */
             flow.initFlow(bb);
-
-            /* Trigger the update for static invokes, there is no receiver to trigger it. */
-            if (flow instanceof AbstractStaticInvokeTypeFlow) {
-                bb.postFlow(flow);
-            }
         }
     }
 

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/MethodFlowsGraphClone.java

@@ -210,12 +210,6 @@ void linkCloneFlows(final PointsToAnalysis bb) {
                     clone.addUse(bb, clonedUse);
                 }
             }
-
-            if (clone instanceof AbstractStaticInvokeTypeFlow) {
-                /* Trigger the update for static invokes, there is no receiver to trigger it. */
-                AbstractStaticInvokeTypeFlow invokeFlow = (AbstractStaticInvokeTypeFlow) clone;
-                bb.postFlow(invokeFlow);
-            }
         }
     }
 

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/OffsetLoadTypeFlow.java

@@ -152,18 +152,17 @@ public abstract static class AbstractUnsafeLoadTypeFlow extends OffsetLoadTypeFl
         }
 
         @Override
-        public final AbstractUnsafeLoadTypeFlow copy(PointsToAnalysis bb, MethodFlowsGraph methodFlows) {
-            AbstractUnsafeLoadTypeFlow copy = makeCopy(bb, methodFlows);
-            // Register the unsafe load. It will be force-updated when new unsafe fields are
-            // registered. Only the clones are registered since the original flows are not updated.
-            bb.registerUnsafeLoad(copy);
-            return copy;
+        public void initFlow(PointsToAnalysis bb) {
+            assert !bb.analysisPolicy().isContextSensitiveAnalysis() || this.isClone();
+            /*
+             * Register the unsafe load. It will be force-updated when new unsafe fields are
+             * registered.
+             */
+            bb.registerUnsafeLoad(this);
+            forceUpdate(bb);
         }
 
-        protected abstract AbstractUnsafeLoadTypeFlow makeCopy(PointsToAnalysis bb, MethodFlowsGraph methodFlows);
-
-        @Override
-        public void initFlow(PointsToAnalysis bb) {
+        public void forceUpdate(PointsToAnalysis bb) {
             /*
              * Unsafe load type flow models unsafe reads from both instance and static fields. From
              * an analysis stand point for static fields the base doesn't matter. An unsafe load can
@@ -186,7 +185,7 @@ private UnsafeLoadTypeFlow(PointsToAnalysis bb, MethodFlowsGraph methodFlows, Un
         }
 
         @Override
-        public UnsafeLoadTypeFlow makeCopy(PointsToAnalysis bb, MethodFlowsGraph methodFlows) {
+        public AbstractUnsafeLoadTypeFlow copy(PointsToAnalysis bb, MethodFlowsGraph methodFlows) {
             return new UnsafeLoadTypeFlow(bb, methodFlows, this);
         }
 
@@ -244,7 +243,7 @@ private UnsafePartitionLoadTypeFlow(PointsToAnalysis bb, MethodFlowsGraph method
         }
 
         @Override
-        public UnsafePartitionLoadTypeFlow makeCopy(PointsToAnalysis bb, MethodFlowsGraph methodFlows) {
+        public AbstractUnsafeLoadTypeFlow copy(PointsToAnalysis bb, MethodFlowsGraph methodFlows) {
             return new UnsafePartitionLoadTypeFlow(bb, methodFlows, this);
         }
 

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/OffsetStoreTypeFlow.java

@@ -192,17 +192,23 @@ public abstract static class AbstractUnsafeStoreTypeFlow extends OffsetStoreType
 
         @Override
         public final AbstractUnsafeStoreTypeFlow copy(PointsToAnalysis bb, MethodFlowsGraph methodFlows) {
-            AbstractUnsafeStoreTypeFlow copy = makeCopy(bb, methodFlows);
-            // Register the unsafe store. It will be force-updated when new unsafe fields are
-            // registered. Only the clones are registered since the original flows are not updated.
-            bb.registerUnsafeStore(copy);
-            return copy;
+            return makeCopy(bb, methodFlows);
         }
 
         protected abstract AbstractUnsafeStoreTypeFlow makeCopy(PointsToAnalysis bb, MethodFlowsGraph methodFlows);
 
         @Override
         public void initFlow(PointsToAnalysis bb) {
+            assert !bb.analysisPolicy().isContextSensitiveAnalysis() || this.isClone();
+            /*
+             * Register the unsafe store. It will be force-updated when new unsafe fields are
+             * registered.
+             */
+            bb.registerUnsafeStore(this);
+            forceUpdate(bb);
+        }
+
+        public void forceUpdate(PointsToAnalysis bb) {
             /*
              * Unsafe store type flow models unsafe writes to both instance and static fields. From
              * an analysis stand point for static fields the base doesn't matter. An unsafe store

substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/TypeFlow.java

@@ -180,7 +180,7 @@ public TypeFlow<T> copy(PointsToAnalysis bb, MethodFlowsGraph methodFlows) {
     }
 
     /**
-     * Initialization code for some clone corner case type flows.
+     * Initialization code for some type flow corner cases.
      *
      * @param bb
      */