summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Vladimir Marko <vmarko@google.com> 2015-02-03 12:20:44 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2015-02-03 12:20:44 +0000
commit08029544d72bd9bec162956978afcb59204ea97b (patch)
tree946d8b4558ad93ba9cf2de0722a5d072990f6c76
parent09fbde3b2b4cad32059b0fd36524c11a808b2885 (diff)
parentb3cdf93d70256c4b0a9f6ed55ba4601f8c70bad4 (diff)
Merge "ART: Fix to X86Mir2Lir::GenReduceVector"
-rwxr-xr-xcompiler/dex/quick/x86/target_x86.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/dex/quick/x86/target_x86.cc b/compiler/dex/quick/x86/target_x86.cc
index 03370963a7..43ebf55c8d 100755
--- a/compiler/dex/quick/x86/target_x86.cc
+++ b/compiler/dex/quick/x86/target_x86.cc
@@ -2303,9 +2303,9 @@ void X86Mir2Lir::GenReduceVector(MIR* mir) {
StoreFinalValue(rl_dest, rl_result);
} else {
int displacement = SRegOffset(rl_result.s_reg_low);
+ ScopedMemRefType mem_ref_type(this, ResourceMask::kDalvikReg);
LIR *l = NewLIR4(extr_opcode, rs_rX86_SP_32.GetReg(), displacement, vector_src.GetReg(),
extract_index);
- AnnotateDalvikRegAccess(l, displacement >> 2, true /* is_load */, is_wide /* is_64bit */);
AnnotateDalvikRegAccess(l, displacement >> 2, false /* is_load */, is_wide /* is_64bit */);
}
}