commit fc4f698dca5997b0356de4d90d57e459b66eef15
author Lokesh Gidra <lokeshgidra@google.com> Mon Nov 09 16:00:38 2020 -0800
committer Lokesh Gidra <lokeshgidra@google.com> Tue Nov 10 17:57:41 2020 +0000
tree 509c8c97ec6b0c839a195a7d9ce0ad6f5a15ec1d
parent 1bff99f706a1b1a4c1799e0f037d9f59f303587a

Print CC collector object addresses on failing assertion

Test: art/test/testrunner/testrunner.py
Bug: 139525088
Change-Id: I499ab2de7caba5baacec3049ca954fbb2859edf0

runtime/gc/heap.h

diff --git a/runtime/gc/heap.h b/runtime/gc/heap.h
index 7aff143..92575c3 100644
--- a/runtime/gc/heap.h
+++ b/runtime/gc/heap.h
@@ -781,7 +781,10 @@
   collector::ConcurrentCopying* ConcurrentCopyingCollector() {
     if (use_generational_cc_) {
       DCHECK((active_concurrent_copying_collector_ == concurrent_copying_collector_) ||
-             (active_concurrent_copying_collector_ == young_concurrent_copying_collector_));
+             (active_concurrent_copying_collector_ == young_concurrent_copying_collector_))
+              << "active_concurrent_copying_collector: " << active_concurrent_copying_collector_
+              << " young_concurrent_copying_collector: " << young_concurrent_copying_collector_
+              << " concurrent_copying_collector: " << concurrent_copying_collector_;
     } else {
       DCHECK_EQ(active_concurrent_copying_collector_, concurrent_copying_collector_);
     }