[GR-58690] Typeflow.getState() cleanup

PullRequest: graal/18980

Author: d-kozak

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

@@ -210,7 +210,9 @@ public void forceUnsafeUpdate(AnalysisField field) {
              * update; an update of the receiver object flow will trigger an updated of the
              * observers, i.e., of the unsafe load.
              */
-            this.postFlow(unsafeLoad.receiver());
+            if (unsafeLoad.receiver().isFlowEnabled()) {
+                this.postFlow(unsafeLoad.receiver());
+            }
         }
 
         // force update of the unsafe stores
@@ -223,7 +225,9 @@ public void forceUnsafeUpdate(AnalysisField field) {
              * update; an update of the receiver object flow will trigger an updated of the
              * observers, i.e., of the unsafe store.
              */
-            this.postFlow(unsafeStore.receiver());
+            if (unsafeStore.receiver().isFlowEnabled()) {
+                this.postFlow(unsafeStore.receiver());
+            }
         }
     }
 
@@ -563,6 +567,7 @@ public interface TypeFlowRunnable extends DebugContextRunnable {
     }
 
     public void postFlow(final TypeFlow<?> operation) {
+        assert operation.isFlowEnabled() : "Only enabled flows should be updated: " + operation;
         if (operation.inQueue) {
             return;
         }
@@ -766,7 +771,8 @@ public void addCompleted(DebugContextRunnable r, long nanos) {
                 TypeFlow<?> tf = ((TypeFlowRunnable) r).getTypeFlow();
                 String source = String.valueOf(tf.getSource());
                 System.out.format("LONG RUNNING  %.2f  %s %x %s  state %s %x  uses %d observers %d%n", (double) nanos / 1_000_000_000, ClassUtil.getUnqualifiedName(tf.getClass()),
-                                System.identityHashCode(tf), source, PointsToStats.asString(tf.getState()), System.identityHashCode(tf.getState()), tf.getUses().size(), tf.getObservers().size());
+                                System.identityHashCode(tf), source, PointsToStats.asString(tf.getRawState()), System.identityHashCode(tf.getRawState()), tf.getUses().size(),
+                                tf.getObservers().size());
             }
         }
 

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

