commit 6aadaef35ea52506db61e463910c2520b702ca5e
author Aart Bik <ajcbik@google.com> Thu Jan 21 03:25:10 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 21 03:25:10 2016 +0000
tree d536cd7b3aaf55c563e82c2c522521a91b2bb953
parent 71620fe8141c7256c3998e06c418edd0b7e86ebc
parent 086d27e2ef9d11138f8832190d09a56e72346f15

Merge "Fix missing case in ARM64 codegen."

compiler/optimizing/code_generator_arm64.cc

diff --git a/compiler/optimizing/code_generator_arm64.cc b/compiler/optimizing/code_generator_arm64.cc
index 2cb2741..3d65e9c 100644
--- a/compiler/optimizing/code_generator_arm64.cc
+++ b/compiler/optimizing/code_generator_arm64.cc
@@ -2820,7 +2820,8 @@
         non_fallthrough_target = true_target;
       }
 
-      if ((arm64_cond != gt && arm64_cond != le) && rhs.IsImmediate() && (rhs.immediate() == 0)) {
+      if ((arm64_cond == eq || arm64_cond == ne || arm64_cond == lt || arm64_cond == ge) &&
+          rhs.IsImmediate() && (rhs.immediate() == 0)) {
         switch (arm64_cond) {
           case eq:
             __ Cbz(lhs, non_fallthrough_target);