Changeset 153216 in webkit for trunk/Source/JavaScriptCore/interpreter/CallFrame.h

Timestamp:

Jul 24, 2013, 9:02:20 PM (12 years ago)

Author:

[email protected]

Message:

fourthTier: Recursive deadlock in DFG::ByteCodeParser
​https://bugs.webkit.org/show_bug.cgi?id=117376

Source/JavaScriptCore:

Reviewed by Mark Hahnenberg.

Leave the lock early to prevent a deadlock beneath get().

• dfg/DFGByteCodeParser.cpp:

(JSC::DFG::ByteCodeParser::parseBlock):

Source/WTF:

Reviewed by Mark Hahnenberg.

I've often wanted to leave a lock early. Now I have that power!

• wtf/Locker.h:

(WTF::Locker::Locker):
(WTF::Locker::~Locker):
(Locker):
(WTF::Locker::unlockEarly):
(WTF::Locker::lock):

File:

• trunk/Source/JavaScriptCore/interpreter/CallFrame.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/interpreter/CallFrame.h

@@ -163 +163 @@
         void setLocationAsBytecodeOffset(unsigned);
 
+#if ENABLE(DFG_JIT)
         unsigned bytecodeOffsetFromCodeOriginIndex();
+#endif
 
         Register* frameExtent()
@@ -283 +285 @@
         CallFrame* trueCallerFrame();
 #else
-        CallFrame* trueCallFrame(AbstractPC) { return this; }
+        CallFrame* trueCallFrame() { return this; }
         CallFrame* trueCallerFrame() { return callerFrame()->removeHostCallFrameFlag(); }
 #endif