diff options
author | 2024-10-23 13:09:32 +0000 | |
---|---|---|
committer | 2024-10-25 11:08:17 +0000 | |
commit | b6413c0a1c8d897280ae157cc8f9a50dc68e11e7 (patch) | |
tree | 834c697e46ccdde10a3406514b20f460283603bb /runtime/interpreter/interpreter_switch_impl-inl.h | |
parent | e54bbb5c16009e6959b4e2b1e090f29edd990ad1 (diff) |
Remove interpret_one_instruction from switch interpreter
This was used when mterp bailed out on executing an instruction. The
idea was to fallback to switch interpreter for that instruction and
continue with mterp. We no longer have mterp and removed the support for
it (aosp/1763167). We no longer use this capability and is always set to
false. So clean it up by removing this.
Test: art/test.py
Change-Id: Iaabf5d5afb240d7775b23d9b3fa8aee00a0c5660
Diffstat (limited to 'runtime/interpreter/interpreter_switch_impl-inl.h')
-rw-r--r-- | runtime/interpreter/interpreter_switch_impl-inl.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/runtime/interpreter/interpreter_switch_impl-inl.h b/runtime/interpreter/interpreter_switch_impl-inl.h index 1ebac52c1e..3e741993db 100644 --- a/runtime/interpreter/interpreter_switch_impl-inl.h +++ b/runtime/interpreter/interpreter_switch_impl-inl.h @@ -2035,7 +2035,6 @@ void ExecuteSwitchImplCpp(SwitchImplContext* ctx) { DCHECK(!shadow_frame.GetForceRetryInstruction()) << "Entered interpreter from invoke without retry instruction being handled!"; - bool const interpret_one_instruction = ctx->interpret_one_instruction; while (true) { const Instruction* const inst = next; dex_pc = inst->GetDexPc(insns); @@ -2054,7 +2053,7 @@ void ExecuteSwitchImplCpp(SwitchImplContext* ctx) { next = inst->RelativeAt(Instruction::SizeInCodeUnits(Instruction::FORMAT)); \ success = OP_##OPCODE_NAME<transaction_active>( \ ctx, instrumentation, self, shadow_frame, dex_pc, inst, inst_data, next, exit); \ - if (success && LIKELY(!interpret_one_instruction)) { \ + if (success) { \ continue; \ } \ break; \ @@ -2076,11 +2075,6 @@ void ExecuteSwitchImplCpp(SwitchImplContext* ctx) { } // Continue execution in the catch block. } - if (interpret_one_instruction) { - shadow_frame.SetDexPC(next->GetDexPc(insns)); // Record where we stopped. - ctx->result = ctx->result_register; - return; - } } } // NOLINT(readability/fn_size) |