commit 2073e7553d1ca65f13b6c4e4fe364c2a345a1511
author Andreas Gampe <agampe@google.com> Mon Jun 23 15:39:00 2014 +0000
committer Andreas Gampe <agampe@google.com> Mon Jun 23 08:53:38 2014 -0700
tree cbc5741e7fc7c5ad410e2ccf71721b871c237f87
parent dd79f2157fcea35afc8dfbe75a0f8c4bbc6898b9

Revert "Revert "ART: Fix StoreValue to use RefDisp when necessary.""

This reverts commit e98297bafe84e2ac15eb73739f27826fcaae1203.

No matter if holding a reference or not, the store needs to be tagged
as updating a Dalvik register.

Change-Id: Icb80e1b6f82103cff33ee971faaaa02f9ad4a683

compiler/dex/quick/gen_loadstore.cc

diff --git a/compiler/dex/quick/gen_loadstore.cc b/compiler/dex/quick/gen_loadstore.cc
index 6469d9c..d6f6ea1 100644
--- a/compiler/dex/quick/gen_loadstore.cc
+++ b/compiler/dex/quick/gen_loadstore.cc
@@ -214,7 +214,11 @@
   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) {
+      StoreRefDisp(TargetReg(kSp), SRegOffset(rl_dest.s_reg_low), rl_dest.reg);
+    } else {
+      Store32Disp(TargetReg(kSp), SRegOffset(rl_dest.s_reg_low), rl_dest.reg);
+    }
     MarkClean(rl_dest);
     def_end = last_lir_insn_;
     if (!rl_dest.ref) {