Revert of [heap] Fix Sweeper::IsSweepingCompleted

src/heap/mark-compact.cc

 // Copyright 2012 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/mark-compact.h"
 
 #include "src/base/atomicops.h"
 #include "src/base/bits.h"
 #include "src/base/sys-info.h"
 #include "src/code-stubs.h"
@@ skipping 565 matching lines @@
   heap()->map_space()->RefillFreeList();
 
 #ifdef VERIFY_HEAP
   if (FLAG_verify_heap && !evacuation()) {
     VerifyEvacuation(heap_);
   }
 #endif
 }
 
 bool MarkCompactCollector::Sweeper::IsSweepingCompleted() {
-  while ((num_sweeping_tasks_ > 0) &&
-         pending_sweeper_tasks_semaphore_.WaitFor(
-             base::TimeDelta::FromSeconds(0))) {
-    num_sweeping_tasks_--;
+  if (!pending_sweeper_tasks_semaphore_.WaitFor(
+          base::TimeDelta::FromSeconds(0))) {
+    return false;
   }
-  return num_sweeping_tasks_ == 0;
+  pending_sweeper_tasks_semaphore_.Signal();
+  return true;
 }
 
 void Marking::TransferMark(Heap* heap, Address old_start, Address new_start) {
   // This is only used when resizing an object.
   DCHECK(MemoryChunk::FromAddress(old_start) ==
          MemoryChunk::FromAddress(new_start));
 
   if (!heap->incremental_marking()->IsMarking() ||
       Page::FromAddress(old_start)->IsFlagSet(Page::BLACK_PAGE))
     return;
@@ skipping 3391 matching lines @@
     MarkBit mark_bit = Marking::MarkBitFrom(host);
     if (Marking::IsBlack(mark_bit)) {
       RelocInfo rinfo(isolate(), pc, RelocInfo::CODE_TARGET, 0, host);
       RecordRelocSlot(host, &rinfo, target);
     }
   }
 }
 
 }  // namespace internal
 }  // namespace v8