Changeset 153357 in webkit for trunk/Source/JavaScriptCore/runtime/VM.h

Timestamp:

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

Author:

[email protected]

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):

File:

• trunk/Source/JavaScriptCore/runtime/VM.h (modified) (1 diff)

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(); }