commit 8409ec440079020bbe4ad066cf18a5fadfba67d2
author Ian Rogers <irogers@google.com> Tue Nov 04 17:57:02 2014 -0800
committer Ian Rogers <irogers@google.com> Tue Nov 04 17:57:02 2014 -0800
tree 20a5876198e3292b309b00d88345978f1f194a0e
parent b5331ef9bb2ae68c392e5da3da13816bd43e5b1d

Make thread dumping more tolerant of broken invariants during abort.

Change-Id: Ie1bc20debe72f2ea2bf4c1be50cd9877c823670a

runtime/thread_list.cc

diff --git a/runtime/thread_list.cc b/runtime/thread_list.cc
index e3ef4eb..48f283d 100644
--- a/runtime/thread_list.cc
+++ b/runtime/thread_list.cc
@@ -241,7 +241,7 @@
   Locks::mutator_lock_->AssertNotExclusiveHeld(self);
   Locks::thread_list_lock_->AssertNotHeld(self);
   Locks::thread_suspend_count_lock_->AssertNotHeld(self);
-  if (kDebugLocking) {
+  if (kDebugLocking && gAborting == 0) {
     CHECK_NE(self->GetState(), kRunnable);
   }