summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Roland Levillain <rpl@google.com> 2018-04-25 16:07:24 +0100
committer Roland Levillain <rpl@google.com> 2018-04-25 16:07:24 +0100
commitb6cf2ad4861629fecd55e6d13500b572f413bc7d (patch)
tree7ee09cc2edd2574dd80534763bd25c71a3ded3ff
parente83bae5c62c7e739e18cafa1126a727b4788895c (diff)
Reorder debug logging statements when marking a reference in an unused region.
Crash reports do not always contain the full logs and sometimes only show the first line printed with level FATAL. Reorder debug logging to dump essential information about the faulty reference first. Test: art/test.py Bug: 75967215 Change-Id: I3a2448bcf5b3a097fb69fa6137c37e51fe3a97a0
-rw-r--r--runtime/gc/collector/concurrent_copying-inl.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/gc/collector/concurrent_copying-inl.h b/runtime/gc/collector/concurrent_copying-inl.h
index 6e345fb2f2..b331e975fd 100644
--- a/runtime/gc/collector/concurrent_copying-inl.h
+++ b/runtime/gc/collector/concurrent_copying-inl.h
@@ -146,8 +146,8 @@ inline mirror::Object* ConcurrentCopying::Mark(mirror::Object* from_ref,
return MarkUnevacFromSpaceRegion(from_ref, region_space_bitmap_);
default:
// The reference is in an unused region.
- region_space_->DumpNonFreeRegions(LOG_STREAM(FATAL_WITHOUT_ABORT));
LOG(FATAL_WITHOUT_ABORT) << DumpHeapReference(holder, offset, from_ref);
+ region_space_->DumpNonFreeRegions(LOG_STREAM(FATAL_WITHOUT_ABORT));
heap_->GetVerification()->LogHeapCorruption(holder, offset, from_ref, /* fatal */ true);
UNREACHABLE();
}