Fix ART debug build boot.
Some of the checks were no longer valid after the zygote bin packing.
Bug: 12480317
Change-Id: Iaa169b0aafe9fec06e75e9b58a3de28aa70a9421
diff --git a/runtime/gc/heap.cc b/runtime/gc/heap.cc
index 47c13c7..0f98116 100644
--- a/runtime/gc/heap.cc
+++ b/runtime/gc/heap.cc
@@ -1330,13 +1330,13 @@
virtual mirror::Object* MarkNonForwardedObject(mirror::Object* obj)
EXCLUSIVE_LOCKS_REQUIRED(Locks::heap_bitmap_lock_, Locks::mutator_lock_) {
size_t object_size = RoundUp(obj->SizeOf(), kObjectAlignment);
- mirror::Object* forward_address = nullptr;
+ mirror::Object* forward_address;
// Find the smallest bin which we can move obj in.
auto it = bins_.lower_bound(object_size);
if (it == bins_.end()) {
// No available space in the bins, place it in the target space instead (grows the zygote
// space).
- size_t bytes_allocated = 0;
+ size_t bytes_allocated;
forward_address = to_space_->Alloc(self_, object_size, &bytes_allocated);
if (to_space_live_bitmap_ != nullptr) {
to_space_live_bitmap_->Set(forward_address);