<!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>[209813] trunk/Source</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/209813">209813</a></dd>
<dt>Author</dt> <dd>barraclough@apple.com</dd>
<dt>Date</dt> <dd>2016-12-14 10:07:22 -0800 (Wed, 14 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>
Source/JavaScriptCore:
MarkedBlock::marksConveyLivenessDuringMarking should take into account collection scope
https://bugs.webkit.org/show_bug.cgi?id=165741
Unreviewed, re-landing this with fix (revert erroneous change to Options).
* CMakeLists.txt:
* JavaScriptCore.xcodeproj/project.pbxproj:
* heap/CellContainer.cpp: Added.
(JSC::CellContainer::isNewlyAllocated):
* heap/CellContainer.h:
* heap/MarkedAllocator.cpp:
(JSC::MarkedAllocator::addBlock):
(JSC::MarkedAllocator::removeBlock):
(JSC::MarkedAllocator::dumpBits):
* heap/MarkedAllocator.h:
(JSC::MarkedAllocator::forEachBitVector):
(JSC::MarkedAllocator::forEachBitVectorWithName):
* heap/MarkedBlock.cpp:
(JSC::MarkedBlock::tryCreate):
(JSC::MarkedBlock::Handle::~Handle):
(JSC::MarkedBlock::MarkedBlock):
(JSC::MarkedBlock::Handle::specializedSweep):
(JSC::MarkedBlock::Handle::sweepHelperSelectMarksMode):
(JSC::MarkedBlock::Handle::stopAllocating):
(JSC::MarkedBlock::Handle::resumeAllocating):
(JSC::MarkedBlock::aboutToMarkSlow):
(JSC::MarkedBlock::Handle::didConsumeFreeList):
(JSC::MarkedBlock::Handle::dumpState):
* heap/MarkedBlock.h:
(JSC::MarkedBlock::markingVersion):
(JSC::MarkedBlock::isMarkedRaw):
(JSC::MarkedBlock::isMarked):
* heap/MarkedBlockInlines.h:
(JSC::MarkedBlock::marksConveyLivenessDuringMarking):
* heap/SlotVisitor.cpp:
(JSC::SlotVisitor::appendJSCellOrAuxiliary):
* runtime/StructureIDTable.h:
(JSC::StructureIDTable::size):
(JSC::StructureIDTable::get):
Source/WTF:
Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/209795">r209795</a>.
https://bugs.webkit.org/show_bug.cgi?id=165853
rolled out the wrong revision (Requested by pizlo on #webkit).
Reverted changeset:
"MarkedBlock::marksConveyLivenessDuringMarking should take
into account collection scope"
https://bugs.webkit.org/show_bug.cgi?id=165741
http://trac.webkit.org/changeset/209795
Patch by Commit Queue <commit-queue@webkit.org> on 2016-12-14</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (209812 => 209813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-12-14 17:50:20 UTC (rev 209812)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-12-14 18:07:22 UTC (rev 209813)
</span><span class="lines">@@ -1,3 +1,45 @@
</span><ins>+2016-12-14 Gavin Barraclough <barraclough@apple.com>
+
+ MarkedBlock::marksConveyLivenessDuringMarking should take into account collection scope
+ https://bugs.webkit.org/show_bug.cgi?id=165741
+
+ Unreviewed, re-landing this with fix (revert erroneous change to Options).
+
+ * CMakeLists.txt:
+ * JavaScriptCore.xcodeproj/project.pbxproj:
+ * heap/CellContainer.cpp: Added.
+ (JSC::CellContainer::isNewlyAllocated):
+ * heap/CellContainer.h:
+ * heap/MarkedAllocator.cpp:
+ (JSC::MarkedAllocator::addBlock):
+ (JSC::MarkedAllocator::removeBlock):
+ (JSC::MarkedAllocator::dumpBits):
+ * heap/MarkedAllocator.h:
+ (JSC::MarkedAllocator::forEachBitVector):
+ (JSC::MarkedAllocator::forEachBitVectorWithName):
+ * heap/MarkedBlock.cpp:
+ (JSC::MarkedBlock::tryCreate):
+ (JSC::MarkedBlock::Handle::~Handle):
+ (JSC::MarkedBlock::MarkedBlock):
+ (JSC::MarkedBlock::Handle::specializedSweep):
+ (JSC::MarkedBlock::Handle::sweepHelperSelectMarksMode):
+ (JSC::MarkedBlock::Handle::stopAllocating):
+ (JSC::MarkedBlock::Handle::resumeAllocating):
+ (JSC::MarkedBlock::aboutToMarkSlow):
+ (JSC::MarkedBlock::Handle::didConsumeFreeList):
+ (JSC::MarkedBlock::Handle::dumpState):
+ * heap/MarkedBlock.h:
+ (JSC::MarkedBlock::markingVersion):
+ (JSC::MarkedBlock::isMarkedRaw):
+ (JSC::MarkedBlock::isMarked):
+ * heap/MarkedBlockInlines.h:
+ (JSC::MarkedBlock::marksConveyLivenessDuringMarking):
+ * heap/SlotVisitor.cpp:
+ (JSC::SlotVisitor::appendJSCellOrAuxiliary):
+ * runtime/StructureIDTable.h:
+ (JSC::StructureIDTable::size):
+ (JSC::StructureIDTable::get):
+
</ins><span class="cx"> 2016-12-14 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r209766.
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (209812 => 209813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-12-14 17:50:20 UTC (rev 209812)
+++ trunk/Source/WTF/ChangeLog 2016-12-14 18:07:22 UTC (rev 209813)
</span><span class="lines">@@ -27,6 +27,51 @@
</span><span class="cx"> MarkedBlock::marksConveyLivenessDuringMarking should take into account collection scope
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=165741
</span><span class="cx">
</span><ins>+ Unreviewed, re-landing this with fix (revert erroneous change to Options).
+
+ * WTF.xcodeproj/project.pbxproj:
+ * wtf/CMakeLists.txt:
+ * wtf/DataLog.cpp:
+ (WTF::initializeLogFileOnce):
+ (WTF::initializeLogFile):
+ (WTF::dataFile):
+ * wtf/DataLog.h:
+ * wtf/LockedPrintStream.cpp: Added.
+ (WTF::LockedPrintStream::LockedPrintStream):
+ (WTF::LockedPrintStream::~LockedPrintStream):
+ (WTF::LockedPrintStream::vprintf):
+ (WTF::LockedPrintStream::flush):
+ (WTF::LockedPrintStream::begin):
+ (WTF::LockedPrintStream::end):
+ * wtf/LockedPrintStream.h: Added.
+ * wtf/PrintStream.cpp:
+ (WTF::PrintStream::printfVariableFormat):
+ (WTF::PrintStream::begin):
+ (WTF::PrintStream::end):
+ * wtf/PrintStream.h:
+ (WTF::PrintStream::atomically):
+ (WTF::PrintStream::print):
+ (WTF::PrintStream::println):
+ (WTF::PrintStream::printImpl):
+ (WTF::>::unpack):
+ (WTF::FormatImpl::FormatImpl):
+ (WTF::FormatImpl::dump):
+ (WTF::format):
+ (WTF::printInternal):
+ * wtf/RecursiveLockAdapter.h: Added.
+ (WTF::RecursiveLockAdapter::RecursiveLockAdapter):
+ (WTF::RecursiveLockAdapter::lock):
+ (WTF::RecursiveLockAdapter::unlock):
+ (WTF::RecursiveLockAdapter::tryLock):
+ (WTF::RecursiveLockAdapter::isLocked):
+ * wtf/WordLock.cpp:
+ * wtf/WordLock.h:
+
+2016-12-14 Gavin Barraclough <barraclough@apple.com>
+
+ MarkedBlock::marksConveyLivenessDuringMarking should take into account collection scope
+ https://bugs.webkit.org/show_bug.cgi?id=165741
+
</ins><span class="cx"> Unreviewed rollout due to performance regression.
</span><span class="cx">
</span><span class="cx"> * WTF.xcodeproj/project.pbxproj:
</span></span></pre>
</div>
</div>
</body>
</html>