[GR-58924] Make sure onInputSaturated and onObservedSaturated are exe…

…cuted only once PullRequest: graal/18982
oracle · Oct 9, 2024 · d7e017c · d7e017c
2 parents ecbac71 + 1f9c54f
commit d7e017c
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 31 deletions.
diff --git a/...src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/FieldFilterTypeFlow.java b/...src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/FieldFilterTypeFlow.java
@@ -75,13 +75,6 @@ public void addPredicated(PointsToAnalysis bb, TypeFlow<?> predicatedFlow) {
 
     @Override
     protected void onInputSaturated(PointsToAnalysis bb, TypeFlow<?> input) {
-        if (!isFlowEnabled()) {
-            inputSaturated = true;
-            /* Another thread could enable the flow in the meantime, so check again. */
-            if (!isFlowEnabled()) {
-                return;
-            }
-        }
         if (!setSaturated()) {
             return;
         }

diff --git a/...tevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/FilterTypeFlow.java b/...tevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/FilterTypeFlow.java
@@ -112,13 +112,6 @@ public void addPredicated(PointsToAnalysis bb, TypeFlow<?> predicatedFlow) {
     @Override
     protected void onInputSaturated(PointsToAnalysis bb, TypeFlow<?> input) {
         if (isAssignable) {
-            if (!isFlowEnabled()) {
-                inputSaturated = true;
-                /* Another thread could enable the flow in the meantime, so check again. */
-                if (!isFlowEnabled()) {
-                    return;
-                }
-            }
             if (!setSaturated()) {
                 return;
             }

diff --git a/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/TypeFlow.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/flow/TypeFlow.java
@@ -597,7 +597,7 @@ public boolean addUse(PointsToAnalysis bb, TypeFlow<?> use, boolean propagateTyp
     }
 
     protected void notifyUseOfSaturation(PointsToAnalysis bb, TypeFlow<?> use) {
-        use.onInputSaturated(bb, this);
+        use.markInputSaturated(bb, this);
     }
 
     protected boolean doAddUse(PointsToAnalysis bb, TypeFlow<?> use) {
@@ -671,7 +671,7 @@ public boolean addObserver(PointsToAnalysis bb, TypeFlow<?> observer, boolean tr
     }
 
     protected void notifyObserverOfSaturation(PointsToAnalysis bb, TypeFlow<?> observer) {
-        observer.onObservedSaturated(bb, this);
+        observer.markObservedSaturated(bb, this);
     }
 
     private boolean doAddObserver(PointsToAnalysis bb, TypeFlow<?> observer) {
@@ -925,6 +925,22 @@ private void swapAtPredicated(PointsToAnalysis bb, TypeFlow<?> newFlow, TypeFlow
         newFlow.addPredicated(bb, predicatedFlow);
     }
 
+    /**
+     * Notifies this flow that its input has saturated, but only runs the
+     * {@link TypeFlow#onInputSaturated}} if this flow is enabled. Otherwise, the execution of
+     * callback is delayed to {@link TypeFlow#enableFlow}.
+     */
+    private void markInputSaturated(PointsToAnalysis bb, TypeFlow<?> input) {
+        if (!isFlowEnabled()) {
+            inputSaturated = true;
+            /* Another thread could enable the flow in the meantime, so check again. */
+            if (!isFlowEnabled()) {
+                return;
+            }
+        }
+        onInputSaturated(bb, input);
+    }
+
     /**
      * Notified by an input that it is saturated and it will stop sending updates.
      */
@@ -935,13 +951,6 @@ protected void onInputSaturated(PointsToAnalysis bb, @SuppressWarnings("unused")
             return;
         }
 
-        if (!isFlowEnabled()) {
-            inputSaturated = true;
-            /* Another thread could enable the flow in the meantime, so check again. */
-            if (!isFlowEnabled()) {
-                return;
-            }
-        }
         /*
          * By default when a type flow is notified that one of its inputs is saturated it will just
          * pass this information to its uses and observers and unlink them. Subclases should
@@ -950,6 +959,22 @@ protected void onInputSaturated(PointsToAnalysis bb, @SuppressWarnings("unused")
         onSaturated(bb);
     }
 
+    /**
+     * Notifies this flow that its observed flow has saturated, but only runs the
+     * {@link TypeFlow#onObservedSaturated}} if this flow is enabled. Otherwise, the execution of
+     * callback is delayed to {@link TypeFlow#enableFlow}.
+     */
+    private void markObservedSaturated(PointsToAnalysis bb, TypeFlow<?> observed) {
+        if (!isFlowEnabled()) {
+            observedSaturated = true;
+            /* Another thread could enable the flow in the meantime, so check again. */
+            if (!isFlowEnabled()) {
+                return;
+            }
+        }
+        onObservedSaturated(bb, observed);
+    }
+
     /**
      * Notified by an observed flow that it is saturated.
      */

diff --git a/....graal.pointsto/src/com/oracle/graal/pointsto/typestate/DefaultVirtualInvokeTypeFlow.java b/....graal.pointsto/src/com/oracle/graal/pointsto/typestate/DefaultVirtualInvokeTypeFlow.java
@@ -138,14 +138,6 @@ public void onObservedUpdate(PointsToAnalysis bb) {
 
     @Override
     public void onObservedSaturated(PointsToAnalysis bb, TypeFlow<?> observed) {
-        if (!isFlowEnabled()) {
-            observedSaturated = true;
-            /* Another thread could enable the flow in the meantime, so check again. */
-            if (!isFlowEnabled()) {
-                return;
-            }
-        }
-
         if (!setSaturated()) {
             return;
         }