[GR-68589] Truffle: fix instanceof snippet replacement in non canonical graphs.

PullRequest: graal/21830

Author: davleopo

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/replacements/InstanceOfSnippetsTemplates.java

@@ -31,15 +31,12 @@
 import jdk.graal.compiler.core.common.calc.CanonicalCondition;
 import jdk.graal.compiler.debug.Assertions;
 import jdk.graal.compiler.graph.Node;
-import jdk.graal.compiler.nodes.ConditionAnchorNode;
 import jdk.graal.compiler.nodes.ConstantNode;
-import jdk.graal.compiler.nodes.FixedGuardNode;
 import jdk.graal.compiler.nodes.IfNode;
 import jdk.graal.compiler.nodes.LogicConstantNode;
 import jdk.graal.compiler.nodes.LogicNode;
 import jdk.graal.compiler.nodes.NodeView;
 import jdk.graal.compiler.nodes.PhiNode;
-import jdk.graal.compiler.nodes.ShortCircuitOrNode;
 import jdk.graal.compiler.nodes.StructuredGraph;
 import jdk.graal.compiler.nodes.ValueNode;
 import jdk.graal.compiler.nodes.calc.CompareNode;
@@ -110,7 +107,12 @@ public void lower(FloatingNode instanceOf, LoweringTool tool) {
      */
     protected InstanceOfUsageReplacer createReplacer(FloatingNode instanceOf, Instantiation instantiation, Node usage, final StructuredGraph graph) {
         InstanceOfUsageReplacer replacer;
-        if (!canMaterialize(usage)) {
+
+        final boolean mustMaterializeAsConditional = usage instanceof ConditionalNode cn && cn.trueValue().isConstant() && cn.falseValue().isConstant();
+        if (mustMaterializeAsConditional) {
+            ConditionalNode c = (ConditionalNode) usage;
+            replacer = new MaterializationUsageReplacer(instantiation, c.trueValue(), c.falseValue(), instanceOf, c);
+        } else {
             ValueNode trueValue = ConstantNode.forInt(1, graph);
             ValueNode falseValue = ConstantNode.forInt(0, graph);
             if (instantiation.isInitialized() && (trueValue != instantiation.trueValue || falseValue != instantiation.falseValue)) {
@@ -122,28 +124,10 @@ protected InstanceOfUsageReplacer createReplacer(FloatingNode instanceOf, Instan
                 falseValue = instantiation.falseValue;
             }
             replacer = new NonMaterializationUsageReplacer(instantiation, trueValue, falseValue, instanceOf, usage);
-        } else {
-            assert usage instanceof ConditionalNode : "unexpected usage of " + instanceOf + ": " + usage;
-            ConditionalNode c = (ConditionalNode) usage;
-            replacer = new MaterializationUsageReplacer(instantiation, c.trueValue(), c.falseValue(), instanceOf, c);
         }
         return replacer;
     }
 
-    /**
-     * Determines if an {@code instanceof} usage can be materialized.
-     */
-    protected boolean canMaterialize(Node usage) {
-        if (usage instanceof ConditionalNode) {
-            ConditionalNode cn = (ConditionalNode) usage;
-            return cn.trueValue().isConstant() && cn.falseValue().isConstant();
-        }
-        if (usage instanceof IfNode || usage instanceof FixedGuardNode || usage instanceof ShortCircuitOrNode || usage instanceof ConditionAnchorNode) {
-            return false;
-        }
-        return true;
-    }
-
     /**
      * The result of instantiating an instanceof snippet. This enables a snippet instantiation to be
      * re-used which reduces compile time and produces better code.

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/PartialEvaluator.java

@@ -434,7 +434,7 @@ public void doGraphPE(TruffleTierContext context, InlineInvokePlugin inlineInvok
                         new TruffleSourceLanguagePositionProvider(context.task),
                         graphCache, getCreateCachedGraphScope());
 
-        if (TruffleCompilerOptions.maximumGraalGraphSiteEnabled(context.compilerOptions)) {
+        if (TruffleCompilerOptions.maximumGraalGraphSizeEnabled(context.compilerOptions)) {
             GraphSizeListener listener = new GraphSizeListener(context.compilerOptions, context.graph);
             try (Graph.NodeEventScope ignored = context.graph.trackNodeEvents(listener)) {
                 assert !context.graph.isSubstitution();

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/truffle/TruffleCompilerOptions.java

@@ -407,7 +407,7 @@ public static String validateOption(String key, String uncheckedValue) {
         }
     }
 
-    public static boolean maximumGraalGraphSiteEnabled(OptionValues options) {
+    public static boolean maximumGraalGraphSizeEnabled(OptionValues options) {
         int val = MaximumGraalGraphSize.getValue(options);
         return val > 0;
     }