<!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>[164371] trunk</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/164371">164371</a></dd>
<dt>Author</dt> <dd>mhahnenberg@apple.com</dd>
<dt>Date</dt> <dd>2014-02-19 10:41:27 -0800 (Wed, 19 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Dedicated worker crash caused by global DFG worklists + GC
https://bugs.webkit.org/show_bug.cgi?id=128537
Reviewed by Filip Pizlo.
Source/JavaScriptCore:
The process-global DFG worklists were causing objects to participate in the garbage collections of VMs
other than the one they were allocated in. This started manifesting in the worker tests because they're
one of the few WebKit tests that do multithreaded JS.
The fix is to filter out Plans from other VMs during collection.
* dfg/DFGSafepoint.cpp:
(JSC::DFG::Safepoint::vm):
* dfg/DFGSafepoint.h:
* dfg/DFGWorklist.cpp:
(JSC::DFG::Worklist::isActiveForVM):
(JSC::DFG::Worklist::suspendAllThreads):
(JSC::DFG::Worklist::resumeAllThreads):
(JSC::DFG::Worklist::visitChildren):
* dfg/DFGWorklist.h:
* heap/Heap.cpp:
(JSC::Heap::deleteAllCompiledCode):
* heap/SlotVisitorInlines.h:
(JSC::SlotVisitor::copyLater):
LayoutTests:
Reenable a previously skipped test.
* TestExpectations:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsTestExpectations">trunk/LayoutTests/TestExpectations</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSafepointcpp">trunk/Source/JavaScriptCore/dfg/DFGSafepoint.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSafepointh">trunk/Source/JavaScriptCore/dfg/DFGSafepoint.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGWorklistcpp">trunk/Source/JavaScriptCore/dfg/DFGWorklist.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGWorklisth">trunk/Source/JavaScriptCore/dfg/DFGWorklist.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapHeapcpp">trunk/Source/JavaScriptCore/heap/Heap.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapSlotVisitorInlinesh">trunk/Source/JavaScriptCore/heap/SlotVisitorInlines.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (164370 => 164371)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-02-19 18:11:28 UTC (rev 164370)
+++ trunk/LayoutTests/ChangeLog 2014-02-19 18:41:27 UTC (rev 164371)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-02-19 Mark Hahnenberg <mhahnenberg@apple.com>
+
+ Dedicated worker crash caused by global DFG worklists + GC
+ https://bugs.webkit.org/show_bug.cgi?id=128537
+
+ Reviewed by Filip Pizlo.
+
+ Reenable a previously skipped test.
+
+ * TestExpectations:
+
</ins><span class="cx"> 2014-02-19 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Windows gardening. Mark more flakes.
</span></span></pre></div>
<a id="trunkLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/TestExpectations (164370 => 164371)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/TestExpectations 2014-02-19 18:11:28 UTC (rev 164370)
+++ trunk/LayoutTests/TestExpectations 2014-02-19 18:41:27 UTC (rev 164371)
</span><span class="lines">@@ -99,7 +99,6 @@
</span><span class="cx">
</span><span class="cx"> webkit.org/b/127697 fast/writing-mode/ruby-text-logical-left.html [ Skip ]
</span><span class="cx">
</span><del>-webkit.org/b/128537 fast/workers/dedicated-worker-lifecycle.html [ Skip ]
</del><span class="cx"> webkit.org/b/128745 [ Debug ] fast/workers/use-machine-stack.html [ Pass Crash ]
</span><span class="cx">
</span><span class="cx"> webkit.org/b/83618 fast/dom/inline-event-attributes-release.html [ Failure ]
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (164370 => 164371)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-02-19 18:11:28 UTC (rev 164370)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-02-19 18:41:27 UTC (rev 164371)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2014-02-19 Mark Hahnenberg <mhahnenberg@apple.com>
+
+ Dedicated worker crash caused by global DFG worklists + GC
+ https://bugs.webkit.org/show_bug.cgi?id=128537
+
+ Reviewed by Filip Pizlo.
+
+ The process-global DFG worklists were causing objects to participate in the garbage collections of VMs
+ other than the one they were allocated in. This started manifesting in the worker tests because they're
+ one of the few WebKit tests that do multithreaded JS.
+
+ The fix is to filter out Plans from other VMs during collection.
+
+ * dfg/DFGSafepoint.cpp:
+ (JSC::DFG::Safepoint::vm):
+ * dfg/DFGSafepoint.h:
+ * dfg/DFGWorklist.cpp:
+ (JSC::DFG::Worklist::isActiveForVM):
+ (JSC::DFG::Worklist::suspendAllThreads):
+ (JSC::DFG::Worklist::resumeAllThreads):
+ (JSC::DFG::Worklist::visitChildren):
+ * dfg/DFGWorklist.h:
+ * heap/Heap.cpp:
+ (JSC::Heap::deleteAllCompiledCode):
+ * heap/SlotVisitorInlines.h:
+ (JSC::SlotVisitor::copyLater):
+
</ins><span class="cx"> 2014-02-19 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Add FeatureDefines for image controls
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSafepointcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSafepoint.cpp (164370 => 164371)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSafepoint.cpp 2014-02-19 18:11:28 UTC (rev 164370)
+++ trunk/Source/JavaScriptCore/dfg/DFGSafepoint.cpp 2014-02-19 18:41:27 UTC (rev 164371)
</span><span class="lines">@@ -75,6 +75,11 @@
</span><span class="cx"> m_scannables[i]->visitChildren(visitor);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+VM& Safepoint::vm() const
+{
+ return m_plan.vm;
+}
+
</ins><span class="cx"> } } // namespace JSC::DFG
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(DFG_JIT)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSafepointh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSafepoint.h (164370 => 164371)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSafepoint.h 2014-02-19 18:11:28 UTC (rev 164370)
+++ trunk/Source/JavaScriptCore/dfg/DFGSafepoint.h 2014-02-19 18:41:27 UTC (rev 164371)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><span class="cx"> class SlotVisitor;
</span><ins>+class VM;
</ins><span class="cx">
</span><span class="cx"> namespace DFG {
</span><span class="cx">
</span><span class="lines">@@ -50,6 +51,8 @@
</span><span class="cx">
</span><span class="cx"> void visitChildren(SlotVisitor&);
</span><span class="cx">
</span><ins>+ VM& vm() const;
+
</ins><span class="cx"> private:
</span><span class="cx"> Plan& m_plan;
</span><span class="cx"> Vector<Scannable*> m_scannables;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGWorklistcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGWorklist.cpp (164370 => 164371)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGWorklist.cpp 2014-02-19 18:11:28 UTC (rev 164370)
+++ trunk/Source/JavaScriptCore/dfg/DFGWorklist.cpp 2014-02-19 18:41:27 UTC (rev 164371)
</span><span class="lines">@@ -72,6 +72,16 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool Worklist::isActiveForVM(VM& vm) const
+{
+ PlanMap::const_iterator end = m_plans.end();
+ for (PlanMap::const_iterator iter = m_plans.begin(); iter != end; ++iter) {
+ if (&iter->value->vm == &vm)
+ return true;
+ }
+ return false;
+}
+
</ins><span class="cx"> void Worklist::enqueue(PassRefPtr<Plan> passedPlan)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<Plan> plan = passedPlan;
</span><span class="lines">@@ -195,6 +205,7 @@
</span><span class="cx">
</span><span class="cx"> void Worklist::suspendAllThreads()
</span><span class="cx"> {
</span><ins>+ m_suspensionLock.lock();
</ins><span class="cx"> for (unsigned i = m_threads.size(); i--;)
</span><span class="cx"> m_threads[i]->m_rightToRun.lock();
</span><span class="cx"> }
</span><span class="lines">@@ -203,18 +214,24 @@
</span><span class="cx"> {
</span><span class="cx"> for (unsigned i = m_threads.size(); i--;)
</span><span class="cx"> m_threads[i]->m_rightToRun.unlock();
</span><ins>+ m_suspensionLock.unlock();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Worklist::visitChildren(SlotVisitor& visitor, CodeBlockSet& codeBlocks)
</span><span class="cx"> {
</span><ins>+ VM* vm = visitor.heap()->vm();
</ins><span class="cx"> for (PlanMap::iterator iter = m_plans.begin(); iter != m_plans.end(); ++iter) {
</span><ins>+ Plan* plan = iter->value.get();
+ if (&plan->vm != vm)
+ continue;
</ins><span class="cx"> iter->key.visitChildren(codeBlocks);
</span><span class="cx"> iter->value->visitChildren(visitor, codeBlocks);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> for (unsigned i = m_threads.size(); i--;) {
</span><span class="cx"> ThreadData* data = m_threads[i].get();
</span><del>- if (Safepoint* safepoint = data->m_safepoint)
</del><ins>+ Safepoint* safepoint = data->m_safepoint;
+ if (safepoint && &safepoint->vm() == vm)
</ins><span class="cx"> safepoint->visitChildren(visitor);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGWorklisth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGWorklist.h (164370 => 164371)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGWorklist.h 2014-02-19 18:11:28 UTC (rev 164370)
+++ trunk/Source/JavaScriptCore/dfg/DFGWorklist.h 2014-02-19 18:41:27 UTC (rev 164371)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> void suspendAllThreads();
</span><span class="cx"> void resumeAllThreads();
</span><span class="cx">
</span><del>- bool isActive() const { return !!m_plans.size(); }
</del><ins>+ bool isActiveForVM(VM&) const;
</ins><span class="cx">
</span><span class="cx"> void visitChildren(SlotVisitor&, CodeBlockSet&); // Only called on the main thread after suspending all threads.
</span><span class="cx">
</span><span class="lines">@@ -101,6 +101,8 @@
</span><span class="cx"> // Used to quickly find which plans have been compiled and are ready to
</span><span class="cx"> // be completed.
</span><span class="cx"> Vector<RefPtr<Plan>, 16> m_readyPlans;
</span><ins>+
+ Mutex m_suspensionLock;
</ins><span class="cx">
</span><span class="cx"> mutable Mutex m_lock;
</span><span class="cx"> ThreadCondition m_planEnqueued;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapHeapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/Heap.cpp (164370 => 164371)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/Heap.cpp 2014-02-19 18:11:28 UTC (rev 164370)
+++ trunk/Source/JavaScriptCore/heap/Heap.cpp 2014-02-19 18:41:27 UTC (rev 164371)
</span><span class="lines">@@ -743,7 +743,7 @@
</span><span class="cx"> #if ENABLE(DFG_JIT)
</span><span class="cx"> for (unsigned i = DFG::numberOfWorklists(); i--;) {
</span><span class="cx"> if (DFG::Worklist* worklist = DFG::worklistForIndexOrNull(i)) {
</span><del>- if (worklist->isActive())
</del><ins>+ if (worklist->isActiveForVM(*vm()))
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapSlotVisitorInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/SlotVisitorInlines.h (164370 => 164371)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/SlotVisitorInlines.h 2014-02-19 18:11:28 UTC (rev 164370)
+++ trunk/Source/JavaScriptCore/heap/SlotVisitorInlines.h 2014-02-19 18:41:27 UTC (rev 164371)
</span><span class="lines">@@ -242,6 +242,8 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ ASSERT(heap()->m_storageSpace.contains(block));
+
</ins><span class="cx"> SpinLockHolder locker(&block->workListLock());
</span><span class="cx"> if (heap()->operationInProgress() == FullCollection || block->shouldReportLiveBytes(locker, owner)) {
</span><span class="cx"> m_bytesCopied += bytes;
</span></span></pre>
</div>
</div>
</body>
</html>