| Index: src/heap/mark-compact.cc
|
| diff --git a/src/heap/mark-compact.cc b/src/heap/mark-compact.cc
|
| index 4dc6c9287dacf25c52400f41780a8dc4ffa86d94..b0cd9e4b8b916c38c4a58182dffc703209645811 100644
|
| --- a/src/heap/mark-compact.cc
|
| +++ b/src/heap/mark-compact.cc
|
| @@ -826,7 +826,7 @@ void MarkCompactCollector::Prepare() {
|
| space = spaces.next()) {
|
| space->PrepareForMarkCompact();
|
| }
|
| - heap()->account_external_memory_concurrently_freed();
|
| + heap()->array_buffer_tracker()->AccountForConcurrentlyFreedMemory();
|
|
|
| #ifdef VERIFY_HEAP
|
| if (!was_marked_incrementally_ && FLAG_verify_heap) {
|
| @@ -3125,7 +3125,8 @@ bool MarkCompactCollector::Evacuator::EvacuatePage(Page* page) {
|
| case kObjectsNewToOld:
|
| success = collector_->VisitLiveObjects(page, &new_space_visitor_,
|
| kClearMarkbits);
|
| - ArrayBufferTracker::ProcessBuffers(
|
| +
|
| + heap->array_buffer_tracker()->ProcessBuffers(
|
| page, ArrayBufferTracker::kUpdateForwardedRemoveOthers);
|
| DCHECK(success);
|
| break;
|
| @@ -3152,14 +3153,14 @@ bool MarkCompactCollector::Evacuator::EvacuatePage(Page* page) {
|
| EvacuateRecordOnlyVisitor record_visitor(collector_->heap());
|
| success =
|
| collector_->VisitLiveObjects(page, &record_visitor, kKeepMarking);
|
| - ArrayBufferTracker::ProcessBuffers(
|
| + heap->array_buffer_tracker()->ProcessBuffers(
|
| page, ArrayBufferTracker::kUpdateForwardedKeepOthers);
|
| DCHECK(success);
|
| // We need to return failure here to indicate that we want this page
|
| // added to the sweeper.
|
| success = false;
|
| } else {
|
| - ArrayBufferTracker::ProcessBuffers(
|
| + heap->array_buffer_tracker()->ProcessBuffers(
|
| page, ArrayBufferTracker::kUpdateForwardedRemoveOthers);
|
| }
|
| break;
|
| @@ -3363,7 +3364,7 @@ int MarkCompactCollector::Sweeper::RawSweep(
|
|
|
| // Before we sweep objects on the page, we free dead array buffers which
|
| // requires valid mark bits.
|
| - ArrayBufferTracker::FreeDead(p);
|
| + p->heap()->array_buffer_tracker()->FreeDead(p);
|
|
|
| Address free_start = p->area_start();
|
| DCHECK(reinterpret_cast<intptr_t>(free_start) % (32 * kPointerSize) == 0);
|
| @@ -3947,7 +3948,7 @@ void MarkCompactCollector::StartSweepSpace(PagedSpace* space) {
|
| PrintIsolate(isolate(), "sweeping: released page: %p",
|
| static_cast<void*>(p));
|
| }
|
| - ArrayBufferTracker::FreeAll(p);
|
| + heap()->array_buffer_tracker()->FreeAll(p);
|
| space->ReleasePage(p);
|
| continue;
|
| }
|
|
|