diff options
Diffstat (limited to 'runtime/common_dex_operations.h')
| -rw-r--r-- | runtime/common_dex_operations.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/runtime/common_dex_operations.h b/runtime/common_dex_operations.h index 6693eefa5a..133ddb0721 100644 --- a/runtime/common_dex_operations.h +++ b/runtime/common_dex_operations.h @@ -36,8 +36,8 @@ namespace interpreter { void ArtInterpreterToCompiledCodeBridge(Thread* self, ArtMethod* caller, - const DexFile::CodeItem* code_item, ShadowFrame* shadow_frame, + uint16_t arg_offset, JValue* result); } // namespace interpreter @@ -46,17 +46,15 @@ inline void PerformCall(Thread* self, ArtMethod* caller_method, const size_t first_dest_reg, ShadowFrame* callee_frame, - JValue* result) + JValue* result, + bool use_interpreter_entrypoint) REQUIRES_SHARED(Locks::mutator_lock_) { if (LIKELY(Runtime::Current()->IsStarted())) { - ArtMethod* target = callee_frame->GetMethod(); - if (ClassLinker::ShouldUseInterpreterEntrypoint( - target, - target->GetEntryPointFromQuickCompiledCode())) { + if (use_interpreter_entrypoint) { interpreter::ArtInterpreterToInterpreterBridge(self, code_item, callee_frame, result); } else { interpreter::ArtInterpreterToCompiledCodeBridge( - self, caller_method, code_item, callee_frame, result); + self, caller_method, callee_frame, first_dest_reg, result); } } else { interpreter::UnstartedRuntime::Invoke(self, code_item, callee_frame, result, first_dest_reg); |