summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Buzbee <buzbee@android.com>2014-09-09 13:50:53 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-09-09 13:50:53 +0000
commit5bc47ebe278af65e8e2a2d6b603ac94a020285f7 (patch)
tree22fb9fcf7b330cbf9591707e880c903364ec476d
parent6be5a284194f34b5316982c6afa0d3a15bcbcfef (diff)
parenta464466fea8df617a50055230cfe7a16ea52cc14 (diff)
downloadart-5bc47ebe278af65e8e2a2d6b603ac94a020285f7.zip
art-5bc47ebe278af65e8e2a2d6b603ac94a020285f7.tar.gz
art-5bc47ebe278af65e8e2a2d6b603ac94a020285f7.tar.bz2
Merge "x86: evaluation destination should be after load of source in RA"
-rwxr-xr-xcompiler/dex/quick/x86/int_x86.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/dex/quick/x86/int_x86.cc b/compiler/dex/quick/x86/int_x86.cc
index 3ca85bf..2ec37cd 100755
--- a/compiler/dex/quick/x86/int_x86.cc
+++ b/compiler/dex/quick/x86/int_x86.cc
@@ -3031,8 +3031,8 @@ void X86Mir2Lir::GenArithOpInt(Instruction::Code opcode, RegLocation rl_dest,
LoadValueDirectFixed(rl_rhs, t_reg);
if (is_two_addr) {
// Can we do this directly into memory?
- rl_result = UpdateLocTyped(rl_dest, kCoreReg);
rl_rhs = LoadValue(rl_rhs, kCoreReg);
+ rl_result = UpdateLocTyped(rl_dest, kCoreReg);
if (rl_result.location != kLocPhysReg) {
// Okay, we can do this into memory
OpMemReg(op, rl_result, t_reg.GetReg());