commit 34dcc88745e2442872f965ca96e1b96daa9cf18c
author Andreas Gampe <agampe@google.com> Tue Jul 01 17:13:50 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jun 30 22:50:46 2014 +0000
tree 3a496b861504ec0998f047b1842d9759c8a52c89
parent da52cd3be2e27e3ef1c30caf58dafc45f4f7445e
parent de38833babdf20fec49cdc4453fe6da95646cfad

Merge "ART: Add arch-specific directories to host-oat-cleaning rule"

compiler/dex/quick/arm64/utility_arm64.cc

diff --git a/compiler/dex/quick/arm64/utility_arm64.cc b/compiler/dex/quick/arm64/utility_arm64.cc
index e248410..50b4a06 100644
--- a/compiler/dex/quick/arm64/utility_arm64.cc
+++ b/compiler/dex/quick/arm64/utility_arm64.cc
@@ -732,7 +732,7 @@
         return NewLIR4(opcode | wide, r_dest.GetReg(), r_src1.GetReg(), abs_value >> 12, 1);
       } else {
         log_imm = -1;
-        alt_opcode = (neg) ? kA64Add4RRre : kA64Sub4RRre;
+        alt_opcode = (op == kOpAdd) ? kA64Add4RRre : kA64Sub4RRre;
         info = EncodeExtend(is_wide ? kA64Uxtx : kA64Uxtw, 0);
       }
       break;