commit e98297bafe84e2ac15eb73739f27826fcaae1203
author Ian Rogers <irogers@google.com> Sun Jun 22 07:47:53 2014 +0000
committer Ian Rogers <irogers@google.com> Sun Jun 22 07:47:53 2014 +0000
tree c734d6325cea17e87c63d5f76e4bae4f06c55a91
parent 596bea8f6331fe8ad6eb456afa1f7dfe1b92e09c

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

This reverts commit 596bea8f6331fe8ad6eb456afa1f7dfe1b92e09c.

Change-Id: I1942bfc5127e8a631c5b24d107d304c7cd994e78

compiler/dex/quick/gen_loadstore.cc

diff --git a/compiler/dex/quick/gen_loadstore.cc b/compiler/dex/quick/gen_loadstore.cc
index 2dd7def..6469d9c 100644
--- a/compiler/dex/quick/gen_loadstore.cc
+++ b/compiler/dex/quick/gen_loadstore.cc
@@ -213,13 +213,8 @@
   ResetDefLoc(rl_dest);
   if (IsDirty(rl_dest.reg) && LiveOut(rl_dest.s_reg_low)) {
     def_start = last_lir_insn_;
-    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);
-    }
+    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) {