| Index: src/heap.cc
|
| diff --git a/src/heap.cc b/src/heap.cc
|
| index 0497ad5f6a3d0b12ff72fbf94c6c61f43f8dab4b..90b29fdcb14e46098ff5439ef2feafe6b74d7eed 100644
|
| --- a/src/heap.cc
|
| +++ b/src/heap.cc
|
| @@ -224,7 +224,7 @@ int Heap::GcSafeSizeOfOldObject(HeapObject* object) {
|
| return object->SizeFromMap(map_word.ToMap());
|
| }
|
|
|
| -
|
| +#ifndef BASELINE_GC
|
| int Heap::GcSafeSizeOfOldObjectWithEncodedMap(HeapObject* object) {
|
| ASSERT(!Heap::InNewSpace(object)); // Code only works for old objects.
|
| ASSERT(MarkCompactCollector::are_map_pointers_encoded());
|
| @@ -240,6 +240,7 @@ int Heap::GcSafeSizeOfOldObjectWithEncodedMap(HeapObject* object) {
|
| return object->SizeFromMap(map);
|
| }
|
| }
|
| +#endif
|
|
|
|
|
| GarbageCollector Heap::SelectGarbageCollector(AllocationSpace space) {
|
| @@ -3984,9 +3985,14 @@ void Heap::Verify() {
|
|
|
| new_space_.Verify();
|
|
|
| +#ifndef BASELINE_GC
|
| VerifyPointersAndDirtyRegionsVisitor dirty_regions_visitor;
|
| old_pointer_space_->Verify(&dirty_regions_visitor);
|
| map_space_->Verify(&dirty_regions_visitor);
|
| +#else
|
| + old_pointer_space_->Verify(&visitor);
|
| + map_space_->Verify(&visitor);
|
| +#endif
|
|
|
| VerifyPointersUnderWatermark(old_pointer_space_,
|
| &IteratePointersInDirtyRegion);
|
| @@ -4182,7 +4188,11 @@ void Heap::IterateAndMarkPointersToFromSpace(Address start,
|
| Address slot_address = start;
|
| Page* page = Page::FromAddress(start);
|
|
|
| +#ifndef BASELINE_GC
|
| uint32_t marks = page->GetRegionMarks();
|
| +#else
|
| + uint32_t marks = 0;
|
| +#endif
|
|
|
| while (slot_address < end) {
|
| Object** slot = reinterpret_cast<Object**>(slot_address);
|
| @@ -4197,7 +4207,9 @@ void Heap::IterateAndMarkPointersToFromSpace(Address start,
|
| slot_address += kPointerSize;
|
| }
|
|
|
| +#ifndef BASELINE_GC
|
| page->SetRegionMarks(marks);
|
| +#endif
|
| }
|
|
|
|
|
| @@ -4207,6 +4219,7 @@ uint32_t Heap::IterateDirtyRegions(
|
| Address area_end,
|
| DirtyRegionCallback visit_dirty_region,
|
| ObjectSlotCallback copy_object_func) {
|
| +#ifndef BASELINE_GC
|
| uint32_t newmarks = 0;
|
| uint32_t mask = 1;
|
|
|
| @@ -4263,6 +4276,10 @@ uint32_t Heap::IterateDirtyRegions(
|
| }
|
|
|
| return newmarks;
|
| +#else
|
| + visit_dirty_region(area_start, area_end, copy_object_func);
|
| + return 0;
|
| +#endif
|
| }
|
|
|
|
|
|
|