diff options
Diffstat (limited to 'runtime/interpreter/interpreter_switch_impl-inl.h')
| -rw-r--r-- | runtime/interpreter/interpreter_switch_impl-inl.h | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/runtime/interpreter/interpreter_switch_impl-inl.h b/runtime/interpreter/interpreter_switch_impl-inl.h index 8e16e04bfa..42f7fc749b 100644 --- a/runtime/interpreter/interpreter_switch_impl-inl.h +++ b/runtime/interpreter/interpreter_switch_impl-inl.h @@ -64,12 +64,8 @@ class InstructionHandler { DCHECK(abort_exception != nullptr); DCHECK(abort_exception->GetClass()->DescriptorEquals(Transaction::kAbortExceptionDescriptor)); Self()->ClearException(); - PerformNonStandardReturn<kMonitorState>(Self(), - shadow_frame_, - ctx_->result, - Instrumentation(), - Accessor().InsSize(), - inst_->GetDexPc(Insns())); + PerformNonStandardReturn<kMonitorState>( + Self(), shadow_frame_, ctx_->result, Instrumentation(), Accessor().InsSize()); Self()->SetException(abort_exception.Get()); ExitInterpreterLoop(); return false; @@ -80,12 +76,8 @@ class InstructionHandler { HANDLER_ATTRIBUTES bool CheckForceReturn() { if (shadow_frame_.GetForcePopFrame()) { DCHECK(Runtime::Current()->AreNonStandardExitsEnabled()); - PerformNonStandardReturn<kMonitorState>(Self(), - shadow_frame_, - ctx_->result, - Instrumentation(), - Accessor().InsSize(), - inst_->GetDexPc(Insns())); + PerformNonStandardReturn<kMonitorState>( + Self(), shadow_frame_, ctx_->result, Instrumentation(), Accessor().InsSize()); ExitInterpreterLoop(); return false; } @@ -216,9 +208,7 @@ class InstructionHandler { !SendMethodExitEvents(Self(), Instrumentation(), shadow_frame_, - shadow_frame_.GetThisObject(Accessor().InsSize()), shadow_frame_.GetMethod(), - inst_->GetDexPc(Insns()), result))) { DCHECK(Self()->IsExceptionPending()); // Do not raise exception event if it is caused by other instrumentation event. @@ -495,9 +485,7 @@ class InstructionHandler { !SendMethodExitEvents(Self(), Instrumentation(), shadow_frame_, - shadow_frame_.GetThisObject(Accessor().InsSize()), shadow_frame_.GetMethod(), - inst_->GetDexPc(Insns()), h_result))) { DCHECK(Self()->IsExceptionPending()); // Do not raise exception event if it is caused by other instrumentation event. |