diff options
| author | 2019-03-09 17:49:52 +0000 | |
|---|---|---|
| committer | 2019-03-09 21:13:15 +0000 | |
| commit | ad344b6a14feba90a06a205760e9bc766c56cab0 (patch) | |
| tree | 47801fc5b432b0baf544bb8fd522a9fd3b567a7e /runtime/art_method.cc | |
| parent | 739383c80684eeb41d380ca5d18e1e9a1fe9fd7f (diff) | |
Revert "Remove Global deopt requirement for several jvmti events"
This reverts commit 334630ee9dffdd1932c1ee641d938f25362a4c1a.
Reason for revert: 1924-frame-pop-toggle fails on some configs.
Change-Id: I5ed3846e0dfff09c67a468f319ff516e14c44e61
Diffstat (limited to 'runtime/art_method.cc')
| -rw-r--r-- | runtime/art_method.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/runtime/art_method.cc b/runtime/art_method.cc index 0f25ec433e..c7e41bec5f 100644 --- a/runtime/art_method.cc +++ b/runtime/art_method.cc @@ -322,9 +322,7 @@ void ArtMethod::Invoke(Thread* self, uint32_t* args, uint32_t args_size, JValue* // If the runtime is not yet started or it is required by the debugger, then perform the // Invocation by the interpreter, explicitly forcing interpretation over JIT to prevent // cycling around the various JIT/Interpreter methods that handle method invocation. - if (UNLIKELY(!runtime->IsStarted() || - (self->IsForceInterpreter() && !IsNative() && !IsProxyMethod() && IsInvokable()) || - Dbg::IsForcedInterpreterNeededForCalling(self, this))) { + if (UNLIKELY(!runtime->IsStarted() || Dbg::IsForcedInterpreterNeededForCalling(self, this))) { if (IsStatic()) { art::interpreter::EnterInterpreterFromInvoke( self, this, nullptr, args, result, /*stay_in_interpreter=*/ true); |