summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2012-03-29 20:19:01 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-03-29 20:19:01 -0700
commite103141a78d705f2009b7f98c9a9df201dda63a7 (patch)
tree4262c2954f0b56350b641cde76ff608c08206df7
parent878820f34be4b40dc8efbc63314c15c0d409b5fd (diff)
parentb5db3bb5b17f2bb42f3c62408938f4bf939f8a39 (diff)
downloadart-e103141a78d705f2009b7f98c9a9df201dda63a7.zip
art-e103141a78d705f2009b7f98c9a9df201dda63a7.tar.gz
art-e103141a78d705f2009b7f98c9a9df201dda63a7.tar.bz2
Merge "Include more detail in a few CHECKs." into ics-mr1-plus-art
-rw-r--r--src/thread.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/thread.cc b/src/thread.cc
index fa78365..c4934b0 100644
--- a/src/thread.cc
+++ b/src/thread.cc
@@ -1740,11 +1740,11 @@ void Thread::CheckSafeToLockOrUnlock(MutexRank rank, bool is_locking) {
bad_mutexes_held = true;
}
}
- CHECK(!bad_mutexes_held);
+ CHECK(!bad_mutexes_held) << rank;
}
++held_mutexes_[rank];
} else {
- CHECK_GT(held_mutexes_[rank], 0U);
+ CHECK_GT(held_mutexes_[rank], 0U) << rank;
--held_mutexes_[rank];
}
}