summaryrefslogtreecommitdiff
path: root/compiler/optimizing
diff options
context:
space:
mode:
author Aart Bik <ajcbik@google.com> 2016-01-21 03:25:10 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2016-01-21 03:25:10 +0000
commit6aadaef35ea52506db61e463910c2520b702ca5e (patch)
treed536cd7b3aaf55c563e82c2c522521a91b2bb953 /compiler/optimizing
parent71620fe8141c7256c3998e06c418edd0b7e86ebc (diff)
parent086d27e2ef9d11138f8832190d09a56e72346f15 (diff)
Merge "Fix missing case in ARM64 codegen."
Diffstat (limited to 'compiler/optimizing')
-rw-r--r--compiler/optimizing/code_generator_arm64.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/optimizing/code_generator_arm64.cc b/compiler/optimizing/code_generator_arm64.cc
index 2cb2741b17..3d65e9c53c 100644
--- a/compiler/optimizing/code_generator_arm64.cc
+++ b/compiler/optimizing/code_generator_arm64.cc
@@ -2820,7 +2820,8 @@ void InstructionCodeGeneratorARM64::GenerateTestAndBranch(HInstruction* instruct
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);