summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2017-03-15 23:41:51 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2017-03-15 23:41:52 +0000
commitc53528a048e47ef8c51fc5c9667061ebd840adf1 (patch)
treec86f3b2a130f3f9972d0b638651626d418da04e7
parentfcfaa8d823017eb209fd6e18a6fe496f4c979026 (diff)
parent73a7564e3b49b8475cb43ddc0d55fffdd43bee77 (diff)
Merge "Add more logging to OOM in fallback space DCHECK"
-rw-r--r--runtime/gc/collector/concurrent_copying.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/runtime/gc/collector/concurrent_copying.cc b/runtime/gc/collector/concurrent_copying.cc
index aea9708ddc..7136f101aa 100644
--- a/runtime/gc/collector/concurrent_copying.cc
+++ b/runtime/gc/collector/concurrent_copying.cc
@@ -2171,7 +2171,9 @@ mirror::Object* ConcurrentCopying::Copy(mirror::Object* from_ref) {
fall_back_to_non_moving = true;
to_ref = heap_->non_moving_space_->Alloc(Thread::Current(), obj_size,
&non_moving_space_bytes_allocated, nullptr, &dummy);
- CHECK(to_ref != nullptr) << "Fall-back non-moving space allocation failed";
+ CHECK(to_ref != nullptr) << "Fall-back non-moving space allocation failed for a "
+ << obj_size << " byte object in region type "
+ << region_space_->GetRegionType(from_ref);
bytes_allocated = non_moving_space_bytes_allocated;
// Mark it in the mark bitmap.
accounting::ContinuousSpaceBitmap* mark_bitmap =