From 15b9d5274399736ac09705f0507df24fac4f00c1 Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Thu, 12 Mar 2015 15:05:13 +0000 Subject: API change in StackVisitor::GetVReg*. - Remove GetVReg() and SetVReg() that were expecting to always succeed. - Change Quick-only methods to take a FromQuickCode suffix. - Change deopt to use dead values when GetVReg does not succeed: the optimizing compiler will not have a location for uninitialized Dex registers and potentially dead registers. Change-Id: Ida05773a97aff8aa69e0caf42ea961f80f854b77 --- compiler/dex/quick/ralloc_util.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'compiler/dex/quick/ralloc_util.cc') diff --git a/compiler/dex/quick/ralloc_util.cc b/compiler/dex/quick/ralloc_util.cc index 682fa281ac..741657bc69 100644 --- a/compiler/dex/quick/ralloc_util.cc +++ b/compiler/dex/quick/ralloc_util.cc @@ -1322,9 +1322,9 @@ void Mir2Lir::DoPromotion() { /* Returns sp-relative offset in bytes for a VReg */ int Mir2Lir::VRegOffset(int v_reg) { const DexFile::CodeItem* code_item = mir_graph_->GetCurrentDexCompilationUnit()->GetCodeItem(); - return StackVisitor::GetVRegOffset(code_item, core_spill_mask_, - fp_spill_mask_, frame_size_, v_reg, - cu_->instruction_set); + return StackVisitor::GetVRegOffsetFromQuickCode(code_item, core_spill_mask_, + fp_spill_mask_, frame_size_, v_reg, + cu_->instruction_set); } /* Returns sp-relative offset in bytes for a SReg */ -- cgit v1.2.3-59-g8ed1b