Remove SafePointAwareMutexLocker

third_party/WebKit/Source/platform/heap/Heap.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 173 matching lines @@
 void ThreadHeap::detach(ThreadState* thread) {
   ASSERT(ThreadState::current() == thread);
   bool isLastThread = false;
   {
     // Grab the threadAttachMutex to ensure only one thread can shutdown at
     // a time and that no other thread can do a global GC. It also allows
     // safe iteration of the m_threads set which happens as part of
     // thread local GC asserts. We enter a safepoint while waiting for the
     // lock to avoid a dead-lock where another thread has already requested
     // GC.
-    SafePointAwareMutexLocker locker(m_threadAttachMutex,
-                                     BlinkGC::NoHeapPointersOnStack);
+    MutexLocker locker(m_threadAttachMutex);
     thread->runTerminationGC();
     ASSERT(m_threads.contains(thread));
     m_threads.remove(thread);
     isLastThread = m_threads.isEmpty();
   }
   if (thread->isMainThread())
     DCHECK_EQ(heapStats().allocatedSpace(), 0u);
   if (isLastThread)
     delete this;
 }
@@ skipping 364 matching lines @@
   ASSERT(ThreadState::current()->isInGC());
   TRACE_EVENT0("blink_gc", "ThreadHeap::visitStackRoots");
   for (ThreadState* state : m_threads)
     state->visitStack(visitor);
 }
 
 void ThreadHeap::enterSafePoint(ThreadState* threadState) {
   m_safePointBarrier->enterSafePoint(threadState);
 }
 
-void ThreadHeap::leaveSafePoint(ThreadState* threadState,
-                                SafePointAwareMutexLocker* locker) {
-  m_safePointBarrier->leaveSafePoint(threadState, locker);
+void ThreadHeap::leaveSafePoint() {

[sof, 2017/02/14 08:31:38]

we can just remove this altogether.

[haraken, 2017/02/14 08:50:49]

Yeah, I want to do that in a follow-up where I'll move pushAllRegisters out of
SafePoint.cpp, which enables to remove enterSafePoint and leaveSafePoint at the
same time.

+  m_safePointBarrier->leaveSafePoint();
 }
 
 BasePage* ThreadHeap::lookupPageForAddress(Address address) {
   ASSERT(ThreadState::current()->isInGC());
   if (PageMemoryRegion* region = m_regionTree->lookup(address)) {
     return region->pageFromAddress(address);
   }
   return nullptr;
 }
 
 void ThreadHeap::resetHeapCounters() {
   ASSERT(ThreadState::current()->isInGC());
 
   ThreadHeap::reportMemoryUsageForTracing();
 
   ProcessHeap::decreaseTotalAllocatedObjectSize(m_stats.allocatedObjectSize());
   ProcessHeap::decreaseTotalMarkedObjectSize(m_stats.markedObjectSize());
 
   m_stats.reset();
   for (ThreadState* state : m_threads)
     state->resetHeapCounters();
 }
 
 ThreadHeap* ThreadHeap::s_mainThreadHeap = nullptr;
 
 }  // namespace blink