commit 751dee376dcd972af996106a4c32ab4964c1f867
author Ian Rogers <irogers@google.com> Tue Jul 08 06:04:43 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sun Jul 06 03:24:06 2014 +0000
tree 3bc68b414e4fafbdb13cbc8c216dd2824b5d828e
parent a3ed7f874710bddd51487b331e7f288806c36307
parent a9d8c4ce62fff49580fa70d3fcb3aee45344d8ca

Merge "BaseMutex::IsExclusiveHeld should only be called on self."

runtime/thread.cc

diff --git a/runtime/thread.cc b/runtime/thread.cc
index d3487d0..d60fb49 100644
--- a/runtime/thread.cc
+++ b/runtime/thread.cc
@@ -835,10 +835,9 @@
           os << " \"" << mutex->GetName() << "\"";
           if (mutex->IsReaderWriterMutex()) {
             ReaderWriterMutex* rw_mutex = down_cast<ReaderWriterMutex*>(mutex);
-            if (rw_mutex->IsExclusiveHeld(thread)) {
+            if (rw_mutex->GetExclusiveOwnerTid() == static_cast<uint64_t>(tid)) {
               os << "(exclusive held)";
             } else {
-              CHECK(rw_mutex->IsSharedHeld(thread));
               os << "(shared held)";
             }
           }