Changeset 153357 in webkit

Timestamp:

Jul 25, 2013 5:13:13 PM (11 years ago)

Author:

andersca@apple.com

Message:

ASSERT(m_vm->apiLock().currentThreadIsHoldingLock()); fails for Safari on current ToT
​https://bugs.webkit.org/show_bug.cgi?id=119108

Reviewed by Mark Hahnenberg.

Add a currentThreadIsHoldingAPILock() function to VM that checks if the current thread is the exclusive API thread.

• heap/CopiedSpace.cpp:

(JSC::CopiedSpace::tryAllocateSlowCase):

• heap/Heap.cpp:

(JSC::Heap::protect):
(JSC::Heap::unprotect):
(JSC::Heap::collect):

• heap/MarkedAllocator.cpp:

(JSC::MarkedAllocator::allocateSlowCase):

• runtime/JSGlobalObject.cpp:

(JSC::JSGlobalObject::init):

• runtime/VM.h:

(JSC::VM::currentThreadIsHoldingAPILock):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• heap/CopiedSpace.cpp (modified) (1 diff)
• heap/Heap.cpp (modified) (4 diffs)
• heap/MarkedAllocator.cpp (modified) (1 diff)
• runtime/JSGlobalObject.cpp (modified) (1 diff)
• runtime/VM.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2013-07-25  Anders Carlsson  <andersca@apple.com>
+
+        ASSERT(m_vm->apiLock().currentThreadIsHoldingLock()); fails for Safari on current ToT
+        https://bugs.webkit.org/show_bug.cgi?id=119108
+
+        Reviewed by Mark Hahnenberg.
+
+        Add a currentThreadIsHoldingAPILock() function to VM that checks if the current thread is the exclusive API thread.
+
+        * heap/CopiedSpace.cpp:
+        (JSC::CopiedSpace::tryAllocateSlowCase):
+        * heap/Heap.cpp:
+        (JSC::Heap::protect):
+        (JSC::Heap::unprotect):
+        (JSC::Heap::collect):
+        * heap/MarkedAllocator.cpp:
+        (JSC::MarkedAllocator::allocateSlowCase):
+        * runtime/JSGlobalObject.cpp:
+        (JSC::JSGlobalObject::init):
+        * runtime/VM.h:
+        (JSC::VM::currentThreadIsHoldingAPILock):
+
 2013-07-25  Zan Dobersek  <zdobersek@igalia.com>
 

trunk/Source/JavaScriptCore/heap/CopiedSpace.cpp

@@ -70 +70 @@
         return tryAllocateOversize(bytes, outPtr);
     
-    ASSERT(m_heap->vm()->apiLock().currentThreadIsHoldingLock());
+    ASSERT(m_heap->vm()->currentThreadIsHoldingAPILock());
     m_heap->didAllocate(m_allocator.currentCapacity());
 

trunk/Source/JavaScriptCore/heap/Heap.cpp

@@ -168 +168 @@
 static inline bool isValidSharedInstanceThreadState(VM* vm)
 {
-    return vm->apiLock().currentThreadIsHoldingLock();
+    return vm->currentThreadIsHoldingAPILock();
 }
 
@@ -335 +335 @@
 {
     ASSERT(k);
-    ASSERT(m_vm->apiLock().currentThreadIsHoldingLock());
+    ASSERT(m_vm->currentThreadIsHoldingAPILock());
 
     if (!k.isCell())
@@ -346 +346 @@
 {
     ASSERT(k);
-    ASSERT(m_vm->apiLock().currentThreadIsHoldingLock());
+    ASSERT(m_vm->currentThreadIsHoldingAPILock());
 
     if (!k.isCell())
@@ -712 +712 @@
     RELEASE_ASSERT(!m_deferralDepth);
     GCPHASE(Collect);
-    ASSERT(vm()->apiLock().currentThreadIsHoldingLock());
+    ASSERT(vm()->currentThreadIsHoldingAPILock());
     RELEASE_ASSERT(vm()->identifierTable == wtfThreadData().currentIdentifierTable());
     ASSERT(m_isSafeToCollect);

trunk/Source/JavaScriptCore/heap/MarkedAllocator.cpp

@@ -71 +71 @@
 void* MarkedAllocator::allocateSlowCase(size_t bytes)
 {
-    ASSERT(m_heap->vm()->apiLock().currentThreadIsHoldingLock());
+    ASSERT(m_heap->vm()->currentThreadIsHoldingAPILock());
 #if COLLECT_ON_EVERY_ALLOCATION
     m_heap->collectAllGarbage();

trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp

@@ -138 +138 @@
 void JSGlobalObject::init(JSObject* thisValue)
 {
-    ASSERT(vm().apiLock().currentThreadIsHoldingLock());
+    ASSERT(vm().currentThreadIsHoldingAPILock());
 
     setGlobalThis(vm(), thisValue);

trunk/Source/JavaScriptCore/runtime/VM.h

@@ -469 +469 @@
         }
 
+        bool currentThreadIsHoldingAPILock() const
+        {
+            return m_apiLock->currentThreadIsHoldingLock() || exclusiveThread == currentThread();
+        }
+
         JSLock& apiLock() { return *m_apiLock; }
         CodeCache* codeCache() { return m_codeCache.get(); }