Index: src/store-buffer.cc |
diff --git a/src/store-buffer.cc b/src/store-buffer.cc |
index 63dce1f913af26917163ba33a5d9b8c30ca2c58f..3da50f6d4ea69421f3646bb82edbe0a30d8523a1 100644 |
--- a/src/store-buffer.cc |
+++ b/src/store-buffer.cc |
@@ -7,6 +7,8 @@ |
#include <algorithm> |
#include "src/v8.h" |
+ |
+#include "src/base/atomicops.h" |
#include "src/counters.h" |
#include "src/store-buffer-inl.h" |
@@ -345,7 +347,7 @@ void StoreBuffer::VerifyPointers(LargeObjectSpace* space) { |
// checks that pointers which satisfy predicate point into |
// the active semispace. |
Object* object = reinterpret_cast<Object*>( |
- NoBarrier_Load(reinterpret_cast<AtomicWord*>(slot))); |
+ base::NoBarrier_Load(reinterpret_cast<base::AtomicWord*>(slot))); |
heap_->InNewSpace(object); |
slot_address += kPointerSize; |
} |
@@ -382,7 +384,7 @@ void StoreBuffer::FindPointersToNewSpaceInRegion( |
slot_address += kPointerSize) { |
Object** slot = reinterpret_cast<Object**>(slot_address); |
Object* object = reinterpret_cast<Object*>( |
- NoBarrier_Load(reinterpret_cast<AtomicWord*>(slot))); |
+ base::NoBarrier_Load(reinterpret_cast<base::AtomicWord*>(slot))); |
if (heap_->InNewSpace(object)) { |
HeapObject* heap_object = reinterpret_cast<HeapObject*>(object); |
ASSERT(heap_object->IsHeapObject()); |
@@ -391,7 +393,7 @@ void StoreBuffer::FindPointersToNewSpaceInRegion( |
if (clear_maps) ClearDeadObject(heap_object); |
slot_callback(reinterpret_cast<HeapObject**>(slot), heap_object); |
object = reinterpret_cast<Object*>( |
- NoBarrier_Load(reinterpret_cast<AtomicWord*>(slot))); |
+ base::NoBarrier_Load(reinterpret_cast<base::AtomicWord*>(slot))); |
if (heap_->InNewSpace(object)) { |
EnterDirectlyIntoStoreBuffer(slot_address); |
} |
@@ -470,7 +472,7 @@ void StoreBuffer::IteratePointersInStoreBuffer( |
#endif |
Object** slot = reinterpret_cast<Object**>(*current); |
Object* object = reinterpret_cast<Object*>( |
- NoBarrier_Load(reinterpret_cast<AtomicWord*>(slot))); |
+ base::NoBarrier_Load(reinterpret_cast<base::AtomicWord*>(slot))); |
if (heap_->InFromSpace(object)) { |
HeapObject* heap_object = reinterpret_cast<HeapObject*>(object); |
// The new space object was not promoted if it still contains a map |
@@ -478,7 +480,7 @@ void StoreBuffer::IteratePointersInStoreBuffer( |
if (clear_maps) ClearDeadObject(heap_object); |
slot_callback(reinterpret_cast<HeapObject**>(slot), heap_object); |
object = reinterpret_cast<Object*>( |
- NoBarrier_Load(reinterpret_cast<AtomicWord*>(slot))); |
+ base::NoBarrier_Load(reinterpret_cast<base::AtomicWord*>(slot))); |
if (heap_->InNewSpace(object)) { |
EnterDirectlyIntoStoreBuffer(reinterpret_cast<Address>(slot)); |
} |