diff options
| author | Mingyao Yang <mingyao@google.com> | 2015-04-01 23:15:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-04-01 23:15:53 +0000 |
| commit | e4285226d1d4d7c4feee16a968540fb2e363339f (patch) | |
| tree | 835b91c05b39cdb1053c2cd28e0e23c202dc020b /runtime/interpreter | |
| parent | 79bdb47d8c87ca3ee7da4aa2ca56105728257a32 (diff) | |
| parent | d43b3ac88cd46b8815890188c9c2b9a3f1564648 (diff) | |
| download | art-e4285226d1d4d7c4feee16a968540fb2e363339f.tar.gz art-e4285226d1d4d7c4feee16a968540fb2e363339f.tar.bz2 art-e4285226d1d4d7c4feee16a968540fb2e363339f.zip | |
Merge "Revert "Revert "Deoptimization-based bce."""
Diffstat (limited to 'runtime/interpreter')
| -rw-r--r-- | runtime/interpreter/interpreter.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/runtime/interpreter/interpreter.cc b/runtime/interpreter/interpreter.cc index 686b518c5f..4801124fc6 100644 --- a/runtime/interpreter/interpreter.cc +++ b/runtime/interpreter/interpreter.cc @@ -401,7 +401,9 @@ 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]); - new_dex_pc = dex_pc + instr->SizeInCodeUnits(); // the dex pc of the next instruction. + // 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); } if (new_dex_pc != DexFile::kDexNoIndex) { shadow_frame->SetDexPC(new_dex_pc); |