| Index: src/heap.cc
|
| diff --git a/src/heap.cc b/src/heap.cc
|
| index d172ceb54d0d588fba6294024529c1d9174bae7a..5c7cbcacd3d4c3e028b347ae9cd42e1d79b825b2 100644
|
| --- a/src/heap.cc
|
| +++ b/src/heap.cc
|
| @@ -3312,9 +3312,8 @@ bool Heap::CanMoveObjectStart(HeapObject* object) {
|
| // pages is set after sweeping all pages.
|
| return (!is_in_old_pointer_space && !is_in_old_data_space) ||
|
| page->WasSwept() ||
|
| - (mark_compact_collector()->AreSweeperThreadsActivated() &&
|
| - page->parallel_sweeping() <=
|
| - MemoryChunk::PARALLEL_SWEEPING_FINALIZE);
|
| + (page->parallel_sweeping() <=
|
| + MemoryChunk::PARALLEL_SWEEPING_FINALIZE);
|
| }
|
|
|
|
|
| @@ -4339,8 +4338,8 @@ bool Heap::IdleNotification(int hint) {
|
| // If the IdleNotifcation is called with a large hint we will wait for
|
| // the sweepter threads here.
|
| if (hint >= kMinHintForFullGC &&
|
| - mark_compact_collector()->IsConcurrentSweepingInProgress()) {
|
| - mark_compact_collector()->WaitUntilSweepingCompleted();
|
| + mark_compact_collector()->sweeping_in_progress()) {
|
| + mark_compact_collector()->EnsureSweepingCompleted();
|
| }
|
|
|
| return false;
|
|
|