[GR-52596] Restrict applicability of RemoveOpaqueValuePhase.

pengxiaolong · Mar 11, 2024 · ac2a5f8 · ac2a5f8
1 parent 95cb384
commit ac2a5f8
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/GraphState.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/GraphState.java
@@ -66,7 +66,8 @@ public final class GraphState {
     private static final EnumSet<StageFlag> LOW_TIER_MANDATORY_STAGES = EnumSet.of(
                     StageFlag.LOW_TIER_LOWERING,
                     StageFlag.EXPAND_LOGIC,
-                    StageFlag.ADDRESS_LOWERING);
+                    StageFlag.ADDRESS_LOWERING,
+                    StageFlag.REMOVE_OPAQUE_VALUES);
     private static final EnumSet<StageFlag> ENTERPRISE_MID_TIER_MANDATORY_STAGES = EnumSet.of(
                     StageFlag.OPTIMISTIC_ALIASING,
                     StageFlag.GUARD_LOWERING,
@@ -629,6 +630,7 @@ public enum StageFlag {
         PARTIAL_REDUNDANCY_SCHEDULE,
         ADDRESS_LOWERING,
         FINAL_CANONICALIZATION,
+        REMOVE_OPAQUE_VALUES,
         TARGET_VECTOR_LOWERING,
     }
 

diff --git a/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/CanonicalizerPhase.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/CanonicalizerPhase.java
@@ -236,7 +236,9 @@ public boolean mustApply(GraphState graphState) {
 
     @Override
     public Optional<NotApplicable> notApplicableTo(GraphState graphState) {
-        return NotApplicable.unlessRunBefore(this, StageFlag.FINAL_CANONICALIZATION, graphState);
+        return NotApplicable.ifAny(
+                        NotApplicable.unlessRunBefore(this, StageFlag.FINAL_CANONICALIZATION, graphState),
+                        NotApplicable.unlessRunBefore(this, StageFlag.REMOVE_OPAQUE_VALUES, graphState));
     }
 
     @Override

diff --git a/...r/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/RemoveOpaqueValuePhase.java b/...r/src/jdk.graal.compiler/src/jdk/graal/compiler/phases/common/RemoveOpaqueValuePhase.java
@@ -28,6 +28,7 @@
 
 import jdk.graal.compiler.nodes.GraphState;
 import jdk.graal.compiler.nodes.StructuredGraph;
+import jdk.graal.compiler.nodes.GraphState.StageFlag;
 import jdk.graal.compiler.nodes.extended.OpaqueValueNode;
 import jdk.graal.compiler.nodes.spi.CoreProviders;
 import jdk.graal.compiler.phases.BasePhase;
@@ -38,7 +39,9 @@
 public class RemoveOpaqueValuePhase extends BasePhase<CoreProviders> {
     @Override
     public Optional<NotApplicable> notApplicableTo(GraphState graphState) {
-        return ALWAYS_APPLICABLE;
+        return NotApplicable.ifAny(
+                        NotApplicable.unlessRunAfter(this, StageFlag.LOW_TIER_LOWERING, graphState),
+                        NotApplicable.ifApplied(this, StageFlag.REMOVE_OPAQUE_VALUES, graphState));
     }
 
     @Override
@@ -52,4 +55,10 @@ protected void run(StructuredGraph graph, CoreProviders context) {
             opaque.replaceAtUsagesAndDelete(opaque.getValue());
         }
     }
+
+    @Override
+    public void updateGraphState(GraphState graphState) {
+        super.updateGraphState(graphState);
+        graphState.setAfterStage(StageFlag.REMOVE_OPAQUE_VALUES);
+    }
 }