@@ -47,7 +47,9 @@ protected AbstractSpecialInvokeTypeFlow(PointsToAnalysis bb, MethodFlowsGraph me
 
     @Override
     protected void onFlowEnabled(PointsToAnalysis bb) {
-        bb.postTask(() -> onObservedUpdate(bb));
+        if (getReceiver().isFlowEnabled()) {
+            bb.postTask(() -> onObservedUpdate(bb));
+        }
     }
 
     @Override
@@ -71,7 +73,7 @@ public void onObservedSaturated(PointsToAnalysis bb, TypeFlow<?> observed) {
 
     @Override
     public String toString() {
-        return "SpecialInvoke<" + targetMethod.format("%h.%n") + ">" + ":" + getState();
+        return "SpecialInvoke<" + targetMethod.format("%h.%n") + ">" + ":" + getStateDescription();
     }
 
 }

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

@@ -43,6 +43,6 @@ protected AbstractStaticInvokeTypeFlow(PointsToAnalysis bb, MethodFlowsGraph met
 
     @Override
     public String toString() {
-        return "StaticInvoke<" + targetMethod.format("%h.%n") + ">" + ":" + getState();
+        return "StaticInvoke<" + targetMethod.format("%h.%n") + ">" + ":" + getStateDescription();
     }
 }

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

@@ -89,7 +89,9 @@ public final boolean isDirectInvoke() {
 
     @Override
     protected void onFlowEnabled(PointsToAnalysis bb) {
-        bb.postTask(() -> onObservedUpdate(bb));
+        if (getReceiver().isFlowEnabled()) {
+            bb.postTask(() -> onObservedUpdate(bb));
+        }
     }
 
     @Override
@@ -129,6 +131,6 @@ public Collection<AnalysisMethod> getCalleesForReturnLinking() {
 
     @Override
     public String toString() {
-        return "VirtualInvoke<" + targetMethod.format("%h.%n") + ">" + ":" + getState();
+        return "VirtualInvoke<" + targetMethod.format("%h.%n") + ">" + ":" + getStateDescription();
     }
 }

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

@@ -24,10 +24,10 @@
  */
 package com.oracle.graal.pointsto.flow;
 
-import jdk.graal.compiler.nodes.ValueNode;
-
 import com.oracle.graal.pointsto.meta.AnalysisType;
 
+import jdk.graal.compiler.nodes.ValueNode;
+
 /**
  * A sink type flow for the context insensitive invoke used to link in parameters in each caller
  * context.
@@ -39,6 +39,6 @@ public ActualParameterTypeFlow(AnalysisType declaredType) {
 
     @Override
     public String toString() {
-        return "ActualParameter<" + getState() + '>';
+        return "ActualParameter<" + getStateDescription() + '>';
     }
 }

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

@@ -53,7 +53,7 @@ public TypeFlow<BytecodePosition> copy(PointsToAnalysis bb, MethodFlowsGraph met
 
     @Override
     public String toString() {
-        return "ActualReturn<" + getState() + '>';
+        return "ActualReturn<" + getStateDescription() + '>';
     }
 
     public void setInvokeFlow(InvokeTypeFlow invokeFlow) {
@@ -68,7 +68,7 @@ public InvokeTypeFlow invokeFlow() {
     public String format(boolean withState, boolean withSource) {
         return "Actual return of call to " + invokeFlow.targetMethod.format("%H.%n(%p)") +
                         (withSource ? " at " + formatSource() : "") +
-                        (withState ? " with state <" + getState() + ">" : "");
+                        (withState ? " with state <" + getStateDescription() + ">" : "");
     }
 
 }

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

@@ -141,6 +141,6 @@ public TypeFlow<?> destination() {
 
     @Override
     public String toString() {
-        return "ArrayCopyTypeFlow<" + getState() + ">";
+        return "ArrayCopyTypeFlow<" + getStateDescription() + ">";
     }
 }

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

@@ -85,7 +85,7 @@ public AnalysisObject object() {
 
     @Override
     public String toString() {
-        return "MixedElementsFlow<" + source.getName() + "\n" + getState() + ">";
+        return "MixedElementsFlow<" + source.getName() + "\n" + getStateDescription() + ">";
     }
 
 }

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

@@ -61,7 +61,7 @@ public TypeFlow<BytecodePosition> copy(PointsToAnalysis bb, MethodFlowsGraph met
 
     @Override
     public boolean addState(PointsToAnalysis bb, TypeState add) {
-        return super.addState(bb, eval());
+        return super.addState(bb, eval(bb));
     }
 
     @Override
@@ -70,17 +70,17 @@ protected void onInputSaturated(PointsToAnalysis bb, TypeFlow<?> input) {
          * If an input saturated, it does not mean that the condition has to always saturate as
          * well, e.g. Any == {5} will return {5}.
          */
-        super.addState(bb, eval());
+        super.addState(bb, eval(bb));
     }
 
     /**
      * Compares the type states of left and right.
      *
      * @return can be either empty, true, false, or any.
      */
-    public TypeState eval() {
-        var leftState = left.isSaturated() ? TypeState.anyPrimitiveState() : left.getState();
-        var rightState = right.isSaturated() ? TypeState.anyPrimitiveState() : right.getState();
+    public TypeState eval(PointsToAnalysis bb) {
+        var leftState = left.getOutputState(bb);
+        var rightState = right.getOutputState(bb);
         if (leftState.isEmpty() || rightState.isEmpty()) {
             return TypeState.forEmpty();
         }

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

@@ -46,7 +46,7 @@ public TypeFlow<BytecodePosition> copy(PointsToAnalysis bb, MethodFlowsGraph met
 
     @Override
     public String toString() {
-        return "BoxFlow<" + getState() + ">";
+        return "BoxFlow<" + getStateDescription() + ">";
     }
 
 }