diff options
| author | 2022-06-19 21:44:17 +0000 | |
|---|---|---|
| committer | 2022-06-19 22:04:12 +0000 | |
| commit | bc0318ab1496e2468223be3ad76738d7b8ee7579 (patch) | |
| tree | 2589f228d80cef6e781c1da48f5b59810b8c7e55 /openjdkjvmti/deopt_manager.cc | |
| parent | 72c64a71574a3c59113ea4bc8f0c97135097dd50 (diff) | |
Reland^2 "Don't install instrumentation stubs for single thread deopts"
This reverts commit 72c64a71574a3c59113ea4bc8f0c97135097dd50.
Reason for revert: Relanding with fixes to failures. Fixes:
1. JITed frames could have instrumentation exit stubs
2. We shouldn't OSR when tracing is enabled.
Change-Id: I42e321155378f2edd3392dc49ba09610ad096858
Diffstat (limited to 'openjdkjvmti/deopt_manager.cc')
| -rw-r--r-- | openjdkjvmti/deopt_manager.cc | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/openjdkjvmti/deopt_manager.cc b/openjdkjvmti/deopt_manager.cc index a15e6678f1..312a797b9d 100644 --- a/openjdkjvmti/deopt_manager.cc +++ b/openjdkjvmti/deopt_manager.cc @@ -460,15 +460,7 @@ void DeoptManager::AddDeoptimizationRequester() { art::ScopedThreadStateChange stsc(self, art::ThreadState::kSuspended); deoptimization_status_lock_.ExclusiveLock(self); deopter_count_++; - if (deopter_count_ == 1) { - ScopedDeoptimizationContext sdc(self, this); - art::instrumentation::Instrumentation* instrumentation = - art::Runtime::Current()->GetInstrumentation(); - // Tell instrumentation we will be deopting single threads. - instrumentation->EnableSingleThreadDeopt(kInstrumentationKey); - } else { - deoptimization_status_lock_.ExclusiveUnlock(self); - } + deoptimization_status_lock_.ExclusiveUnlock(self); } void DeoptManager::DeoptimizeThread(art::Thread* target) { |