From 98ff39cb35ef2bd32bb1af9565628a4a4b0979b2 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Tue, 27 Oct 2015 09:07:56 +0100 Subject: BASELINE: Update Chromium to 47.0.2526.34 and Ninja to 1.6.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ie8863b493c7ff19eb46478935dfe7602679b227e Reviewed-by: Michael Brüning --- chromium/v8/src/heap/mark-compact.cc | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'chromium/v8/src/heap') diff --git a/chromium/v8/src/heap/mark-compact.cc b/chromium/v8/src/heap/mark-compact.cc index bf2849fb7f7..a23e24d2553 100644 --- a/chromium/v8/src/heap/mark-compact.cc +++ b/chromium/v8/src/heap/mark-compact.cc @@ -3784,6 +3784,14 @@ void MarkCompactCollector::EvacuateNewSpaceAndCandidates() { SkipList* list = p->skip_list(); if (list != NULL) list->Clear(); } + + if (p->IsEvacuationCandidate() && + p->IsFlagSet(Page::RESCAN_ON_EVACUATION)) { + // Case where we've aborted compacting a page. Clear the flag here to + // avoid release the page later on. + p->ClearEvacuationCandidate(); + } + if (p->IsFlagSet(Page::RESCAN_ON_EVACUATION)) { if (FLAG_gc_verbose) { PrintF("Sweeping 0x%" V8PRIxPTR " during evacuation.\n", @@ -3814,12 +3822,6 @@ void MarkCompactCollector::EvacuateNewSpaceAndCandidates() { break; } } - if (p->IsEvacuationCandidate() && - p->IsFlagSet(Page::RESCAN_ON_EVACUATION)) { - // Case where we've aborted compacting a page. Clear the flag here to - // avoid release the page later on. - p->ClearEvacuationCandidate(); - } } } -- cgit v1.2.1