| Index: src/heap/heap.cc
|
| diff --git a/src/heap/heap.cc b/src/heap/heap.cc
|
| index a358feafe592c488ee1e0681da2e08790bde2945..3c8b876bf5d1e5b529001a985fe5ecabfdd92085 100644
|
| --- a/src/heap/heap.cc
|
| +++ b/src/heap/heap.cc
|
| @@ -1668,18 +1668,15 @@
|
| // Copy objects reachable from the old generation.
|
| TRACE_GC(tracer(), GCTracer::Scope::SCAVENGER_OLD_TO_NEW_POINTERS);
|
| RememberedSet<OLD_TO_NEW>::Iterate(this, [this](Address addr) {
|
| - return Scavenger::CheckAndScavengeObject(this, addr, DEFAULT_PROMOTION);
|
| + return Scavenger::CheckAndScavengeObject(this, addr);
|
| });
|
|
|
| RememberedSet<OLD_TO_NEW>::IterateTyped(
|
| this, [this](SlotType type, Address addr) {
|
| return UpdateTypedSlotHelper::UpdateTypedSlot(
|
| isolate(), type, addr, [this](Object** addr) {
|
| - // We expect that objects referenced by code are long living.
|
| - // If we do not force promotion, then we need to clear
|
| - // old_to_new slots in dead code objects after mark-compact.
|
| return Scavenger::CheckAndScavengeObject(
|
| - this, reinterpret_cast<Address>(addr), FORCE_PROMOTION);
|
| + this, reinterpret_cast<Address>(addr));
|
| });
|
| });
|
| }
|
| @@ -4668,8 +4665,8 @@
|
| Object* target = *slot;
|
| if (target->IsHeapObject()) {
|
| if (Heap::InFromSpace(target)) {
|
| - callback(reinterpret_cast<HeapObject**>(slot), HeapObject::cast(target),
|
| - DEFAULT_PROMOTION);
|
| + callback(reinterpret_cast<HeapObject**>(slot),
|
| + HeapObject::cast(target));
|
| Object* new_target = *slot;
|
| if (InNewSpace(new_target)) {
|
| SLOW_DCHECK(Heap::InToSpace(new_target));
|
|
|