diff options
| author | Ian Rogers <irogers@google.com> | 2014-06-23 14:54:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-06-21 03:13:40 +0000 |
| commit | a5377fe9231b441856b3c9bfa4aa003445436958 (patch) | |
| tree | eac7666b3c9e53493cf6144561a61e87fb7c74f7 /compiler | |
| parent | 560279311a756cdd7bc708beb52b141184064d15 (diff) | |
| parent | e98297bafe84e2ac15eb73739f27826fcaae1203 (diff) | |
| download | art-a5377fe9231b441856b3c9bfa4aa003445436958.zip art-a5377fe9231b441856b3c9bfa4aa003445436958.tar.gz art-a5377fe9231b441856b3c9bfa4aa003445436958.tar.bz2 | |
Merge "Revert "ART: Fix StoreValue to use RefDisp when necessary.""
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/dex/quick/gen_loadstore.cc | 9 |
1 files changed, 2 insertions, 7 deletions
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 @@ 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_; - 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) { |