[GR-41842] CTW phase plan fuzzing fixes

PullRequest: graal/12956

Author: gergo-

compiler/src/org.graalvm.compiler.core.amd64/src/org/graalvm/compiler/core/amd64/UseTrappingDivPhase.java

@@ -80,7 +80,7 @@ private static boolean conditionIsZeroCheck(LogicNode condition, ValueNode divis
     }
 
     @Override
-    public Optional<NotApplicable> canApply(GraphState graphState) {
+    public Optional<NotApplicable> notApplicableTo(GraphState graphState) {
         return ALWAYS_APPLICABLE;
     }
 
@@ -209,7 +209,7 @@ public void actionBeforeGuardRewrite(DeoptimizingFixedWithNextNode trappingVersi
         }
 
         @Override
-        public Optional<NotApplicable> canApply(GraphState graphState) {
+        public Optional<NotApplicable> notApplicableTo(GraphState graphState) {
             return ALWAYS_APPLICABLE;
         }
 

compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/SingleRunSubphaseTest.java

@@ -49,7 +49,7 @@ static class EmptyPhase extends SingleRunSubphase<CoreProviders> {
         int mutableCounter = 0;
 
         @Override
-        public Optional<NotApplicable> canApply(GraphState graphState) {
+        public Optional<NotApplicable> notApplicableTo(GraphState graphState) {
             return ALWAYS_APPLICABLE;
         }
 

compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/TestBasePhase.java

@@ -30,12 +30,13 @@
 import org.graalvm.compiler.phases.BasePhase;
 
 /**
- * Base class for {@link BasePhase}s used in tests. The {@link BasePhase#canApply(GraphState)}
- * method of this class always returns {@link Optional#empty}.
+ * Base class for {@link BasePhase}s used in tests. The
+ * {@link BasePhase#notApplicableTo(GraphState)} method of this class always returns
+ * {@link Optional#empty}.
  */
 public abstract class TestBasePhase<C> extends BasePhase<C> {
     @Override
-    public Optional<NotApplicable> canApply(GraphState graphState) {
+    public Optional<NotApplicable> notApplicableTo(GraphState graphState) {
         return ALWAYS_APPLICABLE;
     }
 }

compiler/src/org.graalvm.compiler.core.test/src/org/graalvm/compiler/core/test/TestPhase.java

@@ -31,12 +31,12 @@
 import org.graalvm.compiler.phases.Phase;
 
 /**
- * Base class for {@link Phase}s used in tests. The {@link BasePhase#canApply(GraphState)} method of
- * this class always returns {@link Optional#empty}.
+ * Base class for {@link Phase}s used in tests. The {@link BasePhase#notApplicableTo(GraphState)}
+ * method of this class always returns {@link Optional#empty}.
  */
 public abstract class TestPhase extends Phase {
     @Override
-    public Optional<NotApplicable> canApply(GraphState graphState) {
+    public Optional<NotApplicable> notApplicableTo(GraphState graphState) {
         return ALWAYS_APPLICABLE;
     }
 }

compiler/src/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/fuzzing/AbstractCompilationPlan.java

@@ -96,14 +96,14 @@ protected AbstractCompilationPlan(AbstractTierPlan<HighTierContext> highTier,
     public void verifyCompilationPlan(GraphState graphState) {
         GraphState simulationGraphState = graphState.copy();
         addInitialRequiredStages(simulationGraphState);
-        Optional<NotApplicable> canApplyTier = highTier.getPhaseSuite().canApply(simulationGraphState);
-        GraalError.guarantee(canApplyTier.isEmpty(), "Cannot apply the high tier of this compilation plan because %s.%n%s", canApplyTier.orElse(null), this);
+        Optional<NotApplicable> tierNotApplicable = highTier.getPhaseSuite().notApplicableTo(simulationGraphState);
+        GraalError.guarantee(tierNotApplicable.isEmpty(), "Cannot apply the high tier of this compilation plan because %s.%n%s", tierNotApplicable.orElse(null), this);
         highTier.updateGraphState(simulationGraphState);
-        canApplyTier = midTier.getPhaseSuite().canApply(simulationGraphState);
-        GraalError.guarantee(canApplyTier.isEmpty(), "Cannot apply the mid tier of this compilation plan because %s.%n%s", canApplyTier.orElse(null), this);
+        tierNotApplicable = midTier.getPhaseSuite().notApplicableTo(simulationGraphState);
+        GraalError.guarantee(tierNotApplicable.isEmpty(), "Cannot apply the mid tier of this compilation plan because %s.%n%s", tierNotApplicable.orElse(null), this);
         midTier.updateGraphState(simulationGraphState);
-        canApplyTier = lowTier.getPhaseSuite().canApply(simulationGraphState);
-        GraalError.guarantee(canApplyTier.isEmpty(), "Cannot apply the low tier of this compilation plan because %s.%n%s", canApplyTier.orElse(null), this);
+        tierNotApplicable = lowTier.getPhaseSuite().notApplicableTo(simulationGraphState);
+        GraalError.guarantee(tierNotApplicable.isEmpty(), "Cannot apply the low tier of this compilation plan because %s.%n%s", tierNotApplicable.orElse(null), this);
         lowTier.updateGraphState(simulationGraphState);
         GraalError.guarantee(simulationGraphState.hasAllMandatoryStages(getMandatoryStages()), "This compilation plan does not apply all mandatory stages.%n%s", this);
         GraalError.guarantee(!simulationGraphState.requiresFutureStages(), "This compilation plan:%n%s%nhas remaining requirements: %s", this, simulationGraphState.getFutureRequiredStages());

compiler/src/org.graalvm.compiler.core/src/org/graalvm/compiler/core/phases/fuzzing/MinimalFuzzedTierPlan.java

@@ -112,7 +112,7 @@ protected static <C> MinimalFuzzedTierPlan<C> create(List<BasePhase<? super C>>
      * <li>Loop over the phases that modify the {@link GraphState} (see
      * {@link #getSingleApplyPhases()}) by applying a mandatory stage and insert them in the tier
      * plan if the resulting {@link MinimalFuzzedTierPlan#getPhaseSuite} can be applied (see
-     * {@link PhaseSuite#canApply}). <br>
+     * {@link PhaseSuite#notApplicableTo(GraphState)}). <br>
      * This is done until all the {@code mandatoryStages} are applied by one of the phase in the
      * tier plan or the maximum number of attempts has been reached. <br>
      * </li>
@@ -258,15 +258,15 @@ protected void insertPhasesThatMustApply(GraphState graphState) {
 
     /**
      * Inserts a phase at the given index in the tier plan if it results in a correct plan (see
-     * {@link BasePhase#canApply(GraphState)}).
+     * {@link BasePhase#notApplicableTo(GraphState)}).
      *
      * @return {@code true} if the phase was inserted successfully, {@code false} otherwise.
      */
     protected boolean insertPhaseAtIndex(BasePhase<? super C> phase, int index, GraphState graphState) {
         PhaseSuite<C> newFuzzedPhaseSuite = getPhaseSuite().copy();
         newFuzzedPhaseSuite.insertAtIndex(index, phase);
-        Optional<NotApplicable> canNewSuiteBeApplied = newFuzzedPhaseSuite.canApply(graphState.copy());
-        if (canNewSuiteBeApplied.isEmpty()) {
+        Optional<NotApplicable> suiteNotApplicable = newFuzzedPhaseSuite.notApplicableTo(graphState.copy());
+        if (suiteNotApplicable.isEmpty()) {
             getIgnoredPhases().remove(phase);
             setPhaseSuite(newFuzzedPhaseSuite);
             return true;

compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/meta/HotSpotSuitesProvider.java

@@ -102,7 +102,7 @@ protected PhaseSuite<HighTierContext> createGraphBuilderSuite() {
     private boolean appendGraphEncoderTest(PhaseSuite<HighTierContext> suite) {
         suite.appendPhase(new BasePhase<HighTierContext>() {
             @Override
-            public Optional<NotApplicable> canApply(GraphState graphState) {
+            public Optional<NotApplicable> notApplicableTo(GraphState graphState) {
                 return ALWAYS_APPLICABLE;
             }
 

compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/phases/OnStackReplacementPhase.java

@@ -107,7 +107,7 @@ private static boolean supportOSRWithLocks(OptionValues options) {
     private static final SpeculationReasonGroup OSR_LOCAL_SPECULATIONS = new SpeculationReasonGroup("OSRLocal", int.class, Stamp.class, int.class);
 
     @Override
-    public Optional<NotApplicable> canApply(GraphState graphState) {
+    public Optional<NotApplicable> notApplicableTo(GraphState graphState) {
         return ALWAYS_APPLICABLE;
     }
 

compiler/src/org.graalvm.compiler.hotspot/src/org/graalvm/compiler/hotspot/stubs/Stub.java

@@ -301,7 +301,7 @@ protected void checkSafeDataReference(DataPatch data) {
 
     private static class EmptyHighTier extends BasePhase<HighTierContext> {
         @Override
-        public Optional<NotApplicable> canApply(GraphState graphState) {
+        public Optional<NotApplicable> notApplicableTo(GraphState graphState) {
             return ALWAYS_APPLICABLE;
         }
 

compiler/src/org.graalvm.compiler.java/src/org/graalvm/compiler/java/GraphBuilderPhase.java

@@ -54,7 +54,7 @@ public boolean checkContract() {
     }
 
     @Override
-    public Optional<NotApplicable> canApply(GraphState graphState) {
+    public Optional<NotApplicable> notApplicableTo(GraphState graphState) {
         return ALWAYS_APPLICABLE;
     }
 
@@ -88,7 +88,7 @@ public boolean checkContract() {
         }
 
         @Override
-        public Optional<NotApplicable> canApply(GraphState graphState) {
+        public Optional<NotApplicable> notApplicableTo(GraphState graphState) {
             return ALWAYS_APPLICABLE;
         }