[heap] Factor out marking state of array buffer tracker

src/heap/array-buffer-tracker.cc

 // Copyright 2015 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/heap/array-buffer-tracker.h"
 #include "src/heap/array-buffer-tracker-inl.h"
 #include "src/heap/heap.h"
+#include "src/heap/spaces.h"
 
 namespace v8 {
 namespace internal {
 
 LocalArrayBufferTracker::~LocalArrayBufferTracker() {
   CHECK(array_buffers_.empty());
 }
 
-template <LocalArrayBufferTracker::FreeMode free_mode>
-void LocalArrayBufferTracker::Free() {
+template <typename Callback>
+void LocalArrayBufferTracker::Free(Callback should_free) {
   size_t freed_memory = 0;
   for (TrackingData::iterator it = array_buffers_.begin();
        it != array_buffers_.end();) {
     JSArrayBuffer* buffer = reinterpret_cast<JSArrayBuffer*>(it->first);
-    // TODO(mlippautz): Create a dependency on the collector to avoid getting
-    // the marking state out of thin air.
-    if ((free_mode == kFreeAll) ||
-        ObjectMarking::IsWhite(buffer, MarkingState::Internal(buffer))) {
+    if (should_free(buffer)) {
       const size_t len = it->second;
       heap_->isolate()->array_buffer_allocator()->Free(buffer->backing_store(),
                                                        len);
       freed_memory += len;
       it = array_buffers_.erase(it);
     } else {
       ++it;
     }
   }
   if (freed_memory > 0) {
@@ skipping 45 matching lines @@
 void ArrayBufferTracker::FreeDeadInNewSpace(Heap* heap) {
   DCHECK_EQ(heap->gc_state(), Heap::HeapState::SCAVENGE);
   for (Page* page : PageRange(heap->new_space()->FromSpaceStart(),
                               heap->new_space()->FromSpaceEnd())) {
     bool empty = ProcessBuffers(page, kUpdateForwardedRemoveOthers);
     CHECK(empty);
   }
   heap->account_external_memory_concurrently_freed();
 }
 
-void ArrayBufferTracker::FreeDead(Page* page) {
+void ArrayBufferTracker::FreeDead(Page* page,
+                                  const MarkingState& marking_state) {
   // Callers need to ensure having the page lock.
   LocalArrayBufferTracker* tracker = page->local_tracker();
   if (tracker == nullptr) return;
-  DCHECK(!page->SweepingDone());
-  tracker->Free<LocalArrayBufferTracker::kFreeDead>();
+  tracker->Free([&marking_state](JSArrayBuffer* buffer) {
+    return ObjectMarking::IsWhite(buffer, marking_state);
+  });
   if (tracker->IsEmpty()) {
     page->ReleaseLocalTracker();
   }
 }
 
 void ArrayBufferTracker::FreeAll(Page* page) {
   LocalArrayBufferTracker* tracker = page->local_tracker();
   if (tracker == nullptr) return;
-  tracker->Free<LocalArrayBufferTracker::kFreeAll>();
+  tracker->Free([](JSArrayBuffer* buffer) { return true; });
   if (tracker->IsEmpty()) {
     page->ReleaseLocalTracker();
   }
 }
 
 bool ArrayBufferTracker::ProcessBuffers(Page* page, ProcessingMode mode) {
   LocalArrayBufferTracker* tracker = page->local_tracker();
   if (tracker == nullptr) return true;
 
   DCHECK(page->SweepingDone());
@@ skipping 16 matching lines @@
   {
     base::LockGuard<base::RecursiveMutex> guard(page->mutex());
     LocalArrayBufferTracker* tracker = page->local_tracker();
     if (tracker == nullptr) return false;
     return tracker->IsTracked(buffer);
   }
 }
 
 }  // namespace internal
 }  // namespace v8