Title: [151352] branches/dfgFourthTier/Source
Revision
151352
Author
[email protected]
Date
2013-06-08 22:38:48 -0700 (Sat, 08 Jun 2013)

Log Message

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

Source/_javascript_Core: 

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

Modified Paths

Diff

Modified: branches/dfgFourthTier/Source/_javascript_Core/ChangeLog (151351 => 151352)


--- branches/dfgFourthTier/Source/_javascript_Core/ChangeLog	2013-06-09 02:43:55 UTC (rev 151351)
+++ branches/dfgFourthTier/Source/_javascript_Core/ChangeLog	2013-06-09 05:38:48 UTC (rev 151352)
@@ -1,3 +1,15 @@
+2013-06-08  Filip Pizlo  <[email protected]>
+
+        fourthTier: Recursive deadlock in DFG::ByteCodeParser
+        https://bugs.webkit.org/show_bug.cgi?id=117376
+
+        Reviewed by Mark Hahnenberg.
+        
+        Leave the lock early to prevent a deadlock beneath get().
+
+        * dfg/DFGByteCodeParser.cpp:
+        (JSC::DFG::ByteCodeParser::parseBlock):
+
 2013-06-08  Mark Lam  <[email protected]>
 
         Removed bogus assertion in CallFrame::setLocationAsBytecodeOffset().

Modified: branches/dfgFourthTier/Source/_javascript_Core/dfg/DFGByteCodeParser.cpp (151351 => 151352)


--- branches/dfgFourthTier/Source/_javascript_Core/dfg/DFGByteCodeParser.cpp	2013-06-09 02:43:55 UTC (rev 151351)
+++ branches/dfgFourthTier/Source/_javascript_Core/dfg/DFGByteCodeParser.cpp	2013-06-09 05:38:48 UTC (rev 151352)
@@ -3115,6 +3115,7 @@
                 ConcurrentJITLocker locker(m_inlineStackTop->m_profiledBlock->m_lock);
                 
                 if (!putToBase->m_ready) {
+                    locker.unlockEarly();
                     addToGraph(ForceOSRExit);
                     addToGraph(Phantom, get(base));
                     addToGraph(Phantom, get(value));

Modified: branches/dfgFourthTier/Source/WTF/ChangeLog (151351 => 151352)


--- branches/dfgFourthTier/Source/WTF/ChangeLog	2013-06-09 02:43:55 UTC (rev 151351)
+++ branches/dfgFourthTier/Source/WTF/ChangeLog	2013-06-09 05:38:48 UTC (rev 151352)
@@ -1,3 +1,19 @@
+2013-06-08  Filip Pizlo  <[email protected]>
+
+        fourthTier: Recursive deadlock in DFG::ByteCodeParser
+        https://bugs.webkit.org/show_bug.cgi?id=117376
+
+        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):
+
 2013-06-04  Mark Lam  <[email protected]>
 
         Merged from http://svn.webkit.org/repository/webkit/trunk

Modified: branches/dfgFourthTier/Source/WTF/wtf/Locker.h (151351 => 151352)


--- branches/dfgFourthTier/Source/WTF/wtf/Locker.h	2013-06-09 02:43:55 UTC (rev 151351)
+++ branches/dfgFourthTier/Source/WTF/wtf/Locker.h	2013-06-09 05:38:48 UTC (rev 151352)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2008, 2013 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -35,10 +35,27 @@
 template <typename T> class Locker {
     WTF_MAKE_NONCOPYABLE(Locker);
 public:
-    Locker(T& lockable) : m_lockable(lockable) { m_lockable.lock(); }
-    ~Locker() { m_lockable.unlock(); }
+    explicit Locker(T& lockable) : m_lockable(&lockable) { lock(); }
+    explicit Locker(T* lockable) : m_lockable(lockable) { lock(); }
+    ~Locker()
+    {
+        if (m_lockable)
+            m_lockable->unlock();
+    }
+    
+    void unlockEarly()
+    {
+        m_lockable->unlock();
+        m_lockable = 0;
+    }
 private:
-    T& m_lockable;
+    void lock()
+    {
+        if (m_lockable)
+            m_lockable->lock();
+    }
+    
+    T* m_lockable;
 };
 
 }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to