src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.nodes/src/org/graalvm/compiler/nodes/calc/ConditionalNode.java

rev 52509 : [mq]: graal2

*** 228,238 ****
                  /*
                   * Convert a conditional add ((x < 0) ? (x + y) : x) into (x + (y & (x >> (bits -
                   * 1)))) to avoid the test.
                   */
                  IntegerLessThanNode lt = (IntegerLessThanNode) condition;
!                 if (lt.getY().isConstant() && lt.getY().asConstant().isDefaultForKind()) {
                      if (falseValue == lt.getX()) {
                          if (trueValue instanceof AddNode) {
                              AddNode add = (AddNode) trueValue;
                              if (add.getX() == falseValue) {
                                  int bits = ((IntegerStamp) trueValue.stamp(NodeView.DEFAULT)).getBits();
--- 228,238 ----
                  /*
                   * Convert a conditional add ((x < 0) ? (x + y) : x) into (x + (y & (x >> (bits -
                   * 1)))) to avoid the test.
                   */
                  IntegerLessThanNode lt = (IntegerLessThanNode) condition;
!                 if (lt.getY().isDefaultConstant()) {
                      if (falseValue == lt.getX()) {
                          if (trueValue instanceof AddNode) {
                              AddNode add = (AddNode) trueValue;
                              if (add.getX() == falseValue) {
                                  int bits = ((IntegerStamp) trueValue.stamp(NodeView.DEFAULT)).getBits();