commit b9c683421b3966c798837192cc1a480ef3071a27
author Roland Levillain <rpl@google.com> Tue Sep 04 18:56:31 2018 +0100
committer Roland Levillain <rpl@google.com> Tue Sep 04 19:10:28 2018 +0100
tree 30cc18d9df73cbc44aa9a0103ba981315e6b7679
parent 77bb25b037d120ecbf5e7bbd90be6375b9e61957

Add more debug logging to VerifyNoMissingCardMarkVisitor::CheckReference.

Test: art/test.py
Bug: 113858074
Change-Id: I46a969a4e4f536e3a8925f6ed4bc7eebee6b458d

runtime/gc/collector/concurrent_copying.cc

diff --git a/runtime/gc/collector/concurrent_copying.cc b/runtime/gc/collector/concurrent_copying.cc
index 3ac2486..3a80008 100644
--- a/runtime/gc/collector/concurrent_copying.cc
+++ b/runtime/gc/collector/concurrent_copying.cc
@@ -643,9 +643,16 @@
 
   void CheckReference(mirror::Object* ref, int32_t offset = -1) const
       REQUIRES_SHARED(Locks::mutator_lock_) {
-    CHECK(ref == nullptr || !cc_->region_space_->IsInNewlyAllocatedRegion(ref))
+    if (ref != nullptr && cc_->region_space_->IsInNewlyAllocatedRegion(ref)) {
+      LOG(FATAL_WITHOUT_ABORT)
         << holder_->PrettyTypeOf() << "(" << holder_.Ptr() << ") references object "
         << ref->PrettyTypeOf() << "(" << ref << ") in newly allocated region at offset=" << offset;
+      LOG(FATAL_WITHOUT_ABORT) << "time=" << cc_->region_space_->Time();
+      constexpr const char* kIndent = "  ";
+      LOG(FATAL_WITHOUT_ABORT) << cc_->DumpReferenceInfo(holder_.Ptr(), "holder_", kIndent);
+      LOG(FATAL_WITHOUT_ABORT) << cc_->DumpReferenceInfo(ref, "ref", kIndent);
+      LOG(FATAL) << "Unexpected reference to newly allocated region.";
+    }
   }
 
  private: