Fix loop limit check guard

Author: kittyoracle

compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/nodes/loop/CountedLoopInfo.java

@@ -747,6 +747,31 @@ public GuardingNode createOverFlowGuard() {
         }
     }
 
+    /**
+     * Creates an overflow guard condition, that is the condition such that if it is satisfied, the
+     * induction variable will overflow, and we have to treat the loop as a non-counted one.
+     * <p>
+     * For example, given this loop:
+     * {@snippet :
+     * for (int i = 0; i < limit; i += 2) {}
+     * }
+     * Most of the time, this loop will execute a limited amount of iterations, and the value of
+     * {@code i} inside the loop body will be in the interval {@code [0, limit)}. However, in the
+     * rare cases that {@code limit == Integer.MAX_VALUE}, the addition {@code i += 2} will
+     * overflow, and the loop would not terminate. In those cases, We cannot treat the loop as a
+     * counted loop. As a result, we insert a guard for those circumstances. The guard is
+     * conservative, that is it will catch all cases where the calculation of the induction variable
+     * overflows, and it may catch cases where the calculation does not actually overflow. In the
+     * example, the guard would be:
+     * {@snippet :
+     * if (limit > Integer.MAX_VALUE - 1) {
+     *     deoptimize();
+     * }
+     * }
+     * This method creates the aforementioned guard, it has the value {@code true} if the
+     * calculation may overflow, and {@code false} if it cannot, in such cases assumptions about
+     * counted loops hold.
+     */
     public LogicNode createOverflowGuardCondition() {
         StructuredGraph graph = getLimitCheckedIV().valueNode().graph();
         if (counterNeverOverflows()) {
@@ -757,18 +782,22 @@ public LogicNode createOverflowGuardCondition() {
         LogicNode cond; // we use a negated guard with a < condition to achieve a >=
         ConstantNode one = ConstantNode.forIntegerStamp(stamp, 1, graph);
         if (getLimitCheckedIV().direction() == InductionVariable.Direction.Up) {
-            ValueNode v1 = BinaryArithmeticNode.sub(ConstantNode.forIntegerStamp(stamp, integerHelper.maxValue()), BinaryArithmeticNode.sub(getLimitCheckedIV().strideNode(), one));
-            if (isLimitIncluded) {
-                v1 = BinaryArithmeticNode.sub(v1, one);
+            // overflow ~ (tripCountLimit + stride) overflow ~ tripCountLimit > maxValue - stride
+            ValueNode maxValue = ConstantNode.forIntegerStamp(stamp, integerHelper.maxValue(), graph);
+            ValueNode maxNonOverflowLimitValue = BinaryArithmeticNode.sub(graph, maxValue, getLimitCheckedIV().strideNode(), NodeView.DEFAULT);
+            if (!isLimitIncluded) {
+                maxNonOverflowLimitValue = BinaryArithmeticNode.add(graph, maxNonOverflowLimitValue, one, NodeView.DEFAULT);
             }
-            cond = graph.addOrUniqueWithInputs(integerHelper.createCompareNode(v1, getTripCountLimit(), NodeView.DEFAULT));
+            cond = graph.addOrUniqueWithInputs(integerHelper.createCompareNode(maxNonOverflowLimitValue, getTripCountLimit(), NodeView.DEFAULT));
         } else {
             assert getLimitCheckedIV().direction() == Direction.Down : Assertions.errorMessage(getLimitCheckedIV());
-            ValueNode v1 = BinaryArithmeticNode.add(ConstantNode.forIntegerStamp(stamp, integerHelper.minValue()), BinaryArithmeticNode.sub(one, getLimitCheckedIV().strideNode()));
-            if (isLimitIncluded) {
-                v1 = BinaryArithmeticNode.add(v1, one);
+            // overflow ~ (tripCountLimit + stride) overflow ~ tripCountLimit < minValue - stride
+            ValueNode minValue = ConstantNode.forIntegerStamp(stamp, integerHelper.minValue(), graph);
+            ValueNode minNonOverflowLimitValue = BinaryArithmeticNode.sub(graph, minValue, getLimitCheckedIV().strideNode(), NodeView.DEFAULT);
+            if (!isLimitIncluded) {
+                minNonOverflowLimitValue = BinaryArithmeticNode.sub(graph, minNonOverflowLimitValue, one, NodeView.DEFAULT);
             }
-            cond = graph.addOrUniqueWithInputs(integerHelper.createCompareNode(getTripCountLimit(), v1, NodeView.DEFAULT));
+            cond = graph.addOrUniqueWithInputs(integerHelper.createCompareNode(getTripCountLimit(), minNonOverflowLimitValue, NodeView.DEFAULT));
         }
         return cond;
     }