Index: src/heap/store-buffer.cc |
diff --git a/src/heap/store-buffer.cc b/src/heap/store-buffer.cc |
index 6bf318871754d3d642bcd8dba58cbb7bc9bb0912..dec11daa90674b922d1a5510abd637323c08d654 100644 |
--- a/src/heap/store-buffer.cc |
+++ b/src/heap/store-buffer.cc |
@@ -361,14 +361,12 @@ |
Address* new_top = old_start_; |
for (Address* current = old_start_; current < old_top_; current++) { |
Address addr = *current; |
- Object** slot = reinterpret_cast<Object**>(addr); |
+ Object** slot = reinterpret_cast<Object**>(*current); |
Object* object = *slot; |
- if (heap_->InNewSpace(object) && object->IsHeapObject()) { |
- // If the target object is not black, the source slot must be part |
- // of a non-black (dead) object. |
- HeapObject* heap_object = HeapObject::cast(object); |
- if (Marking::IsBlack(Marking::MarkBitFrom(heap_object)) && |
- heap_->mark_compact_collector()->IsSlotInLiveObject(addr)) { |
+ if (heap_->InNewSpace(object)) { |
+ if (heap_->mark_compact_collector()->IsSlotInLiveObject( |
+ reinterpret_cast<HeapObject**>(slot), |
+ reinterpret_cast<HeapObject*>(object))) { |
*new_top++ = addr; |
} |
} |
@@ -391,10 +389,10 @@ |
for (Address* current = old_start_; current < old_top_; current++) { |
Object** slot = reinterpret_cast<Object**>(*current); |
Object* object = *slot; |
- CHECK(object->IsHeapObject()); |
CHECK(heap_->InNewSpace(object)); |
heap_->mark_compact_collector()->VerifyIsSlotInLiveObject( |
- reinterpret_cast<Address>(slot), HeapObject::cast(object)); |
+ reinterpret_cast<HeapObject**>(slot), |
+ reinterpret_cast<HeapObject*>(object)); |
} |
} |