From 63af30b8fe8d4e1dc32db4dcb5e5dae1efdc7f31 Mon Sep 17 00:00:00 2001 From: Hans Boehm Date: Wed, 29 Mar 2023 01:24:05 +0000 Subject: Revert "Revert^8 "Thread suspension cleanup and deadlock fix"" This reverts commit 221b6c5fcd66d4b6f2626c311d03bde2fb1589f9. Reason for revert: Preemptive revert. Earlier versions have had a tendency to cause subtle breakage. Please do not submit unless something breaks. Change-Id: Iad2a7f920756f365789c422948632f5db5a28fd5 --- runtime/stack.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'runtime/stack.cc') diff --git a/runtime/stack.cc b/runtime/stack.cc index bf844b48e4..d7d5851130 100644 --- a/runtime/stack.cc +++ b/runtime/stack.cc @@ -77,7 +77,7 @@ StackVisitor::StackVisitor(Thread* thread, context_(context), check_suspended_(check_suspended) { if (check_suspended_) { - DCHECK(thread == Thread::Current() || thread->GetState() != ThreadState::kRunnable) << *thread; + DCHECK(thread == Thread::Current() || thread->IsSuspended()) << *thread; } } @@ -801,7 +801,7 @@ uint8_t* StackVisitor::GetShouldDeoptimizeFlagAddr() const REQUIRES_SHARED(Locks template void StackVisitor::WalkStack(bool include_transitions) { if (check_suspended_) { - DCHECK(thread_ == Thread::Current() || thread_->GetState() != ThreadState::kRunnable); + DCHECK(thread_ == Thread::Current() || thread_->IsSuspended()); } CHECK_EQ(cur_depth_, 0U); -- cgit v1.2.3-59-g8ed1b