commit 3ba842dfa15bb51d6579b0ac4dc92f6fbc23db23
author Hans Boehm <hboehm@google.com> Sat May 07 15:47:02 2022 +0000
committer Hans Boehm <hboehm@google.com> Sat May 07 19:04:19 2022 +0000
tree 63ab77094e9320993e8e5a38af33990e4e766db2
parent bcf7ef1253691af61dab4062a358a2b903704d45

Revert "Better detect PrimitiveArrayCritical issues"

This reverts commit 070089805ee1ccd09e72eed9b28229f94adc3336.

Reason for revert: CMS failures: GetDisableThreadFlipCount requires kUseReadBarrier

Change-Id: I290d273279e2ddb42159bf3e100d82b127e11321

runtime/thread.cc

diff --git a/runtime/thread.cc b/runtime/thread.cc
index f315b96..97cfb7a 100644
--- a/runtime/thread.cc
+++ b/runtime/thread.cc
@@ -1981,9 +1981,6 @@
     if (thread->IsStillStarting()) {
       os << " (still starting up)";
     }
-    if (thread->GetDisableThreadFlipCount() != 0) {
-      os << " DisableFlipCount = " << thread->GetDisableThreadFlipCount();
-    }
     os << "\n";
   } else {
     os << '"' << ::art::GetThreadName(tid) << '"'

runtime/thread_list.cc

diff --git a/runtime/thread_list.cc b/runtime/thread_list.cc
index 69f88d8..6482e72 100644
--- a/runtime/thread_list.cc
+++ b/runtime/thread_list.cc
@@ -1291,10 +1291,6 @@
   DCHECK_EQ(self, Thread::Current());
   CHECK_NE(self->GetState(), ThreadState::kRunnable);
   Locks::mutator_lock_->AssertNotHeld(self);
-  if (self->GetDisableThreadFlipCount() != 0) {
-    LOG(FATAL) << "Incomplete PrimitiveArrayCritical section at exit: " << *self << "count = "
-               << self->GetDisableThreadFlipCount();
-  }
 
   VLOG(threads) << "ThreadList::Unregister() " << *self;