commit e3359f7ad7671c5816f17145ca3a01516512e8d6
author Ian Rogers <irogers@google.com> Tue Jun 11 15:14:11 2013 -0700
committer Ian Rogers <irogers@google.com> Tue Jun 11 15:14:11 2013 -0700
tree bfb5a78fb6c42ea5fc93638d6aaa82fdf7a201a6
parent 62342ec720069cebe55f45aea2ff8512a17e7d62

Don't recursively take ClassLinker::dex_lock_.

Fix for Bug: 9285048.

Change-Id: I4bdefdc7e1de2eec6488e8d629147d9699f4d099

src/base/mutex.h

diff --git a/src/base/mutex.h b/src/base/mutex.h
index d6ae3dc..e7d2e97 100644
--- a/src/base/mutex.h
+++ b/src/base/mutex.h
@@ -247,7 +247,7 @@
   // Assert the current thread doesn't have exclusive access to the ReaderWriterMutex.
   void AssertNotExclusiveHeld(const Thread* self) {
     if (kDebugLocking) {
-      CHECK(!IsExclusiveHeld(self));
+      CHECK(!IsExclusiveHeld(self)) << *this;
     }
   }
   void AssertNotWriterHeld(const Thread* self) { AssertNotExclusiveHeld(self); }