diff options
| author | Andreas Gampe <agampe@google.com> | 2015-03-24 02:39:46 +0000 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2015-03-24 02:39:46 +0000 |
| commit | 0ba627337274ccfb8c9cb9bf23fffb1e1b9d1430 (patch) | |
| tree | 0e1d0813c1d8d1c7239a900c1653296975713df0 /runtime/interpreter | |
| parent | e295e6ec5beaea31be5d7d3c996cd8cfa2053129 (diff) | |
| download | art-0ba627337274ccfb8c9cb9bf23fffb1e1b9d1430.zip art-0ba627337274ccfb8c9cb9bf23fffb1e1b9d1430.tar.gz art-0ba627337274ccfb8c9cb9bf23fffb1e1b9d1430.tar.bz2 | |
Revert "Deoptimization-based bce."
This breaks compiling the core image:
Error after BCE: art::SSAChecker: Instruction 219 in block 1 does not dominate use 221 in block 1.
This reverts commit e295e6ec5beaea31be5d7d3c996cd8cfa2053129.
Change-Id: Ieeb48797d451836ed506ccb940872f1443942e4e
Diffstat (limited to 'runtime/interpreter')
| -rw-r--r-- | runtime/interpreter/interpreter.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/runtime/interpreter/interpreter.cc b/runtime/interpreter/interpreter.cc index 4801124..686b518 100644 --- a/runtime/interpreter/interpreter.cc +++ b/runtime/interpreter/interpreter.cc @@ -401,9 +401,7 @@ void EnterInterpreterFromDeoptimize(Thread* self, ShadowFrame* shadow_frame, JVa // or DexFile::kDexNoIndex if there is none. } else { const Instruction* instr = Instruction::At(&code_item->insns_[dex_pc]); - // For an invoke, use the dex pc of the next instruction. - // TODO: should be tested more once b/17586779 is fixed. - new_dex_pc = dex_pc + (instr->IsInvoke() ? instr->SizeInCodeUnits() : 0); + new_dex_pc = dex_pc + instr->SizeInCodeUnits(); // the dex pc of the next instruction. } if (new_dex_pc != DexFile::kDexNoIndex) { shadow_frame->SetDexPC(new_dex_pc); |