<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[153357] trunk/Source/JavaScriptCore</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/153357">153357</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2013-07-25 17:13:13 -0700 (Thu, 25 Jul 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>ASSERT(m_vm-&gt;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):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapCopiedSpacecpp">trunk/Source/JavaScriptCore/heap/CopiedSpace.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapHeapcpp">trunk/Source/JavaScriptCore/heap/Heap.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapMarkedAllocatorcpp">trunk/Source/JavaScriptCore/heap/MarkedAllocator.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSGlobalObjectcpp">trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeVMh">trunk/Source/JavaScriptCore/runtime/VM.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (153356 => 153357)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog        2013-07-25 23:57:40 UTC (rev 153356)
+++ trunk/Source/JavaScriptCore/ChangeLog        2013-07-26 00:13:13 UTC (rev 153357)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2013-07-25  Anders Carlsson  &lt;andersca@apple.com&gt;
+
+        ASSERT(m_vm-&gt;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):
+
</ins><span class="cx"> 2013-07-25  Zan Dobersek  &lt;zdobersek@igalia.com&gt;
</span><span class="cx"> 
</span><span class="cx">         REGRESSION(FTL): Most layout tests crashes
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapCopiedSpacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/CopiedSpace.cpp (153356 => 153357)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/CopiedSpace.cpp        2013-07-25 23:57:40 UTC (rev 153356)
+++ trunk/Source/JavaScriptCore/heap/CopiedSpace.cpp        2013-07-26 00:13:13 UTC (rev 153357)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx">     if (isOversize(bytes))
</span><span class="cx">         return tryAllocateOversize(bytes, outPtr);
</span><span class="cx">     
</span><del>-    ASSERT(m_heap-&gt;vm()-&gt;apiLock().currentThreadIsHoldingLock());
</del><ins>+    ASSERT(m_heap-&gt;vm()-&gt;currentThreadIsHoldingAPILock());
</ins><span class="cx">     m_heap-&gt;didAllocate(m_allocator.currentCapacity());
</span><span class="cx"> 
</span><span class="cx">     allocateBlock();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapHeapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/Heap.cpp (153356 => 153357)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/Heap.cpp        2013-07-25 23:57:40 UTC (rev 153356)
+++ trunk/Source/JavaScriptCore/heap/Heap.cpp        2013-07-26 00:13:13 UTC (rev 153357)
</span><span class="lines">@@ -167,7 +167,7 @@
</span><span class="cx"> 
</span><span class="cx"> static inline bool isValidSharedInstanceThreadState(VM* vm)
</span><span class="cx"> {
</span><del>-    return vm-&gt;apiLock().currentThreadIsHoldingLock();
</del><ins>+    return vm-&gt;currentThreadIsHoldingAPILock();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> static inline bool isValidThreadState(VM* vm)
</span><span class="lines">@@ -334,7 +334,7 @@
</span><span class="cx"> void Heap::protect(JSValue k)
</span><span class="cx"> {
</span><span class="cx">     ASSERT(k);
</span><del>-    ASSERT(m_vm-&gt;apiLock().currentThreadIsHoldingLock());
</del><ins>+    ASSERT(m_vm-&gt;currentThreadIsHoldingAPILock());
</ins><span class="cx"> 
</span><span class="cx">     if (!k.isCell())
</span><span class="cx">         return;
</span><span class="lines">@@ -345,7 +345,7 @@
</span><span class="cx"> bool Heap::unprotect(JSValue k)
</span><span class="cx"> {
</span><span class="cx">     ASSERT(k);
</span><del>-    ASSERT(m_vm-&gt;apiLock().currentThreadIsHoldingLock());
</del><ins>+    ASSERT(m_vm-&gt;currentThreadIsHoldingAPILock());
</ins><span class="cx"> 
</span><span class="cx">     if (!k.isCell())
</span><span class="cx">         return false;
</span><span class="lines">@@ -711,7 +711,7 @@
</span><span class="cx">     
</span><span class="cx">     RELEASE_ASSERT(!m_deferralDepth);
</span><span class="cx">     GCPHASE(Collect);
</span><del>-    ASSERT(vm()-&gt;apiLock().currentThreadIsHoldingLock());
</del><ins>+    ASSERT(vm()-&gt;currentThreadIsHoldingAPILock());
</ins><span class="cx">     RELEASE_ASSERT(vm()-&gt;identifierTable == wtfThreadData().currentIdentifierTable());
</span><span class="cx">     ASSERT(m_isSafeToCollect);
</span><span class="cx">     JAVASCRIPTCORE_GC_BEGIN();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapMarkedAllocatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/MarkedAllocator.cpp (153356 => 153357)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/MarkedAllocator.cpp        2013-07-25 23:57:40 UTC (rev 153356)
+++ trunk/Source/JavaScriptCore/heap/MarkedAllocator.cpp        2013-07-26 00:13:13 UTC (rev 153357)
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx">     
</span><span class="cx"> void* MarkedAllocator::allocateSlowCase(size_t bytes)
</span><span class="cx"> {
</span><del>-    ASSERT(m_heap-&gt;vm()-&gt;apiLock().currentThreadIsHoldingLock());
</del><ins>+    ASSERT(m_heap-&gt;vm()-&gt;currentThreadIsHoldingAPILock());
</ins><span class="cx"> #if COLLECT_ON_EVERY_ALLOCATION
</span><span class="cx">     m_heap-&gt;collectAllGarbage();
</span><span class="cx">     ASSERT(m_heap-&gt;m_operationInProgress == NoOperation);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSGlobalObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp (153356 => 153357)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp        2013-07-25 23:57:40 UTC (rev 153356)
+++ trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp        2013-07-26 00:13:13 UTC (rev 153357)
</span><span class="lines">@@ -137,7 +137,7 @@
</span><span class="cx"> 
</span><span class="cx"> void JSGlobalObject::init(JSObject* thisValue)
</span><span class="cx"> {
</span><del>-    ASSERT(vm().apiLock().currentThreadIsHoldingLock());
</del><ins>+    ASSERT(vm().currentThreadIsHoldingAPILock());
</ins><span class="cx"> 
</span><span class="cx">     setGlobalThis(vm(), thisValue);
</span><span class="cx">     JSGlobalObject::globalExec()-&gt;init(0, 0, this, CallFrame::noCaller(), 0, 0);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeVMh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/VM.h (153356 => 153357)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/VM.h        2013-07-25 23:57:40 UTC (rev 153356)
+++ trunk/Source/JavaScriptCore/runtime/VM.h        2013-07-26 00:13:13 UTC (rev 153357)
</span><span class="lines">@@ -468,6 +468,11 @@
</span><span class="cx">             }
</span><span class="cx">         }
</span><span class="cx"> 
</span><ins>+        bool currentThreadIsHoldingAPILock() const
+        {
+            return m_apiLock-&gt;currentThreadIsHoldingLock() || exclusiveThread == currentThread();
+        }
+
</ins><span class="cx">         JSLock&amp; apiLock() { return *m_apiLock; }
</span><span class="cx">         CodeCache* codeCache() { return m_codeCache.get(); }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>