diff options
| author | 2017-03-22 23:38:36 +0000 | |
|---|---|---|
| committer | 2017-03-22 23:38:37 +0000 | |
| commit | 47e01b7b2d79c1a75ec9b67ab7af656f83d9185f (patch) | |
| tree | 7a9510fe1db9cfc29d89240456300869a71710ce | |
| parent | ae7eef6ee1bdca135587a1aa4f0661faa96d15a8 (diff) | |
| parent | b01335ca9387bfb8f8a770839b90315553e5b2b7 (diff) | |
Merge "Add even more logging failed to copy GC error"
| -rw-r--r-- | runtime/gc/collector/concurrent_copying.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/runtime/gc/collector/concurrent_copying.cc b/runtime/gc/collector/concurrent_copying.cc index 7136f101aa..d2ab41d409 100644 --- a/runtime/gc/collector/concurrent_copying.cc +++ b/runtime/gc/collector/concurrent_copying.cc @@ -2171,9 +2171,12 @@ 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 for a " - << obj_size << " byte object in region type " - << region_space_->GetRegionType(from_ref); + if (UNLIKELY(to_ref == nullptr)) { + LOG(FATAL_WITHOUT_ABORT) << "Fall-back non-moving space allocation failed for a " + << obj_size << " byte object in region type " + << region_space_->GetRegionType(from_ref); + LOG(FATAL) << "Object address=" << from_ref << " type=" << from_ref->PrettyTypeOf(); + } bytes_allocated = non_moving_space_bytes_allocated; // Mark it in the mark bitmap. accounting::ContinuousSpaceBitmap* mark_bitmap = |