From 596bea8f6331fe8ad6eb456afa1f7dfe1b92e09c Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Fri, 20 Jun 2014 12:48:12 -0700 Subject: ART: Fix StoreValue to use RefDisp when necessary. Split from https://android-review.googlesource.com/#/c/98605 Change-Id: Ib3a03428ddbec659591b838404bbfa1553fe18e9 --- compiler/dex/quick/gen_loadstore.cc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'compiler') diff --git a/compiler/dex/quick/gen_loadstore.cc b/compiler/dex/quick/gen_loadstore.cc index 6469d9c..2dd7def 100644 --- a/compiler/dex/quick/gen_loadstore.cc +++ b/compiler/dex/quick/gen_loadstore.cc @@ -213,8 +213,13 @@ void Mir2Lir::StoreValue(RegLocation rl_dest, RegLocation rl_src) { ResetDefLoc(rl_dest); if (IsDirty(rl_dest.reg) && LiveOut(rl_dest.s_reg_low)) { def_start = last_lir_insn_; - ScopedMemRefType mem_ref_type(this, ResourceMask::kDalvikReg); - Store32Disp(TargetReg(kSp), SRegOffset(rl_dest.s_reg_low), rl_dest.reg); + if (rl_dest.ref) { + ScopedMemRefType mem_ref_type(this, ResourceMask::kHeapRef); + StoreRefDisp(TargetReg(kSp), SRegOffset(rl_dest.s_reg_low), rl_dest.reg); + } else { + ScopedMemRefType mem_ref_type(this, ResourceMask::kDalvikReg); + Store32Disp(TargetReg(kSp), SRegOffset(rl_dest.s_reg_low), rl_dest.reg); + } MarkClean(rl_dest); def_end = last_lir_insn_; if (!rl_dest.ref) { -- cgit v1.1