diff options
| author | 2017-01-19 22:21:31 +0000 | |
|---|---|---|
| committer | 2017-01-19 22:21:32 +0000 | |
| commit | a8acb1274c22a6931a542e2fb7960ec82f29da0b (patch) | |
| tree | ab542b8ea44c8c0060fc1048e730da9feb4ebb17 | |
| parent | a58bc2e74441ac89cb706b49c5a6d096df97080b (diff) | |
| parent | 8069a0a015905459d1b80520486fd15b915d8ca9 (diff) | |
Merge "Delete deadlocking DCHECK for LOS allocation"
| -rw-r--r-- | runtime/gc/space/large_object_space.cc | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/runtime/gc/space/large_object_space.cc b/runtime/gc/space/large_object_space.cc index e71a397039..4c6b5bfadd 100644 --- a/runtime/gc/space/large_object_space.cc +++ b/runtime/gc/space/large_object_space.cc @@ -141,16 +141,6 @@ mirror::Object* LargeObjectMapSpace::Alloc(Thread* self, size_t num_bytes, return nullptr; } mirror::Object* const obj = reinterpret_cast<mirror::Object*>(mem_map->Begin()); - if (kIsDebugBuild) { - ReaderMutexLock mu2(Thread::Current(), *Locks::heap_bitmap_lock_); - auto* heap = Runtime::Current()->GetHeap(); - auto* live_bitmap = heap->GetLiveBitmap(); - auto* space_bitmap = live_bitmap->GetContinuousSpaceBitmap(obj); - CHECK(space_bitmap == nullptr) << obj << " overlaps with bitmap " << *space_bitmap; - auto* obj_end = reinterpret_cast<mirror::Object*>(mem_map->End()); - space_bitmap = live_bitmap->GetContinuousSpaceBitmap(obj_end - 1); - CHECK(space_bitmap == nullptr) << obj_end << " overlaps with bitmap " << *space_bitmap; - } MutexLock mu(self, lock_); large_objects_.Put(obj, LargeObject {mem_map, false /* not zygote */}); const size_t allocation_size = mem_map->BaseSize(); |