| Index: src/heap/slots-buffer.cc
 | 
| diff --git a/src/heap/slots-buffer.cc b/src/heap/slots-buffer.cc
 | 
| index 3f145e6e2e809b82ba286a4c99e3e78e32584c37..4c54ab7e4d0af561336f28c16f56c1b090d6c44b 100644
 | 
| --- a/src/heap/slots-buffer.cc
 | 
| +++ b/src/heap/slots-buffer.cc
 | 
| @@ -56,9 +56,10 @@ void SlotsBuffer::RemoveInvalidSlots(Heap* heap, SlotsBuffer* buffer) {
 | 
|          // - point to a heap object in new space
 | 
|          // - are not within a live heap object on a valid pointer slot
 | 
|          // - point to a heap object not on an evacuation candidate
 | 
| -        if (!object->IsHeapObject() || heap->InNewSpace(object) ||
 | 
| +        if (!object->IsHeapObject() ||
 | 
|              !heap->mark_compact_collector()->IsSlotInLiveObject(
 | 
|                  reinterpret_cast<Address>(slot)) ||
 | 
| +            heap->InNewSpace(object) ||
 | 
|              !Page::FromAddress(reinterpret_cast<Address>(object))
 | 
|                   ->IsEvacuationCandidate()) {
 | 
|            // TODO(hpayer): Instead of replacing slots with kRemovedEntry we
 | 
| 
 |