Revert "Revert "Upgrade to 5.0.71.48""
This reverts commit f2e3994fa5148cc3d9946666f0b0596290192b0e,
and updates the x64 makefile properly so it doesn't break that
build.
Change-Id: Ib83e35bfbae6af627451c926a9650ec57c045605
diff --git a/src/heap/store-buffer-inl.h b/src/heap/store-buffer-inl.h
index e11ad87..920ec34 100644
--- a/src/heap/store-buffer-inl.h
+++ b/src/heap/store-buffer-inl.h
@@ -6,48 +6,30 @@
#define V8_STORE_BUFFER_INL_H_
#include "src/heap/heap.h"
+#include "src/heap/remembered-set.h"
#include "src/heap/spaces-inl.h"
#include "src/heap/store-buffer.h"
namespace v8 {
namespace internal {
-void StoreBuffer::Mark(Address addr) {
- DCHECK(!heap_->code_space()->Contains(addr));
- Address* top = reinterpret_cast<Address*>(heap_->store_buffer_top());
- *top++ = addr;
- heap_->set_store_buffer_top(reinterpret_cast<Smi*>(top));
- if ((reinterpret_cast<uintptr_t>(top) & kStoreBufferOverflowBit) != 0) {
- DCHECK(top == limit_);
- Compact();
- } else {
- DCHECK(top < limit_);
- }
+void LocalStoreBuffer::Record(Address addr) {
+ if (top_->is_full()) top_ = new Node(top_);
+ top_->buffer[top_->count++] = addr;
}
-
-inline void StoreBuffer::MarkSynchronized(Address addr) {
- base::LockGuard<base::Mutex> lock_guard(&mutex_);
- Mark(addr);
-}
-
-
-void StoreBuffer::EnterDirectlyIntoStoreBuffer(Address addr) {
- if (store_buffer_rebuilding_enabled_) {
- SLOW_DCHECK(!heap_->code_space()->Contains(addr) &&
- !heap_->new_space()->Contains(addr));
- Address* top = old_top_;
- *top++ = addr;
- old_top_ = top;
- old_buffer_is_sorted_ = false;
- old_buffer_is_filtered_ = false;
- if (top >= old_limit_) {
- DCHECK(callback_ != NULL);
- (*callback_)(heap_, MemoryChunk::FromAnyPointerAddress(heap_, addr),
- kStoreBufferFullEvent);
+void LocalStoreBuffer::Process(StoreBuffer* store_buffer) {
+ Node* current = top_;
+ while (current != nullptr) {
+ for (int i = 0; i < current->count; i++) {
+ Address slot = current->buffer[i];
+ Page* page = Page::FromAnyPointerAddress(heap_, slot);
+ RememberedSet<OLD_TO_NEW>::Insert(page, slot);
}
+ current = current->next;
}
}
+
} // namespace internal
} // namespace v8