Remove SafePointAwareMutexLocker

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

Index: third_party/WebKit/Source/platform/heap/Heap.cpp
diff --git a/third_party/WebKit/Source/platform/heap/Heap.cpp b/third_party/WebKit/Source/platform/heap/Heap.cpp
index eabefe4a5a131c3d5c91ba97cb228af0956170ab..a63b2309ae96701ad91ac7b1abeb87b93e7ac2ab 100644
--- a/third_party/WebKit/Source/platform/heap/Heap.cpp
+++ b/third_party/WebKit/Source/platform/heap/Heap.cpp
@@ -191,8 +191,7 @@ void ThreadHeap::detach(ThreadState* thread) {
     // 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);
@@ -577,9 +576,8 @@ 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) {