Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7)

Side by Side Diff: src/heap/heap.cc

Issue 2002013002: [heap] Pass a force_promotion flag to the evacuation routine in the scavenger. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Use the enum {PromotionMode} instead of a boolean flag. Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2012 the V8 project authors. All rights reserved. 1 // Copyright 2012 the V8 project authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "src/heap/heap.h" 5 #include "src/heap/heap.h"
6 6
7 #include "src/accessors.h" 7 #include "src/accessors.h"
8 #include "src/api.h" 8 #include "src/api.h"
9 #include "src/ast/scopeinfo.h" 9 #include "src/ast/scopeinfo.h"
10 #include "src/base/bits.h" 10 #include "src/base/bits.h"
(...skipping 1650 matching lines...) Expand 10 before | Expand all | Expand 10 after
1661 { 1661 {
1662 // Copy roots. 1662 // Copy roots.
1663 TRACE_GC(tracer(), GCTracer::Scope::SCAVENGER_ROOTS); 1663 TRACE_GC(tracer(), GCTracer::Scope::SCAVENGER_ROOTS);
1664 IterateRoots(&scavenge_visitor, VISIT_ALL_IN_SCAVENGE); 1664 IterateRoots(&scavenge_visitor, VISIT_ALL_IN_SCAVENGE);
1665 } 1665 }
1666 1666
1667 { 1667 {
1668 // Copy objects reachable from the old generation. 1668 // Copy objects reachable from the old generation.
1669 TRACE_GC(tracer(), GCTracer::Scope::SCAVENGER_OLD_TO_NEW_POINTERS); 1669 TRACE_GC(tracer(), GCTracer::Scope::SCAVENGER_OLD_TO_NEW_POINTERS);
1670 RememberedSet<OLD_TO_NEW>::Iterate(this, [this](Address addr) { 1670 RememberedSet<OLD_TO_NEW>::Iterate(this, [this](Address addr) {
1671 return Scavenger::CheckAndScavengeObject(this, addr); 1671 return Scavenger::CheckAndScavengeObject(this, addr, DEFAULT_PROMOTION);
1672 }); 1672 });
1673 1673
1674 RememberedSet<OLD_TO_NEW>::IterateTyped( 1674 RememberedSet<OLD_TO_NEW>::IterateTyped(
1675 this, [this](SlotType type, Address addr) { 1675 this, [this](SlotType type, Address addr) {
1676 return UpdateTypedSlotHelper::UpdateTypedSlot( 1676 return UpdateTypedSlotHelper::UpdateTypedSlot(
1677 isolate(), type, addr, [this](Object** addr) { 1677 isolate(), type, addr, [this](Object** addr) {
1678 return Scavenger::CheckAndScavengeObject( 1678 return Scavenger::CheckAndScavengeObject(
1679 this, reinterpret_cast<Address>(addr)); 1679 this, reinterpret_cast<Address>(addr), FORCE_PROMOTION);
ulan 2016/05/23 13:04:22 Please add a comment why we force promotion here.
ahaas 2016/05/23 13:31:48 Done.
1680 }); 1680 });
1681 }); 1681 });
1682 } 1682 }
1683 1683
1684 { 1684 {
1685 TRACE_GC(tracer(), GCTracer::Scope::SCAVENGER_WEAK); 1685 TRACE_GC(tracer(), GCTracer::Scope::SCAVENGER_WEAK);
1686 // Copy objects reachable from the encountered weak collections list. 1686 // Copy objects reachable from the encountered weak collections list.
1687 scavenge_visitor.VisitPointer(&encountered_weak_collections_); 1687 scavenge_visitor.VisitPointer(&encountered_weak_collections_);
1688 // Copy objects reachable from the encountered weak cells. 1688 // Copy objects reachable from the encountered weak cells.
1689 scavenge_visitor.VisitPointer(&encountered_weak_cells_); 1689 scavenge_visitor.VisitPointer(&encountered_weak_cells_);
(...skipping 2968 matching lines...) Expand 10 before | Expand all | Expand 10 after
4658 Address end, bool record_slots, 4658 Address end, bool record_slots,
4659 ObjectSlotCallback callback) { 4659 ObjectSlotCallback callback) {
4660 Address slot_address = start; 4660 Address slot_address = start;
4661 Page* page = Page::FromAddress(start); 4661 Page* page = Page::FromAddress(start);
4662 4662
4663 while (slot_address < end) { 4663 while (slot_address < end) {
4664 Object** slot = reinterpret_cast<Object**>(slot_address); 4664 Object** slot = reinterpret_cast<Object**>(slot_address);
4665 Object* target = *slot; 4665 Object* target = *slot;
4666 if (target->IsHeapObject()) { 4666 if (target->IsHeapObject()) {
4667 if (Heap::InFromSpace(target)) { 4667 if (Heap::InFromSpace(target)) {
4668 callback(reinterpret_cast<HeapObject**>(slot), 4668 callback(reinterpret_cast<HeapObject**>(slot), HeapObject::cast(target),
4669 HeapObject::cast(target)); 4669 DEFAULT_PROMOTION);
4670 Object* new_target = *slot; 4670 Object* new_target = *slot;
4671 if (InNewSpace(new_target)) { 4671 if (InNewSpace(new_target)) {
4672 SLOW_DCHECK(Heap::InToSpace(new_target)); 4672 SLOW_DCHECK(Heap::InToSpace(new_target));
4673 SLOW_DCHECK(new_target->IsHeapObject()); 4673 SLOW_DCHECK(new_target->IsHeapObject());
4674 RememberedSet<OLD_TO_NEW>::Insert(page, slot_address); 4674 RememberedSet<OLD_TO_NEW>::Insert(page, slot_address);
4675 } 4675 }
4676 SLOW_DCHECK(!MarkCompactCollector::IsOnEvacuationCandidate(new_target)); 4676 SLOW_DCHECK(!MarkCompactCollector::IsOnEvacuationCandidate(new_target));
4677 } else if (record_slots && 4677 } else if (record_slots &&
4678 MarkCompactCollector::IsOnEvacuationCandidate(target)) { 4678 MarkCompactCollector::IsOnEvacuationCandidate(target)) {
4679 mark_compact_collector()->RecordSlot(object, slot, target); 4679 mark_compact_collector()->RecordSlot(object, slot, target);
(...skipping 1687 matching lines...) Expand 10 before | Expand all | Expand 10 after
6367 } 6367 }
6368 6368
6369 6369
6370 // static 6370 // static
6371 int Heap::GetStaticVisitorIdForMap(Map* map) { 6371 int Heap::GetStaticVisitorIdForMap(Map* map) {
6372 return StaticVisitorBase::GetVisitorId(map); 6372 return StaticVisitorBase::GetVisitorId(map);
6373 } 6373 }
6374 6374
6375 } // namespace internal 6375 } // namespace internal
6376 } // namespace v8 6376 } // namespace v8
OLDNEW
« no previous file with comments | « src/heap/heap.h ('k') | src/heap/scavenger.h » ('j') | src/heap/scavenger.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698