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

1 files changed, 0 insertions, 42 deletions

diff --git a/openjdkjvmti/deopt_manager.cc b/openjdkjvmti/deopt_manager.cc
index ee77b7bb77..d456d83368 100644
--- a/openjdkjvmti/deopt_manager.cc
+++ b/openjdkjvmti/deopt_manager.cc
@@ -49,7 +49,6 @@
 #include "nativehelper/scoped_local_ref.h"
 #include "runtime_callbacks.h"
 #include "scoped_thread_state_change-inl.h"
-#include "scoped_thread_state_change.h"
 #include "thread-current-inl.h"
 #include "thread_list.h"
 #include "ti_phase.h"
@@ -357,47 +356,6 @@ void DeoptManager::PerformGlobalUndeoptimization(art::Thread* self) {
       kDeoptManagerInstrumentationKey);
 }
 
-jvmtiError DeoptManager::AddDeoptimizeThreadMethods(art::ScopedObjectAccessUnchecked& soa, jthread jtarget) {
-  art::Locks::thread_list_lock_->ExclusiveLock(soa.Self());
-  art::Thread* target = nullptr;
-  jvmtiError err = OK;
-  if (!ThreadUtil::GetNativeThread(jtarget, soa, &target, &err)) {
-    art::Locks::thread_list_lock_->ExclusiveUnlock(soa.Self());
-    return err;
-  }
-  // We don't need additional locking here because we hold the Thread_list_lock_.
-  target->SetForceInterpreterCount(target->ForceInterpreterCount() + 1);
-  if (target->ForceInterpreterCount() == 1) {
-    struct DeoptClosure : public art::Closure {
-     public:
-      explicit DeoptClosure(DeoptManager* man) : man_(man) {}
-      void Run(art::Thread* self) override REQUIRES_SHARED(art::Locks::mutator_lock_) {
-        man_->DeoptimizeThread(self);
-      }
-
-     private:
-      DeoptManager* man_;
-    };
-    DeoptClosure c(this);
-    target->RequestSynchronousCheckpoint(&c);
-  } else {
-    art::Locks::thread_list_lock_->ExclusiveUnlock(soa.Self());
-  }
-  return OK;
-}
-
-jvmtiError DeoptManager::RemoveDeoptimizeThreadMethods(art::ScopedObjectAccessUnchecked& soa, jthread jtarget) {
-  art::MutexLock mu(soa.Self(), *art::Locks::thread_list_lock_);
-  art::Thread* target = nullptr;
-  jvmtiError err = OK;
-  if (!ThreadUtil::GetNativeThread(jtarget, soa, &target, &err)) {
-    return err;
-  }
-  // We don't need additional locking here because we hold the Thread_list_lock_.
-  DCHECK_GT(target->ForceInterpreterCount(), 0u);
-  target->DecrementForceInterpreterCount();
-  return OK;
-}
 
 void DeoptManager::RemoveDeoptimizationRequester() {
   art::Thread* self = art::Thread::Current();