commit 0b9b72e09d1c60bf9c9cd5b5ac0587024a3577aa
author Mathieu Chartier <mathieuc@google.com> Tue Mar 17 12:39:02 2020 -0700
committer Mathieu Chartier <mathieuc@google.com> Wed Mar 18 14:29:22 2020 +0000
tree a1fc5c56df8b95878e795a362e07a22ff77b0ba8
parent 01c66ba5eae879c4636a60b63d0ace32c8737217

Add more logging to Thread::SetState

In the case where SetState is used for a runnable state, add more
logging the DCHECK.

Bug: 151334951
Test: make
(cherry-picked from commit dc9d6a0740982a6b1eab5f3c580d8825cc9ced9c)

Merged-In: Ia1a0e60eed0815b459cbc5d1e7b60aed826245af
Change-Id: Ia1a0e60eed0815b459cbc5d1e7b60aed826245af

runtime/thread-inl.h

diff --git a/runtime/thread-inl.h b/runtime/thread-inl.h
index 0404ac9..a6da16f 100644
--- a/runtime/thread-inl.h
+++ b/runtime/thread-inl.h
@@ -114,7 +114,8 @@
   }
   union StateAndFlags old_state_and_flags;
   old_state_and_flags.as_int = tls32_.state_and_flags.as_int;
-  CHECK_NE(old_state_and_flags.as_struct.state, kRunnable);
+  CHECK_NE(old_state_and_flags.as_struct.state, kRunnable) << new_state << " " << *this << " "
+      << *Thread::Current();
   tls32_.state_and_flags.as_struct.state = new_state;
   return static_cast<ThreadState>(old_state_and_flags.as_struct.state);
 }