From: Mathieu Chartier <mathieuc@google.com>
Date: Tue, 13 Sep 2016 17:02:48 +0000 (-0700)
Subject: Add more logging for checking in to-space for CC copy
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=dfcd6f4f9bcbceb065ccb7e51da249afffd41ab2;p=android-x86%2Fart.git

Add more logging for checking in to-space for CC copy

Trying to debug occasionally failing CHECK.

Bug: 31423258

Test: test-art-host CC baker

Change-Id: I00963eb4f529811090e485184bb48a28287e77d3
---

diff --git a/runtime/gc/collector/concurrent_copying.cc b/runtime/gc/collector/concurrent_copying.cc
index 975ac364d..e534369ff 100644
--- a/runtime/gc/collector/concurrent_copying.cc
+++ b/runtime/gc/collector/concurrent_copying.cc
@@ -2087,7 +2087,8 @@ mirror::Object* ConcurrentCopying::Copy(mirror::Object* from_ref) {
       to_ref = reinterpret_cast<mirror::Object*>(old_lock_word.ForwardingAddress());
       CHECK(to_ref != nullptr);
       CHECK_NE(to_ref, lost_fwd_ptr);
-      CHECK(region_space_->IsInToSpace(to_ref) || heap_->non_moving_space_->HasAddress(to_ref));
+      CHECK(region_space_->IsInToSpace(to_ref) || heap_->non_moving_space_->HasAddress(to_ref))
+          << "to_ref=" << to_ref << " " << heap_->DumpSpaces();
       CHECK_NE(to_ref->GetLockWord(false).GetState(), LockWord::kForwardingAddress);
       return to_ref;
     }