commit f5a7a476e7ea63e094ff0f011dccc170607e6f6b
author Elliott Hughes <enh@google.com> Fri Oct 07 14:31:02 2011 -0700
committer Elliott Hughes <enh@google.com> Fri Oct 07 15:08:48 2011 -0700
tree 4f07e57d5e3d2a82eeefcb7c6409f36b383b1d96
parent c2858561314513cc7bce2da7e13664aefef5a2ac

Enhance CHECK_EQ and friends to allow extra detail to be appended (like CHECK).

Change-Id: Iaa980892ab31621c8bcca9ea7c6c4ee743333f45

src/object_bitmap.cc

diff --git a/src/object_bitmap.cc b/src/object_bitmap.cc
index 06d86d6..483feac 100644
--- a/src/object_bitmap.cc
+++ b/src/object_bitmap.cc
@@ -111,7 +111,7 @@
 void HeapBitmap::ScanWalk(uintptr_t base, ScanCallback* callback, void* arg) {
   CHECK(words_ != NULL);
   CHECK(callback != NULL);
-  CHECK(base >= base_);
+  CHECK_GE(base, base_);
   uintptr_t end = HB_OFFSET_TO_INDEX(max_ - base);
   for (uintptr_t i = 0; i <= end; ++i) {
     unsigned long word = words_[i];
@@ -141,11 +141,11 @@
                            HeapBitmap::SweepCallback* callback, void* arg) {
   CHECK(live_bitmap.words_ != NULL);
   CHECK(mark_bitmap.words_ != NULL);
-  CHECK(live_bitmap.base_ == mark_bitmap.base_);
-  CHECK(live_bitmap.num_bytes_ == mark_bitmap.num_bytes_);
+  CHECK_EQ(live_bitmap.base_, mark_bitmap.base_);
+  CHECK_EQ(live_bitmap.num_bytes_, mark_bitmap.num_bytes_);
   CHECK(callback != NULL);
-  CHECK(base <= max);
-  CHECK(base >= live_bitmap.base_);
+  CHECK_LE(base, max);
+  CHECK_GE(base, live_bitmap.base_);
   max = std::min(max-1, live_bitmap.max_);
   if (live_bitmap.max_ < live_bitmap.base_) {
     // Easy case; both are obviously empty.