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/collector/semi_space.cc b/runtime/gc/collector/semi_space.cc
index ffa9154..1ea2002 100644
--- a/runtime/gc/collector/semi_space.cc
+++ b/runtime/gc/collector/semi_space.cc
@@ -308,7 +308,7 @@
mirror::Object* SemiSpace::MarkNonForwardedObject(mirror::Object* obj) {
size_t object_size = obj->SizeOf();
- size_t bytes_allocated = 0;
+ size_t bytes_allocated;
mirror::Object* forward_address = nullptr;
if (kEnableSimplePromo && reinterpret_cast<byte*>(obj) < last_gc_to_space_end_) {
// If it's allocated before the last GC (older), move (pseudo-promote) it to
@@ -344,6 +344,8 @@
if (to_space_live_bitmap_ != nullptr) {
to_space_live_bitmap_->Set(forward_address);
}
+ DCHECK(to_space_->HasAddress(forward_address) ||
+ (kEnableSimplePromo && GetHeap()->GetNonMovingSpace()->HasAddress(forward_address)));
return forward_address;
}
@@ -365,9 +367,6 @@
reinterpret_cast<size_t>(forward_address)));
// Push the object onto the mark stack for later processing.
MarkStackPush(forward_address);
- } else {
- DCHECK(to_space_->HasAddress(forward_address) ||
- (kEnableSimplePromo && GetHeap()->GetNonMovingSpace()->HasAddress(forward_address)));
}
// TODO: Do we need this if in the else statement?
} else {
@@ -420,14 +419,6 @@
GetHeap()->GetMarkBitmap()->ReplaceBitmap(mark_bitmap, live_bitmap);
}
-mirror::Object* SemiSpace::GetForwardingAddress(mirror::Object* obj) {
- if (from_space_->HasAddress(obj)) {
- LOG(FATAL) << "Shouldn't happen!";
- return GetForwardingAddressInFromSpace(obj);
- }
- return obj;
-}
-
mirror::Object* SemiSpace::MarkedForwardingAddressCallback(Object* object, void* arg) {
return reinterpret_cast<SemiSpace*>(arg)->GetMarkedForwardAddress(object);
}
@@ -532,9 +523,6 @@
}
if (from_space_->HasAddress(obj)) {
mirror::Object* forwarding_address = GetForwardingAddressInFromSpace(const_cast<Object*>(obj));
- // If the object is forwarded then it MUST be marked.
- DCHECK(forwarding_address == nullptr || to_space_->HasAddress(forwarding_address) ||
- (kEnableSimplePromo && GetHeap()->GetNonMovingSpace()->HasAddress(forwarding_address)));
return forwarding_address; // Returns either the forwarding address or nullptr.
} else if (to_space_->HasAddress(obj)) {
// Should be unlikely.