Index: src/heap/mark-compact.cc |
diff --git a/src/heap/mark-compact.cc b/src/heap/mark-compact.cc |
index e26653495ecf2ae7ff6bb9211798212dec8cbc1b..43f487b24084299e12a45df7539dba14512c7530 100644 |
--- a/src/heap/mark-compact.cc |
+++ b/src/heap/mark-compact.cc |
@@ -2663,8 +2663,10 @@ void MarkCompactCollector::MigrateObject( |
Address dst_addr = dst->address(); |
Address src_addr = src->address(); |
DCHECK(heap()->AllowedToBeMigrated(src, dest)); |
- DCHECK(dest != LO_SPACE && size <= Page::kMaxRegularHeapObjectSize); |
+ DCHECK(dest != LO_SPACE); |
if (dest == OLD_SPACE) { |
+ DCHECK_OBJECT_SIZE(size); |
+ DCHECK(size); |
Michael Lippautz
2015/10/13 07:42:26
nit: remove or make it explicit, e.g. DCHECK_GE.
Hannes Payer (out of office)
2015/10/13 08:20:39
Done.
|
DCHECK(evacuation_slots_buffer != nullptr); |
DCHECK(IsAligned(size, kPointerSize)); |
switch (src->ContentType()) { |
@@ -2688,12 +2690,14 @@ void MarkCompactCollector::MigrateObject( |
evacuation_slots_buffer); |
} |
} else if (dest == CODE_SPACE) { |
+ DCHECK_CODEOBJECT_SIZE(size, heap()->code_space()); |
DCHECK(evacuation_slots_buffer != nullptr); |
PROFILE(isolate(), CodeMoveEvent(src_addr, dst_addr)); |
heap()->MoveBlock(dst_addr, src_addr, size); |
RecordMigratedCodeObjectSlot(dst_addr, evacuation_slots_buffer); |
Code::cast(dst)->Relocate(dst_addr - src_addr); |
} else { |
+ DCHECK_OBJECT_SIZE(size); |
DCHECK(evacuation_slots_buffer == nullptr); |
DCHECK(dest == NEW_SPACE); |
heap()->MoveBlock(dst_addr, src_addr, size); |
@@ -3077,8 +3081,6 @@ static String* UpdateReferenceInExternalStringTableEntry(Heap* heap, |
bool MarkCompactCollector::TryPromoteObject(HeapObject* object, |
int object_size) { |
- DCHECK(object_size <= Page::kMaxRegularHeapObjectSize); |
- |
OldSpace* old_space = heap()->old_space(); |
HeapObject* target = nullptr; |