diff options
| -rw-r--r-- | runtime/debugger.cc | 5 | ||||
| -rw-r--r-- | runtime/thread.h | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/runtime/debugger.cc b/runtime/debugger.cc index 80056423a9..5b54f7d4a9 100644 --- a/runtime/debugger.cc +++ b/runtime/debugger.cc @@ -644,8 +644,7 @@ void Dbg::Disconnected() { LOG(INFO) << "Debugger is no longer active"; - // Suspend all threads and exclusively acquire the mutator lock. Set the state of the thread - // to kRunnable to avoid scoped object access transitions. Remove the debugger as a listener + // Suspend all threads and exclusively acquire the mutator lock. Remove the debugger as a listener // and clear the object registry. Runtime* runtime = Runtime::Current(); Thread* self = Thread::Current(); @@ -655,7 +654,6 @@ void Dbg::Disconnected() { gc::kGcCauseInstrumentation, gc::kCollectorTypeInstrumentation); ScopedSuspendAll ssa(__FUNCTION__); - ThreadState old_state = self->SetStateUnsafe(kRunnable); // Debugger may not be active at this point. if (IsDebuggerActive()) { { @@ -676,7 +674,6 @@ void Dbg::Disconnected() { } gDebuggerActive = false; } - CHECK_EQ(self->SetStateUnsafe(old_state), kRunnable); } { diff --git a/runtime/thread.h b/runtime/thread.h index 582a0cdbd6..0591a756ac 100644 --- a/runtime/thread.h +++ b/runtime/thread.h @@ -1119,7 +1119,7 @@ class Thread { SHARED_REQUIRES(Locks::mutator_lock_); // Avoid use, callers should use SetState. Used only by SignalCatcher::HandleSigQuit, ~Thread and - // Dbg::Disconnected. + // Dbg::ManageDeoptimization. ThreadState SetStateUnsafe(ThreadState new_state) { ThreadState old_state = GetState(); if (old_state == kRunnable && new_state != kRunnable) { |