Merge "ART: Add another special case to GenSelect for ARM64"
diff --git a/compiler/dex/quick/arm64/int_arm64.cc b/compiler/dex/quick/arm64/int_arm64.cc
index 967acb8..2650892 100644
--- a/compiler/dex/quick/arm64/int_arm64.cc
+++ b/compiler/dex/quick/arm64/int_arm64.cc
@@ -168,6 +168,19 @@
       left_op = rl_result.reg.GetReg();
       right_op = zero_reg;
       opcode = is_wide ? WIDE(kA64Csinv4rrrc) : kA64Csinv4rrrc;
+    } else if ((true_val + 1 == false_val) || (false_val + 1 == true_val)) {
+      // Load a constant and use CSinc. Use rl_result.
+      if (false_val + 1 == true_val) {
+        // Negate.
+        code = ArmConditionEncoding(NegateComparison(mir->meta.ccode));
+        true_val = false_val;
+      }
+
+      rl_result = EvalLoc(rl_dest, result_reg_class, true);
+      rl_result_evaled = true;
+      LoadConstantNoClobber(rl_result.reg, true_val);
+      left_op = right_op = rl_result.reg.GetReg();
+      opcode = is_wide ? WIDE(kA64Csinc4rrrc) : kA64Csinc4rrrc;
     } else {
       // Csel. The rest. Use rl_result and a temp.
       // TODO: To minimize the constants being loaded, check whether one can be inexpensively
diff --git a/test/083-compiler-regressions/src/Main.java b/test/083-compiler-regressions/src/Main.java
index 0f7527c..18bc674 100644
--- a/test/083-compiler-regressions/src/Main.java
+++ b/test/083-compiler-regressions/src/Main.java
@@ -9638,6 +9638,7 @@
     private static int ifGezThen7Else4(int i) { return (i >= 0) ? 7 : 4; }
     private static int ifGtzThen2Else9(int i) { return (i > 0) ? 2 : 9; }
     private static int ifLezThen8Else0(int i) { return (i <= 0) ? 8 : 0; }
+    private static int ifGtzThen8Else9(int i) { return (i > 0) ? 8 : 9; }
 
     private static int ifEqz(int src, int thn, int els) { return (src == 0) ? thn : els; }
     private static int ifNez(int src, int thn, int els) { return (src != 0) ? thn : els; }
@@ -9714,6 +9715,8 @@
             ifLez(-1, 116, 216), 116,
             ifLez(0, 117, 217), 117,
             ifLez(1, 118, 218), 218,
+            ifGtzThen8Else9(0), 9,
+            ifGtzThen8Else9(1), 8
         };
 
         boolean success = true;