Index: src/heap/heap.cc |
diff --git a/src/heap/heap.cc b/src/heap/heap.cc |
index 89bc3a75621826262fefeded4328011ba95b22e6..7933327c588a44b3abd0a05f19e6095200958265 100644 |
--- a/src/heap/heap.cc |
+++ b/src/heap/heap.cc |
@@ -4287,7 +4287,7 @@ void Heap::RegisterReservationsForBlackAllocation(Reservation* reservations) { |
void Heap::NotifyObjectLayoutChange(HeapObject* object, |
const DisallowHeapAllocation&) { |
if (FLAG_incremental_marking && incremental_marking()->IsMarking()) { |
- incremental_marking()->MarkGrey(object); |
ulan
2017/05/02 18:20:31
MarkGrey is defined as WhiteToGreyAndPush. The lat
|
+ incremental_marking()->WhiteToGreyAndPush(object); |
} |
#ifdef VERIFY_HEAP |
DCHECK(pending_layout_change_object_ == nullptr); |
@@ -4852,7 +4852,7 @@ class IterateAndScavengePromotedObjectsVisitor final : public ObjectVisitor { |
// promoted objects. |
if (heap_->incremental_marking()->black_allocation()) { |
Code* code = Code::cast(Code::GetObjectFromEntryAddress(code_entry_slot)); |
- heap_->incremental_marking()->MarkGrey(code); |
+ heap_->incremental_marking()->WhiteToGreyAndPush(code); |
} |
} |
@@ -4891,7 +4891,7 @@ void Heap::IterateAndScavengePromotedObject(HeapObject* target, int size, |
// regular visiting and IteratePromotedObjectPointers. |
if (!was_marked_black) { |
if (incremental_marking()->black_allocation()) { |
- incremental_marking()->MarkGrey(target->map()); |
+ incremental_marking()->WhiteToGreyAndPush(target->map()); |
incremental_marking()->IterateBlackObject(target); |
} |
} |
@@ -5655,7 +5655,7 @@ void Heap::RegisterExternallyReferencedObject(Object** object) { |
HeapObject* heap_object = HeapObject::cast(*object); |
DCHECK(Contains(heap_object)); |
if (FLAG_incremental_marking_wrappers && incremental_marking()->IsMarking()) { |
- incremental_marking()->MarkGrey(heap_object); |
+ incremental_marking()->WhiteToGreyAndPush(heap_object); |
} else { |
DCHECK(mark_compact_collector()->in_use()); |
mark_compact_collector()->MarkObject(heap_object); |