<!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>[161557] 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/161557">161557</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-09 09:21:02 -0800 (Thu, 09 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/161540">r161540</a>.
http://trac.webkit.org/changeset/161540
https://bugs.webkit.org/show_bug.cgi?id=126704
Caused assertion failures on multiple tests (Requested by ap
on #webkit).
Source/JavaScriptCore:
* bytecode/CodeBlock.cpp:
(JSC::CodeBlock::visitAggregate):
* bytecode/CodeBlock.h:
(JSC::CodeBlockSet::mark):
* dfg/DFGOperations.cpp:
* heap/CodeBlockSet.cpp:
(JSC::CodeBlockSet::add):
(JSC::CodeBlockSet::traceMarked):
* heap/CodeBlockSet.h:
* heap/CopiedBlockInlines.h:
(JSC::CopiedBlock::reportLiveBytes):
* heap/CopiedSpace.cpp:
* heap/CopiedSpace.h:
* heap/Heap.cpp:
(JSC::Heap::Heap):
(JSC::Heap::didAbandon):
(JSC::Heap::markRoots):
(JSC::Heap::copyBackingStores):
(JSC::Heap::collectAllGarbage):
(JSC::Heap::collect):
(JSC::Heap::didAllocate):
* heap/Heap.h:
(JSC::Heap::shouldCollect):
(JSC::Heap::isCollecting):
(JSC::Heap::isWriteBarrierEnabled):
(JSC::Heap::writeBarrier):
* heap/HeapOperation.h:
* heap/MarkStack.cpp:
(JSC::MarkStackArray::~MarkStackArray):
* heap/MarkStack.h:
* heap/MarkedAllocator.cpp:
(JSC::MarkedAllocator::isPagedOut):
(JSC::MarkedAllocator::tryAllocateHelper):
(JSC::MarkedAllocator::addBlock):
(JSC::MarkedAllocator::removeBlock):
* heap/MarkedAllocator.h:
(JSC::MarkedAllocator::MarkedAllocator):
(JSC::MarkedAllocator::reset):
* heap/MarkedBlock.cpp:
* heap/MarkedBlock.h:
(JSC::MarkedBlock::lastChanceToFinalize):
(JSC::MarkedBlock::didConsumeEmptyFreeList):
(JSC::MarkedBlock::clearMarks):
* heap/MarkedSpace.cpp:
(JSC::MarkedSpace::~MarkedSpace):
(JSC::MarkedSpace::resetAllocators):
(JSC::MarkedSpace::visitWeakSets):
(JSC::MarkedSpace::reapWeakSets):
* heap/MarkedSpace.h:
(JSC::ClearMarks::operator()):
(JSC::MarkedSpace::clearMarks):
* heap/SlotVisitor.cpp:
(JSC::SlotVisitor::~SlotVisitor):
* heap/SlotVisitor.h:
(JSC::SlotVisitor::sharedData):
* heap/SlotVisitorInlines.h:
(JSC::SlotVisitor::internalAppend):
(JSC::SlotVisitor::copyLater):
(JSC::SlotVisitor::reportExtraMemoryUsage):
* jit/Repatch.cpp:
* runtime/JSGenericTypedArrayViewInlines.h:
(JSC::JSGenericTypedArrayView<Adaptor>::visitChildren):
* runtime/JSPropertyNameIterator.h:
(JSC::StructureRareData::setEnumerationCache):
* runtime/JSString.cpp:
(JSC::JSString::visitChildren):
* runtime/StructureRareDataInlines.h:
(JSC::StructureRareData::setPreviousID):
(JSC::StructureRareData::setObjectToStringValue):
* runtime/WeakMapData.cpp:
(JSC::WeakMapData::visitChildren):
Source/WTF:
* wtf/Bitmap.h:
(WTF::WordType>::count):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeCodeBlockcpp">trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeCodeBlockh">trunk/Source/JavaScriptCore/bytecode/CodeBlock.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGOperationscpp">trunk/Source/JavaScriptCore/dfg/DFGOperations.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapCodeBlockSetcpp">trunk/Source/JavaScriptCore/heap/CodeBlockSet.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapCodeBlockSeth">trunk/Source/JavaScriptCore/heap/CodeBlockSet.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapCopiedBlockInlinesh">trunk/Source/JavaScriptCore/heap/CopiedBlockInlines.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapCopiedSpacecpp">trunk/Source/JavaScriptCore/heap/CopiedSpace.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapCopiedSpaceh">trunk/Source/JavaScriptCore/heap/CopiedSpace.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapHeapcpp">trunk/Source/JavaScriptCore/heap/Heap.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapHeaph">trunk/Source/JavaScriptCore/heap/Heap.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapHeapOperationh">trunk/Source/JavaScriptCore/heap/HeapOperation.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapMarkStackcpp">trunk/Source/JavaScriptCore/heap/MarkStack.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapMarkStackh">trunk/Source/JavaScriptCore/heap/MarkStack.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapMarkedAllocatorcpp">trunk/Source/JavaScriptCore/heap/MarkedAllocator.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapMarkedAllocatorh">trunk/Source/JavaScriptCore/heap/MarkedAllocator.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapMarkedBlockcpp">trunk/Source/JavaScriptCore/heap/MarkedBlock.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapMarkedBlockh">trunk/Source/JavaScriptCore/heap/MarkedBlock.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapMarkedSpacecpp">trunk/Source/JavaScriptCore/heap/MarkedSpace.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapMarkedSpaceh">trunk/Source/JavaScriptCore/heap/MarkedSpace.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapSlotVisitorcpp">trunk/Source/JavaScriptCore/heap/SlotVisitor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapSlotVisitorh">trunk/Source/JavaScriptCore/heap/SlotVisitor.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapSlotVisitorInlinesh">trunk/Source/JavaScriptCore/heap/SlotVisitorInlines.h</a></li>
<li><a href="#trunkSourceJavaScriptCorejitRepatchcpp">trunk/Source/JavaScriptCore/jit/Repatch.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSGenericTypedArrayViewInlinesh">trunk/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewInlines.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSPropertyNameIteratorh">trunk/Source/JavaScriptCore/runtime/JSPropertyNameIterator.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSStringcpp">trunk/Source/JavaScriptCore/runtime/JSString.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeStructureRareDataInlinesh">trunk/Source/JavaScriptCore/runtime/StructureRareDataInlines.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeWeakMapDatacpp">trunk/Source/JavaScriptCore/runtime/WeakMapData.cpp</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfBitmaph">trunk/Source/WTF/wtf/Bitmap.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (161556 => 161557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-01-09 17:19:34 UTC (rev 161556)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-01-09 17:21:02 UTC (rev 161557)
</span><span class="lines">@@ -1,3 +1,84 @@
</span><ins>+2014-01-09 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r161540.
+ http://trac.webkit.org/changeset/161540
+ https://bugs.webkit.org/show_bug.cgi?id=126704
+
+ Caused assertion failures on multiple tests (Requested by ap
+ on #webkit).
+
+ * bytecode/CodeBlock.cpp:
+ (JSC::CodeBlock::visitAggregate):
+ * bytecode/CodeBlock.h:
+ (JSC::CodeBlockSet::mark):
+ * dfg/DFGOperations.cpp:
+ * heap/CodeBlockSet.cpp:
+ (JSC::CodeBlockSet::add):
+ (JSC::CodeBlockSet::traceMarked):
+ * heap/CodeBlockSet.h:
+ * heap/CopiedBlockInlines.h:
+ (JSC::CopiedBlock::reportLiveBytes):
+ * heap/CopiedSpace.cpp:
+ * heap/CopiedSpace.h:
+ * heap/Heap.cpp:
+ (JSC::Heap::Heap):
+ (JSC::Heap::didAbandon):
+ (JSC::Heap::markRoots):
+ (JSC::Heap::copyBackingStores):
+ (JSC::Heap::collectAllGarbage):
+ (JSC::Heap::collect):
+ (JSC::Heap::didAllocate):
+ * heap/Heap.h:
+ (JSC::Heap::shouldCollect):
+ (JSC::Heap::isCollecting):
+ (JSC::Heap::isWriteBarrierEnabled):
+ (JSC::Heap::writeBarrier):
+ * heap/HeapOperation.h:
+ * heap/MarkStack.cpp:
+ (JSC::MarkStackArray::~MarkStackArray):
+ * heap/MarkStack.h:
+ * heap/MarkedAllocator.cpp:
+ (JSC::MarkedAllocator::isPagedOut):
+ (JSC::MarkedAllocator::tryAllocateHelper):
+ (JSC::MarkedAllocator::addBlock):
+ (JSC::MarkedAllocator::removeBlock):
+ * heap/MarkedAllocator.h:
+ (JSC::MarkedAllocator::MarkedAllocator):
+ (JSC::MarkedAllocator::reset):
+ * heap/MarkedBlock.cpp:
+ * heap/MarkedBlock.h:
+ (JSC::MarkedBlock::lastChanceToFinalize):
+ (JSC::MarkedBlock::didConsumeEmptyFreeList):
+ (JSC::MarkedBlock::clearMarks):
+ * heap/MarkedSpace.cpp:
+ (JSC::MarkedSpace::~MarkedSpace):
+ (JSC::MarkedSpace::resetAllocators):
+ (JSC::MarkedSpace::visitWeakSets):
+ (JSC::MarkedSpace::reapWeakSets):
+ * heap/MarkedSpace.h:
+ (JSC::ClearMarks::operator()):
+ (JSC::MarkedSpace::clearMarks):
+ * heap/SlotVisitor.cpp:
+ (JSC::SlotVisitor::~SlotVisitor):
+ * heap/SlotVisitor.h:
+ (JSC::SlotVisitor::sharedData):
+ * heap/SlotVisitorInlines.h:
+ (JSC::SlotVisitor::internalAppend):
+ (JSC::SlotVisitor::copyLater):
+ (JSC::SlotVisitor::reportExtraMemoryUsage):
+ * jit/Repatch.cpp:
+ * runtime/JSGenericTypedArrayViewInlines.h:
+ (JSC::JSGenericTypedArrayView<Adaptor>::visitChildren):
+ * runtime/JSPropertyNameIterator.h:
+ (JSC::StructureRareData::setEnumerationCache):
+ * runtime/JSString.cpp:
+ (JSC::JSString::visitChildren):
+ * runtime/StructureRareDataInlines.h:
+ (JSC::StructureRareData::setPreviousID):
+ (JSC::StructureRareData::setObjectToStringValue):
+ * runtime/WeakMapData.cpp:
+ (JSC::WeakMapData::visitChildren):
+
</ins><span class="cx"> 2014-01-09 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Shrink WatchpointSet.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeCodeBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp (161556 => 161557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2014-01-09 17:19:34 UTC (rev 161556)
+++ trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2014-01-09 17:21:02 UTC (rev 161557)
</span><span class="lines">@@ -1954,15 +1954,15 @@
</span><span class="cx"> if (CodeBlock* otherBlock = specialOSREntryBlockOrNull())
</span><span class="cx"> otherBlock->visitAggregate(visitor);
</span><span class="cx">
</span><del>- visitor.reportExtraMemoryUsage(ownerExecutable(), sizeof(CodeBlock));
</del><ins>+ visitor.reportExtraMemoryUsage(sizeof(CodeBlock));
</ins><span class="cx"> if (m_jitCode)
</span><del>- visitor.reportExtraMemoryUsage(ownerExecutable(), m_jitCode->size());
</del><ins>+ visitor.reportExtraMemoryUsage(m_jitCode->size());
</ins><span class="cx"> if (m_instructions.size()) {
</span><span class="cx"> // Divide by refCount() because m_instructions points to something that is shared
</span><span class="cx"> // by multiple CodeBlocks, and we only want to count it towards the heap size once.
</span><span class="cx"> // Having each CodeBlock report only its proportional share of the size is one way
</span><span class="cx"> // of accomplishing this.
</span><del>- visitor.reportExtraMemoryUsage(ownerExecutable(), m_instructions.size() * sizeof(Instruction) / m_instructions.refCount());
</del><ins>+ visitor.reportExtraMemoryUsage(m_instructions.size() * sizeof(Instruction) / m_instructions.refCount());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> visitor.append(&m_unlinkedCode);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeCodeBlockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/CodeBlock.h (161556 => 161557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/CodeBlock.h 2014-01-09 17:19:34 UTC (rev 161556)
+++ trunk/Source/JavaScriptCore/bytecode/CodeBlock.h 2014-01-09 17:21:02 UTC (rev 161557)
</span><span class="lines">@@ -1269,7 +1269,6 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> (*iter)->m_mayBeExecuting = true;
</span><del>- m_currentlyExecuting.append(static_cast<CodeBlock*>(candidateCodeBlock));
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGOperationscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGOperations.cpp (161556 => 161557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGOperations.cpp 2014-01-09 17:19:34 UTC (rev 161556)
+++ trunk/Source/JavaScriptCore/dfg/DFGOperations.cpp 2014-01-09 17:21:02 UTC (rev 161557)
</span><span class="lines">@@ -850,7 +850,6 @@
</span><span class="cx"> NativeCallFrameTracer tracer(&vm, exec);
</span><span class="cx">
</span><span class="cx"> ASSERT(!object->structure()->outOfLineCapacity());
</span><del>- DeferGC deferGC(vm.heap);
</del><span class="cx"> Butterfly* result = object->growOutOfLineStorage(vm, 0, initialOutOfLineCapacity);
</span><span class="cx"> object->setButterflyWithoutChangingStructure(vm, result);
</span><span class="cx"> return reinterpret_cast<char*>(result);
</span><span class="lines">@@ -861,7 +860,6 @@
</span><span class="cx"> VM& vm = exec->vm();
</span><span class="cx"> NativeCallFrameTracer tracer(&vm, exec);
</span><span class="cx">
</span><del>- DeferGC deferGC(vm.heap);
</del><span class="cx"> Butterfly* result = object->growOutOfLineStorage(vm, object->structure()->outOfLineCapacity(), newSize);
</span><span class="cx"> object->setButterflyWithoutChangingStructure(vm, result);
</span><span class="cx"> return reinterpret_cast<char*>(result);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapCodeBlockSetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/CodeBlockSet.cpp (161556 => 161557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/CodeBlockSet.cpp 2014-01-09 17:19:34 UTC (rev 161556)
+++ trunk/Source/JavaScriptCore/heap/CodeBlockSet.cpp 2014-01-09 17:21:02 UTC (rev 161557)
</span><span class="lines">@@ -45,8 +45,7 @@
</span><span class="cx">
</span><span class="cx"> void CodeBlockSet::add(PassRefPtr<CodeBlock> codeBlock)
</span><span class="cx"> {
</span><del>- CodeBlock* block = codeBlock.leakRef();
- bool isNewEntry = m_set.add(block).isNewEntry;
</del><ins>+ bool isNewEntry = m_set.add(codeBlock.leakRef()).isNewEntry;
</ins><span class="cx"> ASSERT_UNUSED(isNewEntry, isNewEntry);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -102,16 +101,9 @@
</span><span class="cx"> CodeBlock* codeBlock = *iter;
</span><span class="cx"> if (!codeBlock->m_mayBeExecuting)
</span><span class="cx"> continue;
</span><del>- codeBlock->ownerExecutable()->visitChildren(codeBlock->ownerExecutable(), visitor);
</del><ins>+ codeBlock->visitAggregate(visitor);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CodeBlockSet::rememberCurrentlyExecutingCodeBlocks(Heap* heap)
-{
- for (size_t i = 0; i < m_currentlyExecuting.size(); ++i)
- heap->addToRememberedSet(m_currentlyExecuting[i]->ownerExecutable());
- m_currentlyExecuting.clear();
-}
-
</del><span class="cx"> } // namespace JSC
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapCodeBlockSeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/CodeBlockSet.h (161556 => 161557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/CodeBlockSet.h 2014-01-09 17:19:34 UTC (rev 161556)
+++ trunk/Source/JavaScriptCore/heap/CodeBlockSet.h 2014-01-09 17:21:02 UTC (rev 161557)
</span><span class="lines">@@ -30,12 +30,10 @@
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><del>-#include <wtf/Vector.h>
</del><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><span class="cx"> class CodeBlock;
</span><del>-class Heap;
</del><span class="cx"> class SlotVisitor;
</span><span class="cx">
</span><span class="cx"> // CodeBlockSet tracks all CodeBlocks. Every CodeBlock starts out with one
</span><span class="lines">@@ -67,16 +65,11 @@
</span><span class="cx"> // mayBeExecuting.
</span><span class="cx"> void traceMarked(SlotVisitor&);
</span><span class="cx">
</span><del>- // Add all currently executing CodeBlocks to the remembered set to be
- // re-scanned during the next collection.
- void rememberCurrentlyExecutingCodeBlocks(Heap*);
-
</del><span class="cx"> private:
</span><span class="cx"> // This is not a set of RefPtr<CodeBlock> because we need to be able to find
</span><span class="cx"> // arbitrary bogus pointers. I could have written a thingy that had peek types
</span><span class="cx"> // and all, but that seemed like overkill.
</span><span class="cx"> HashSet<CodeBlock* > m_set;
</span><del>- Vector<CodeBlock*> m_currentlyExecuting;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapCopiedBlockInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/CopiedBlockInlines.h (161556 => 161557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/CopiedBlockInlines.h 2014-01-09 17:19:34 UTC (rev 161556)
+++ trunk/Source/JavaScriptCore/heap/CopiedBlockInlines.h 2014-01-09 17:21:02 UTC (rev 161557)
</span><span class="lines">@@ -42,9 +42,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> m_liveBytes += bytes;
</span><span class="cx">
</span><del>- if (isPinned())
- return;
-
</del><span class="cx"> if (!shouldEvacuate()) {
</span><span class="cx"> pin();
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapCopiedSpacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/CopiedSpace.cpp (161556 => 161557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/CopiedSpace.cpp 2014-01-09 17:19:34 UTC (rev 161556)
+++ trunk/Source/JavaScriptCore/heap/CopiedSpace.cpp 2014-01-09 17:21:02 UTC (rev 161557)
</span><span class="lines">@@ -316,17 +316,4 @@
</span><span class="cx"> || isBlockListPagedOut(deadline, &m_oversizeBlocks);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CopiedSpace::didStartFullCollection()
-{
- ASSERT(heap()->operationInProgress() == FullCollection);
-
- ASSERT(m_fromSpace->isEmpty());
-
- for (CopiedBlock* block = m_toSpace->head(); block; block = block->next())
- block->didSurviveGC();
-
- for (CopiedBlock* block = m_oversizeBlocks.head(); block; block = block->next())
- block->didSurviveGC();
-}
-
</del><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapCopiedSpaceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/CopiedSpace.h (161556 => 161557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/CopiedSpace.h 2014-01-09 17:19:34 UTC (rev 161556)
+++ trunk/Source/JavaScriptCore/heap/CopiedSpace.h 2014-01-09 17:21:02 UTC (rev 161557)
</span><span class="lines">@@ -60,8 +60,6 @@
</span><span class="cx">
</span><span class="cx"> CopiedAllocator& allocator() { return m_allocator; }
</span><span class="cx">
</span><del>- void didStartFullCollection();
-
</del><span class="cx"> void startedCopying();
</span><span class="cx"> void doneCopying();
</span><span class="cx"> bool isInCopyPhase() { return m_inCopyingPhase; }
</span><span class="lines">@@ -82,8 +80,6 @@
</span><span class="cx">
</span><span class="cx"> static CopiedBlock* blockFor(void*);
</span><span class="cx">
</span><del>- Heap* heap() const { return m_heap; }
-
</del><span class="cx"> private:
</span><span class="cx"> static bool isOversize(size_t);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapHeapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/Heap.cpp (161556 => 161557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/Heap.cpp 2014-01-09 17:19:34 UTC (rev 161556)
+++ trunk/Source/JavaScriptCore/heap/Heap.cpp 2014-01-09 17:21:02 UTC (rev 161557)
</span><span class="lines">@@ -253,11 +253,9 @@
</span><span class="cx"> , m_ramSize(ramSize())
</span><span class="cx"> , m_minBytesPerCycle(minHeapSize(m_heapType, m_ramSize))
</span><span class="cx"> , m_sizeAfterLastCollect(0)
</span><del>- , m_bytesAllocatedThisCycle(0)
- , m_bytesAbandonedThisCycle(0)
- , m_maxEdenSize(m_minBytesPerCycle)
- , m_maxHeapSize(m_minBytesPerCycle)
- , m_shouldDoFullCollection(false)
</del><ins>+ , m_bytesAllocatedLimit(m_minBytesPerCycle)
+ , m_bytesAllocated(0)
+ , m_bytesAbandoned(0)
</ins><span class="cx"> , m_totalBytesVisited(0)
</span><span class="cx"> , m_totalBytesCopied(0)
</span><span class="cx"> , m_operationInProgress(NoOperation)
</span><span class="lines">@@ -271,7 +269,7 @@
</span><span class="cx"> , m_copyVisitor(m_sharedData)
</span><span class="cx"> , m_handleSet(vm)
</span><span class="cx"> , m_isSafeToCollect(false)
</span><del>- , m_writeBarrierBuffer(256)
</del><ins>+ , m_writeBarrierBuffer(128)
</ins><span class="cx"> , m_vm(vm)
</span><span class="cx"> , m_lastGCLength(0)
</span><span class="cx"> , m_lastCodeDiscardTime(WTF::monotonicallyIncreasingTime())
</span><span class="lines">@@ -334,8 +332,8 @@
</span><span class="cx"> void Heap::didAbandon(size_t bytes)
</span><span class="cx"> {
</span><span class="cx"> if (m_activityCallback)
</span><del>- m_activityCallback->didAllocate(m_bytesAllocatedThisCycle + m_bytesAbandonedThisCycle);
- m_bytesAbandonedThisCycle += bytes;
</del><ins>+ m_activityCallback->didAllocate(m_bytesAllocated + m_bytesAbandoned);
+ m_bytesAbandoned += bytes;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Heap::protect(JSValue k)
</span><span class="lines">@@ -489,9 +487,6 @@
</span><span class="cx"> visitor.setup();
</span><span class="cx"> HeapRootVisitor heapRootVisitor(visitor);
</span><span class="cx">
</span><del>- Vector<const JSCell*> rememberedSet(m_slotVisitor.markStack().size());
- m_slotVisitor.markStack().fillVector(rememberedSet);
-
</del><span class="cx"> {
</span><span class="cx"> ParallelModeEnabler enabler(visitor);
</span><span class="cx">
</span><span class="lines">@@ -595,14 +590,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- {
- GCPHASE(ClearRememberedSet);
- for (unsigned i = 0; i < rememberedSet.size(); ++i) {
- const JSCell* cell = rememberedSet[i];
- MarkedBlock::blockFor(cell)->clearRemembered(cell);
- }
- }
-
</del><span class="cx"> GCCOUNTER(VisitedValueCount, visitor.visitCount());
</span><span class="cx">
</span><span class="cx"> m_sharedData.didFinishMarking();
</span><span class="lines">@@ -614,14 +601,8 @@
</span><span class="cx"> MARK_LOG_MESSAGE2("\nNumber of live Objects after full GC %lu, took %.6f secs\n", visitCount, WTF::monotonicallyIncreasingTime() - gcStartTime);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- if (m_operationInProgress == EdenCollection) {
- m_totalBytesVisited += visitor.bytesVisited();
- m_totalBytesCopied += visitor.bytesCopied();
- } else {
- ASSERT(m_operationInProgress == FullCollection);
- m_totalBytesVisited = visitor.bytesVisited();
- m_totalBytesCopied = visitor.bytesCopied();
- }
</del><ins>+ m_totalBytesVisited = visitor.bytesVisited();
+ m_totalBytesCopied = visitor.bytesCopied();
</ins><span class="cx"> #if ENABLE(PARALLEL_GC)
</span><span class="cx"> m_totalBytesVisited += m_sharedData.childBytesVisited();
</span><span class="cx"> m_totalBytesCopied += m_sharedData.childBytesCopied();
</span><span class="lines">@@ -634,12 +615,8 @@
</span><span class="cx"> m_sharedData.reset();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template <HeapOperation collectionType>
</del><span class="cx"> void Heap::copyBackingStores()
</span><span class="cx"> {
</span><del>- if (collectionType == EdenCollection)
- return;
-
</del><span class="cx"> m_storageSpace.startedCopying();
</span><span class="cx"> if (m_storageSpace.shouldDoCopyPhase()) {
</span><span class="cx"> m_sharedData.didStartCopying();
</span><span class="lines">@@ -650,7 +627,7 @@
</span><span class="cx"> // before signaling that the phase is complete.
</span><span class="cx"> m_storageSpace.doneCopying();
</span><span class="cx"> m_sharedData.didFinishCopying();
</span><del>- } else
</del><ins>+ } else
</ins><span class="cx"> m_storageSpace.doneCopying();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -746,23 +723,11 @@
</span><span class="cx"> m_jitStubRoutines.deleteUnmarkedJettisonedStubRoutines();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Heap::addToRememberedSet(const JSCell* cell)
-{
- ASSERT(cell);
- ASSERT(!Options::enableConcurrentJIT() || !isCompilationThread());
- ASSERT(isMarked(cell));
- if (isInRememberedSet(cell))
- return;
- MarkedBlock::blockFor(cell)->setRemembered(cell);
- m_slotVisitor.unconditionallyAppend(const_cast<JSCell*>(cell));
-}
-
</del><span class="cx"> void Heap::collectAllGarbage()
</span><span class="cx"> {
</span><span class="cx"> if (!m_isSafeToCollect)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_shouldDoFullCollection = true;
</del><span class="cx"> collect();
</span><span class="cx">
</span><span class="cx"> SamplingRegion samplingRegion("Garbage Collection: Sweeping");
</span><span class="lines">@@ -799,29 +764,10 @@
</span><span class="cx"> RecursiveAllocationScope scope(*this);
</span><span class="cx"> m_vm->prepareToDiscardCode();
</span><span class="cx"> }
</span><ins>+
+ m_operationInProgress = Collection;
+ m_extraMemoryUsage = 0;
</ins><span class="cx">
</span><del>- bool isFullCollection = m_shouldDoFullCollection;
- if (isFullCollection) {
- m_operationInProgress = FullCollection;
- m_slotVisitor.clearMarkStack();
- m_shouldDoFullCollection = false;
- if (Options::logGC())
- dataLog("FullCollection, ");
- } else {
-#if ENABLE(GGC)
- m_operationInProgress = EdenCollection;
- if (Options::logGC())
- dataLog("EdenCollection, ");
-#else
- m_operationInProgress = FullCollection;
- m_slotVisitor.clearMarkStack();
- if (Options::logGC())
- dataLog("FullCollection, ");
-#endif
- }
- if (m_operationInProgress == FullCollection)
- m_extraMemoryUsage = 0;
-
</del><span class="cx"> if (m_activityCallback)
</span><span class="cx"> m_activityCallback->willCollect();
</span><span class="cx">
</span><span class="lines">@@ -834,18 +780,8 @@
</span><span class="cx"> {
</span><span class="cx"> GCPHASE(StopAllocation);
</span><span class="cx"> m_objectSpace.stopAllocating();
</span><del>- if (m_operationInProgress == FullCollection)
- m_storageSpace.didStartFullCollection();
</del><span class="cx"> }
</span><span class="cx">
</span><del>- {
- GCPHASE(FlushWriteBarrierBuffer);
- if (m_operationInProgress == EdenCollection)
- m_writeBarrierBuffer.flush(*this);
- else
- m_writeBarrierBuffer.reset();
- }
-
</del><span class="cx"> markRoots();
</span><span class="cx">
</span><span class="cx"> {
</span><span class="lines">@@ -860,16 +796,13 @@
</span><span class="cx"> m_arrayBuffers.sweep();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (m_operationInProgress == FullCollection) {
</del><ins>+ {
</ins><span class="cx"> m_blockSnapshot.resize(m_objectSpace.blocks().set().size());
</span><span class="cx"> MarkedBlockSnapshotFunctor functor(m_blockSnapshot);
</span><span class="cx"> m_objectSpace.forEachBlock(functor);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (m_operationInProgress == FullCollection)
- copyBackingStores<FullCollection>();
- else
- copyBackingStores<EdenCollection>();
</del><ins>+ copyBackingStores();
</ins><span class="cx">
</span><span class="cx"> {
</span><span class="cx"> GCPHASE(FinalizeUnconditionalFinalizers);
</span><span class="lines">@@ -886,17 +819,10 @@
</span><span class="cx"> m_vm->clearSourceProviderCaches();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (m_operationInProgress == FullCollection)
- m_sweeper->startSweeping(m_blockSnapshot);
</del><ins>+ m_sweeper->startSweeping(m_blockSnapshot);
+ m_bytesAbandoned = 0;
</ins><span class="cx">
</span><span class="cx"> {
</span><del>- GCPHASE(AddCurrentlyExecutingCodeBlocksToRememberedSet);
- m_codeBlocks.rememberCurrentlyExecutingCodeBlocks(this);
- }
-
- m_bytesAbandonedThisCycle = 0;
-
- {
</del><span class="cx"> GCPHASE(ResetAllocators);
</span><span class="cx"> m_objectSpace.resetAllocators();
</span><span class="cx"> }
</span><span class="lines">@@ -905,32 +831,21 @@
</span><span class="cx"> if (Options::gcMaxHeapSize() && currentHeapSize > Options::gcMaxHeapSize())
</span><span class="cx"> HeapStatistics::exitWithFailure();
</span><span class="cx">
</span><del>- if (m_operationInProgress == FullCollection) {
- // To avoid pathological GC churn in very small and very large heaps, we set
- // the new allocation limit based on the current size of the heap, with a
- // fixed minimum.
- m_maxHeapSize = max(minHeapSize(m_heapType, m_ramSize), proportionalHeapSize(currentHeapSize, m_ramSize));
- m_maxEdenSize = m_maxHeapSize - currentHeapSize;
- } else {
- ASSERT(currentHeapSize >= m_sizeAfterLastCollect);
- m_maxEdenSize = m_maxHeapSize - currentHeapSize;
- double edenToOldGenerationRatio = (double)m_maxEdenSize / (double)m_maxHeapSize;
- double minEdenToOldGenerationRatio = 1.0 / 3.0;
- if (edenToOldGenerationRatio < minEdenToOldGenerationRatio)
- m_shouldDoFullCollection = true;
- m_maxHeapSize += currentHeapSize - m_sizeAfterLastCollect;
- m_maxEdenSize = m_maxHeapSize - currentHeapSize;
- }
-
</del><span class="cx"> m_sizeAfterLastCollect = currentHeapSize;
</span><span class="cx">
</span><del>- m_bytesAllocatedThisCycle = 0;
</del><ins>+ // To avoid pathological GC churn in very small and very large heaps, we set
+ // the new allocation limit based on the current size of the heap, with a
+ // fixed minimum.
+ size_t maxHeapSize = max(minHeapSize(m_heapType, m_ramSize), proportionalHeapSize(currentHeapSize, m_ramSize));
+ m_bytesAllocatedLimit = maxHeapSize - currentHeapSize;
+
+ m_bytesAllocated = 0;
</ins><span class="cx"> double lastGCEndTime = WTF::monotonicallyIncreasingTime();
</span><span class="cx"> m_lastGCLength = lastGCEndTime - lastGCStartTime;
</span><span class="cx">
</span><span class="cx"> if (Options::recordGCPauseTimes())
</span><span class="cx"> HeapStatistics::recordGCPauseTime(lastGCStartTime, lastGCEndTime);
</span><del>- RELEASE_ASSERT(m_operationInProgress == EdenCollection || m_operationInProgress == FullCollection);
</del><ins>+ RELEASE_ASSERT(m_operationInProgress == Collection);
</ins><span class="cx">
</span><span class="cx"> m_operationInProgress = NoOperation;
</span><span class="cx"> JAVASCRIPTCORE_GC_END();
</span><span class="lines">@@ -948,6 +863,10 @@
</span><span class="cx"> double after = currentTimeMS();
</span><span class="cx"> dataLog(after - before, " ms, ", currentHeapSize / 1024, " kb]\n");
</span><span class="cx"> }
</span><ins>+
+#if ENABLE(ALLOCATION_LOGGING)
+ dataLogF("JSC GC finishing collection.\n");
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool Heap::collectIfNecessaryOrDefer()
</span><span class="lines">@@ -997,8 +916,8 @@
</span><span class="cx"> void Heap::didAllocate(size_t bytes)
</span><span class="cx"> {
</span><span class="cx"> if (m_activityCallback)
</span><del>- m_activityCallback->didAllocate(m_bytesAllocatedThisCycle + m_bytesAbandonedThisCycle);
- m_bytesAllocatedThisCycle += bytes;
</del><ins>+ m_activityCallback->didAllocate(m_bytesAllocated + m_bytesAbandoned);
+ m_bytesAllocated += bytes;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool Heap::isValidAllocation(size_t)
</span><span class="lines">@@ -1075,15 +994,6 @@
</span><span class="cx"> collectIfNecessaryOrDefer();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Heap::writeBarrier(const JSCell* from)
-{
- ASSERT_GC_OBJECT_LOOKS_VALID(const_cast<JSCell*>(from));
- if (!from || !isMarked(from))
- return;
- Heap* heap = Heap::heap(from);
- heap->addToRememberedSet(from);
-}
-
</del><span class="cx"> void Heap::flushWriteBarrierBuffer(JSCell* cell)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(GGC)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapHeaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/Heap.h (161556 => 161557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/Heap.h 2014-01-09 17:19:34 UTC (rev 161556)
+++ trunk/Source/JavaScriptCore/heap/Heap.h 2014-01-09 17:21:02 UTC (rev 161557)
</span><span class="lines">@@ -94,17 +94,11 @@
</span><span class="cx"> static bool testAndSetMarked(const void*);
</span><span class="cx"> static void setMarked(const void*);
</span><span class="cx">
</span><del>- JS_EXPORT_PRIVATE void addToRememberedSet(const JSCell*);
- bool isInRememberedSet(const JSCell* cell) const
- {
- ASSERT(cell);
- ASSERT(!Options::enableConcurrentJIT() || !isCompilationThread());
- return MarkedBlock::blockFor(cell)->isRemembered(cell);
- }
</del><span class="cx"> static bool isWriteBarrierEnabled();
</span><del>- JS_EXPORT_PRIVATE static void writeBarrier(const JSCell*);
</del><ins>+ static void writeBarrier(const JSCell*);
</ins><span class="cx"> static void writeBarrier(const JSCell*, JSValue);
</span><span class="cx"> static void writeBarrier(const JSCell*, JSCell*);
</span><ins>+ static uint8_t* addressOfCardFor(JSCell*);
</ins><span class="cx">
</span><span class="cx"> WriteBarrierBuffer& writeBarrierBuffer() { return m_writeBarrierBuffer; }
</span><span class="cx"> void flushWriteBarrierBuffer(JSCell*);
</span><span class="lines">@@ -126,7 +120,6 @@
</span><span class="cx">
</span><span class="cx"> // true if collection is in progress
</span><span class="cx"> inline bool isCollecting();
</span><del>- inline HeapOperation operationInProgress() { return m_operationInProgress; }
</del><span class="cx"> // true if an allocation or collection is in progress
</span><span class="cx"> inline bool isBusy();
</span><span class="cx">
</span><span class="lines">@@ -243,7 +236,6 @@
</span><span class="cx"> void markRoots();
</span><span class="cx"> void markProtectedObjects(HeapRootVisitor&);
</span><span class="cx"> void markTempSortVectors(HeapRootVisitor&);
</span><del>- template <HeapOperation collectionType>
</del><span class="cx"> void copyBackingStores();
</span><span class="cx"> void harvestWeakReferences();
</span><span class="cx"> void finalizeUnconditionalFinalizers();
</span><span class="lines">@@ -265,11 +257,10 @@
</span><span class="cx"> const size_t m_minBytesPerCycle;
</span><span class="cx"> size_t m_sizeAfterLastCollect;
</span><span class="cx">
</span><del>- size_t m_bytesAllocatedThisCycle;
- size_t m_bytesAbandonedThisCycle;
- size_t m_maxEdenSize;
- size_t m_maxHeapSize;
- bool m_shouldDoFullCollection;
</del><ins>+ size_t m_bytesAllocatedLimit;
+ size_t m_bytesAllocated;
+ size_t m_bytesAbandoned;
+
</ins><span class="cx"> size_t m_totalBytesVisited;
</span><span class="cx"> size_t m_totalBytesCopied;
</span><span class="cx">
</span><span class="lines">@@ -280,8 +271,6 @@
</span><span class="cx"> GCIncomingRefCountedSet<ArrayBuffer> m_arrayBuffers;
</span><span class="cx"> size_t m_extraMemoryUsage;
</span><span class="cx">
</span><del>- HashSet<const JSCell*> m_copyingRememberedSet;
-
</del><span class="cx"> ProtectCountSet m_protectedValues;
</span><span class="cx"> Vector<Vector<ValueStringPair, 0, UnsafeVectorOverflow>* > m_tempSortingVectors;
</span><span class="cx"> OwnPtr<HashSet<MarkedArgumentBuffer*>> m_markListSet;
</span><span class="lines">@@ -333,8 +322,8 @@
</span><span class="cx"> if (isDeferred())
</span><span class="cx"> return false;
</span><span class="cx"> if (Options::gcMaxHeapSize())
</span><del>- return m_bytesAllocatedThisCycle > Options::gcMaxHeapSize() && m_isSafeToCollect && m_operationInProgress == NoOperation;
- return m_bytesAllocatedThisCycle > m_maxEdenSize && m_isSafeToCollect && m_operationInProgress == NoOperation;
</del><ins>+ return m_bytesAllocated > Options::gcMaxHeapSize() && m_isSafeToCollect && m_operationInProgress == NoOperation;
+ return m_bytesAllocated > m_bytesAllocatedLimit && m_isSafeToCollect && m_operationInProgress == NoOperation;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool Heap::isBusy()
</span><span class="lines">@@ -344,7 +333,7 @@
</span><span class="cx">
</span><span class="cx"> bool Heap::isCollecting()
</span><span class="cx"> {
</span><del>- return m_operationInProgress == FullCollection || m_operationInProgress == EdenCollection;
</del><ins>+ return m_operationInProgress == Collection;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline Heap* Heap::heap(const JSCell* cell)
</span><span class="lines">@@ -381,35 +370,28 @@
</span><span class="cx">
</span><span class="cx"> inline bool Heap::isWriteBarrierEnabled()
</span><span class="cx"> {
</span><del>-#if ENABLE(WRITE_BARRIER_PROFILING) || ENABLE(GGC)
</del><ins>+#if ENABLE(WRITE_BARRIER_PROFILING)
</ins><span class="cx"> return true;
</span><span class="cx"> #else
</span><span class="cx"> return false;
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>- inline void Heap::writeBarrier(const JSCell* from, JSCell* to)
</del><ins>+ inline void Heap::writeBarrier(const JSCell*)
</ins><span class="cx"> {
</span><del>-#if ENABLE(WRITE_BARRIER_PROFILING)
</del><span class="cx"> WriteBarrierCounters::countWriteBarrier();
</span><del>-#endif
- if (!from || !isMarked(from))
- return;
- if (!to || isMarked(to))
- return;
- Heap::heap(from)->addToRememberedSet(from);
</del><span class="cx"> }
</span><span class="cx">
</span><del>- inline void Heap::writeBarrier(const JSCell* from, JSValue to)
</del><ins>+ inline void Heap::writeBarrier(const JSCell*, JSCell*)
</ins><span class="cx"> {
</span><del>-#if ENABLE(WRITE_BARRIER_PROFILING)
</del><span class="cx"> WriteBarrierCounters::countWriteBarrier();
</span><del>-#endif
- if (!to.isCell())
- return;
- writeBarrier(from, to.asCell());
</del><span class="cx"> }
</span><span class="cx">
</span><ins>+ inline void Heap::writeBarrier(const JSCell*, JSValue)
+ {
+ WriteBarrierCounters::countWriteBarrier();
+ }
+
</ins><span class="cx"> inline void Heap::reportExtraMemoryCost(size_t cost)
</span><span class="cx"> {
</span><span class="cx"> if (cost > minExtraCost)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapHeapOperationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/HeapOperation.h (161556 => 161557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/HeapOperation.h 2014-01-09 17:19:34 UTC (rev 161556)
+++ trunk/Source/JavaScriptCore/heap/HeapOperation.h 2014-01-09 17:21:02 UTC (rev 161557)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><del>-enum HeapOperation { NoOperation, Allocation, FullCollection, EdenCollection };
</del><ins>+enum HeapOperation { NoOperation, Allocation, Collection };
</ins><span class="cx">
</span><span class="cx"> } // namespace JSC
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapMarkStackcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/MarkStack.cpp (161556 => 161557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/MarkStack.cpp 2014-01-09 17:19:34 UTC (rev 161556)
+++ trunk/Source/JavaScriptCore/heap/MarkStack.cpp 2014-01-09 17:21:02 UTC (rev 161557)
</span><span class="lines">@@ -57,31 +57,10 @@
</span><span class="cx">
</span><span class="cx"> MarkStackArray::~MarkStackArray()
</span><span class="cx"> {
</span><del>- ASSERT(m_numberOfSegments == 1);
- ASSERT(m_segments.size() == 1);
</del><ins>+ ASSERT(m_numberOfSegments == 1 && m_segments.size() == 1);
</ins><span class="cx"> m_blockAllocator.deallocate(MarkStackSegment::destroy(m_segments.removeHead()));
</span><del>- m_numberOfSegments--;
- ASSERT(!m_numberOfSegments);
- ASSERT(!m_segments.size());
</del><span class="cx"> }
</span><span class="cx">
</span><del>-void MarkStackArray::clear()
-{
- if (!m_segments.head())
- return;
- MarkStackSegment* next;
- for (MarkStackSegment* current = m_segments.head(); current->next(); current = next) {
- next = current->next();
- m_segments.remove(current);
- m_blockAllocator.deallocate(MarkStackSegment::destroy(current));
- }
- m_top = 0;
- m_numberOfSegments = 1;
-#if !ASSERT_DISABLED
- m_segments.head()->m_top = 0;
-#endif
-}
-
</del><span class="cx"> void MarkStackArray::expand()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_segments.head()->m_top == s_segmentCapacity);
</span><span class="lines">@@ -188,28 +167,4 @@
</span><span class="cx"> append(other.removeLast());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MarkStackArray::fillVector(Vector<const JSCell*>& vector)
-{
- ASSERT(vector.size() == size());
-
- MarkStackSegment* currentSegment = m_segments.head();
- if (!currentSegment)
- return;
-
- unsigned count = 0;
- for (unsigned i = 0; i < m_top; ++i) {
- ASSERT(currentSegment->data()[i]);
- vector[count++] = currentSegment->data()[i];
- }
-
- currentSegment = currentSegment->next();
- while (currentSegment) {
- for (unsigned i = 0; i < s_segmentCapacity; ++i) {
- ASSERT(currentSegment->data()[i]);
- vector[count++] = currentSegment->data()[i];
- }
- currentSegment = currentSegment->next();
- }
-}
-
</del><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapMarkStackh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/MarkStack.h (161556 => 161557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/MarkStack.h 2014-01-09 17:19:34 UTC (rev 161556)
+++ trunk/Source/JavaScriptCore/heap/MarkStack.h 2014-01-09 17:21:02 UTC (rev 161557)
</span><span class="lines">@@ -52,7 +52,6 @@
</span><span class="cx">
</span><span class="cx"> #include "HeapBlock.h"
</span><span class="cx"> #include <wtf/StdLibExtras.h>
</span><del>-#include <wtf/Vector.h>
</del><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><span class="lines">@@ -101,9 +100,6 @@
</span><span class="cx"> size_t size();
</span><span class="cx"> bool isEmpty();
</span><span class="cx">
</span><del>- void fillVector(Vector<const JSCell*>&);
- void clear();
-
</del><span class="cx"> private:
</span><span class="cx"> template <size_t size> struct CapacityFromSize {
</span><span class="cx"> static const size_t value = (size - sizeof(MarkStackSegment)) / sizeof(const JSCell*);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapMarkedAllocatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/MarkedAllocator.cpp (161556 => 161557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/MarkedAllocator.cpp 2014-01-09 17:19:34 UTC (rev 161556)
+++ trunk/Source/JavaScriptCore/heap/MarkedAllocator.cpp 2014-01-09 17:21:02 UTC (rev 161557)
</span><span class="lines">@@ -10,10 +10,10 @@
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><del>-static bool isListPagedOut(double deadline, DoublyLinkedList<MarkedBlock>& list)
</del><ins>+bool MarkedAllocator::isPagedOut(double deadline)
</ins><span class="cx"> {
</span><span class="cx"> unsigned itersSinceLastTimeCheck = 0;
</span><del>- MarkedBlock* block = list.head();
</del><ins>+ MarkedBlock* block = m_blockList.head();
</ins><span class="cx"> while (block) {
</span><span class="cx"> block = block->next();
</span><span class="cx"> ++itersSinceLastTimeCheck;
</span><span class="lines">@@ -24,13 +24,7 @@
</span><span class="cx"> itersSinceLastTimeCheck = 0;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- return false;
-}
</del><span class="cx">
</span><del>-bool MarkedAllocator::isPagedOut(double deadline)
-{
- if (isListPagedOut(deadline, m_blockList))
- return true;
</del><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -42,23 +36,15 @@
</span><span class="cx"> while (!m_freeList.head) {
</span><span class="cx"> DelayedReleaseScope delayedReleaseScope(*m_markedSpace);
</span><span class="cx"> if (m_currentBlock) {
</span><del>- ASSERT(m_currentBlock == m_nextBlockToSweep);
</del><ins>+ ASSERT(m_currentBlock == m_blocksToSweep);
</ins><span class="cx"> m_currentBlock->didConsumeFreeList();
</span><del>- m_nextBlockToSweep = m_currentBlock->next();
</del><ins>+ m_blocksToSweep = m_currentBlock->next();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- MarkedBlock* next;
- for (MarkedBlock*& block = m_nextBlockToSweep; block; block = next) {
- next = block->next();
-
</del><ins>+ for (MarkedBlock*& block = m_blocksToSweep; block; block = block->next()) {
</ins><span class="cx"> MarkedBlock::FreeList freeList = block->sweep(MarkedBlock::SweepToFreeList);
</span><del>-
</del><span class="cx"> if (!freeList.head) {
</span><span class="cx"> block->didConsumeEmptyFreeList();
</span><del>- m_blockList.remove(block);
- m_blockList.push(block);
- if (!m_lastFullBlock)
- m_lastFullBlock = block;
</del><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -82,7 +68,6 @@
</span><span class="cx"> MarkedBlock::FreeCell* head = m_freeList.head;
</span><span class="cx"> m_freeList.head = head->next;
</span><span class="cx"> ASSERT(head);
</span><del>- m_markedSpace->didAllocateInBlock(m_currentBlock);
</del><span class="cx"> return head;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -151,7 +136,7 @@
</span><span class="cx"> ASSERT(!m_freeList.head);
</span><span class="cx">
</span><span class="cx"> m_blockList.append(block);
</span><del>- m_nextBlockToSweep = m_currentBlock = block;
</del><ins>+ m_blocksToSweep = m_currentBlock = block;
</ins><span class="cx"> m_freeList = block->sweep(MarkedBlock::SweepToFreeList);
</span><span class="cx"> m_markedSpace->didAddBlock(block);
</span><span class="cx"> }
</span><span class="lines">@@ -162,27 +147,9 @@
</span><span class="cx"> m_currentBlock = m_currentBlock->next();
</span><span class="cx"> m_freeList = MarkedBlock::FreeList();
</span><span class="cx"> }
</span><del>- if (m_nextBlockToSweep == block)
- m_nextBlockToSweep = m_nextBlockToSweep->next();
-
- if (block == m_lastFullBlock)
- m_lastFullBlock = m_lastFullBlock->prev();
-
</del><ins>+ if (m_blocksToSweep == block)
+ m_blocksToSweep = m_blocksToSweep->next();
</ins><span class="cx"> m_blockList.remove(block);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MarkedAllocator::reset()
-{
- m_lastActiveBlock = 0;
- m_currentBlock = 0;
- m_freeList = MarkedBlock::FreeList();
- if (m_heap->operationInProgress() == FullCollection)
- m_lastFullBlock = 0;
-
- if (m_lastFullBlock)
- m_nextBlockToSweep = m_lastFullBlock->next() ? m_lastFullBlock->next() : m_lastFullBlock;
- else
- m_nextBlockToSweep = m_blockList.head();
-}
-
</del><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapMarkedAllocatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/MarkedAllocator.h (161556 => 161557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/MarkedAllocator.h 2014-01-09 17:19:34 UTC (rev 161556)
+++ trunk/Source/JavaScriptCore/heap/MarkedAllocator.h 2014-01-09 17:21:02 UTC (rev 161557)
</span><span class="lines">@@ -52,8 +52,7 @@
</span><span class="cx"> MarkedBlock::FreeList m_freeList;
</span><span class="cx"> MarkedBlock* m_currentBlock;
</span><span class="cx"> MarkedBlock* m_lastActiveBlock;
</span><del>- MarkedBlock* m_nextBlockToSweep;
- MarkedBlock* m_lastFullBlock;
</del><ins>+ MarkedBlock* m_blocksToSweep;
</ins><span class="cx"> DoublyLinkedList<MarkedBlock> m_blockList;
</span><span class="cx"> size_t m_cellSize;
</span><span class="cx"> MarkedBlock::DestructorType m_destructorType;
</span><span class="lines">@@ -69,8 +68,7 @@
</span><span class="cx"> inline MarkedAllocator::MarkedAllocator()
</span><span class="cx"> : m_currentBlock(0)
</span><span class="cx"> , m_lastActiveBlock(0)
</span><del>- , m_nextBlockToSweep(0)
- , m_lastFullBlock(0)
</del><ins>+ , m_blocksToSweep(0)
</ins><span class="cx"> , m_cellSize(0)
</span><span class="cx"> , m_destructorType(MarkedBlock::None)
</span><span class="cx"> , m_heap(0)
</span><span class="lines">@@ -104,6 +102,14 @@
</span><span class="cx"> return head;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline void MarkedAllocator::reset()
+{
+ m_lastActiveBlock = 0;
+ m_currentBlock = 0;
+ m_freeList = MarkedBlock::FreeList();
+ m_blocksToSweep = m_blockList.head();
+}
+
</ins><span class="cx"> inline void MarkedAllocator::stopAllocating()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_lastActiveBlock);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapMarkedBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/MarkedBlock.cpp (161556 => 161557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/MarkedBlock.cpp 2014-01-09 17:19:34 UTC (rev 161556)
+++ trunk/Source/JavaScriptCore/heap/MarkedBlock.cpp 2014-01-09 17:21:02 UTC (rev 161557)
</span><span class="lines">@@ -197,45 +197,6 @@
</span><span class="cx"> m_state = Marked;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MarkedBlock::clearMarks()
-{
- if (heap()->operationInProgress() == JSC::EdenCollection)
- this->clearMarksWithCollectionType<EdenCollection>();
- else
- this->clearMarksWithCollectionType<FullCollection>();
-}
-
-void MarkedBlock::clearRememberedSet()
-{
- m_rememberedSet.clearAll();
-}
-
-template <HeapOperation collectionType>
-void MarkedBlock::clearMarksWithCollectionType()
-{
- ASSERT(collectionType == FullCollection || collectionType == EdenCollection);
- HEAP_LOG_BLOCK_STATE_TRANSITION(this);
-
- ASSERT(m_state != New && m_state != FreeListed);
- if (collectionType == FullCollection) {
- m_marks.clearAll();
- m_rememberedSet.clearAll();
- }
-
- // This will become true at the end of the mark phase. We set it now to
- // avoid an extra pass to do so later.
- m_state = Marked;
-}
-
-void MarkedBlock::lastChanceToFinalize()
-{
- m_weakSet.lastChanceToFinalize();
-
- clearNewlyAllocated();
- clearMarksWithCollectionType<FullCollection>();
- sweep();
-}
-
</del><span class="cx"> MarkedBlock::FreeList MarkedBlock::resumeAllocating()
</span><span class="cx"> {
</span><span class="cx"> HEAP_LOG_BLOCK_STATE_TRANSITION(this);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapMarkedBlockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/MarkedBlock.h (161556 => 161557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/MarkedBlock.h 2014-01-09 17:19:34 UTC (rev 161556)
+++ trunk/Source/JavaScriptCore/heap/MarkedBlock.h 2014-01-09 17:21:02 UTC (rev 161557)
</span><span class="lines">@@ -25,7 +25,6 @@
</span><span class="cx"> #include "BlockAllocator.h"
</span><span class="cx"> #include "HeapBlock.h"
</span><span class="cx">
</span><del>-#include "HeapOperation.h"
</del><span class="cx"> #include "WeakSet.h"
</span><span class="cx"> #include <wtf/Bitmap.h>
</span><span class="cx"> #include <wtf/DataLog.h>
</span><span class="lines">@@ -73,7 +72,7 @@
</span><span class="cx"> friend class LLIntOffsetsExtractor;
</span><span class="cx">
</span><span class="cx"> public:
</span><del>- static const size_t atomSize = 16; // bytes
</del><ins>+ static const size_t atomSize = 8; // bytes
</ins><span class="cx"> static const size_t atomShiftAmount = 4; // log_2(atomSize) FIXME: Change atomSize to 16.
</span><span class="cx"> static const size_t blockSize = 64 * KB;
</span><span class="cx"> static const size_t blockMask = ~(blockSize - 1); // blockSize must be a power of two.
</span><span class="lines">@@ -141,16 +140,11 @@
</span><span class="cx"> void stopAllocating(const FreeList&);
</span><span class="cx"> FreeList resumeAllocating(); // Call this if you canonicalized a block for some non-collection related purpose.
</span><span class="cx"> void didConsumeEmptyFreeList(); // Call this if you sweep a block, but the returned FreeList is empty.
</span><del>- void didSweepToNoAvail(); // Call this if you sweep a block and get an empty free list back.
</del><span class="cx">
</span><span class="cx"> // Returns true if the "newly allocated" bitmap was non-null
</span><span class="cx"> // and was successfully cleared and false otherwise.
</span><span class="cx"> bool clearNewlyAllocated();
</span><span class="cx"> void clearMarks();
</span><del>- void clearRememberedSet();
- template <HeapOperation collectionType>
- void clearMarksWithCollectionType();
-
</del><span class="cx"> size_t markCount();
</span><span class="cx"> bool isEmpty();
</span><span class="cx">
</span><span class="lines">@@ -167,11 +161,6 @@
</span><span class="cx"> void setMarked(const void*);
</span><span class="cx"> void clearMarked(const void*);
</span><span class="cx">
</span><del>- void setRemembered(const void*);
- void clearRemembered(const void*);
- void atomicClearRemembered(const void*);
- bool isRemembered(const void*);
-
</del><span class="cx"> bool isNewlyAllocated(const void*);
</span><span class="cx"> void setNewlyAllocated(const void*);
</span><span class="cx"> void clearNewlyAllocated(const void*);
</span><span class="lines">@@ -201,11 +190,9 @@
</span><span class="cx"> size_t m_atomsPerCell;
</span><span class="cx"> size_t m_endAtom; // This is a fuzzy end. Always test for < m_endAtom.
</span><span class="cx"> #if ENABLE(PARALLEL_GC)
</span><del>- WTF::Bitmap<atomsPerBlock, WTF::BitmapAtomic, uint8_t> m_marks;
- WTF::Bitmap<atomsPerBlock, WTF::BitmapAtomic, uint8_t> m_rememberedSet;
</del><ins>+ WTF::Bitmap<atomsPerBlock, WTF::BitmapAtomic> m_marks;
</ins><span class="cx"> #else
</span><del>- WTF::Bitmap<atomsPerBlock, WTF::BitmapNotAtomic, uint8_t> m_marks;
- WTF::Bitmap<atomsPerBlock, WTF::BitmapNotAtomic, uint8_t> m_rememberedSet;
</del><ins>+ WTF::Bitmap<atomsPerBlock, WTF::BitmapNotAtomic> m_marks;
</ins><span class="cx"> #endif
</span><span class="cx"> OwnPtr<WTF::Bitmap<atomsPerBlock>> m_newlyAllocated;
</span><span class="cx">
</span><span class="lines">@@ -247,6 +234,15 @@
</span><span class="cx"> return reinterpret_cast<MarkedBlock*>(reinterpret_cast<Bits>(p) & blockMask);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ inline void MarkedBlock::lastChanceToFinalize()
+ {
+ m_weakSet.lastChanceToFinalize();
+
+ clearNewlyAllocated();
+ clearMarks();
+ sweep();
+ }
+
</ins><span class="cx"> inline MarkedAllocator* MarkedBlock::allocator() const
</span><span class="cx"> {
</span><span class="cx"> return m_allocator;
</span><span class="lines">@@ -295,10 +291,26 @@
</span><span class="cx"> HEAP_LOG_BLOCK_STATE_TRANSITION(this);
</span><span class="cx">
</span><span class="cx"> ASSERT(!m_newlyAllocated);
</span><ins>+#ifndef NDEBUG
+ for (size_t i = firstAtom(); i < m_endAtom; i += m_atomsPerCell)
+ ASSERT(m_marks.get(i));
+#endif
</ins><span class="cx"> ASSERT(m_state == FreeListed);
</span><span class="cx"> m_state = Marked;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ inline void MarkedBlock::clearMarks()
+ {
+ HEAP_LOG_BLOCK_STATE_TRANSITION(this);
+
+ ASSERT(m_state != New && m_state != FreeListed);
+ m_marks.clearAll();
+
+ // This will become true at the end of the mark phase. We set it now to
+ // avoid an extra pass to do so later.
+ m_state = Marked;
+ }
+
</ins><span class="cx"> inline size_t MarkedBlock::markCount()
</span><span class="cx"> {
</span><span class="cx"> return m_marks.count();
</span><span class="lines">@@ -334,26 +346,6 @@
</span><span class="cx"> return (reinterpret_cast<Bits>(p) - reinterpret_cast<Bits>(this)) / atomSize;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- inline void MarkedBlock::setRemembered(const void* p)
- {
- m_rememberedSet.set(atomNumber(p));
- }
-
- inline void MarkedBlock::clearRemembered(const void* p)
- {
- m_rememberedSet.clear(atomNumber(p));
- }
-
- inline void MarkedBlock::atomicClearRemembered(const void* p)
- {
- m_rememberedSet.concurrentTestAndClear(atomNumber(p));
- }
-
- inline bool MarkedBlock::isRemembered(const void* p)
- {
- return m_rememberedSet.get(atomNumber(p));
- }
-
</del><span class="cx"> inline bool MarkedBlock::isMarked(const void* p)
</span><span class="cx"> {
</span><span class="cx"> return m_marks.get(atomNumber(p));
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapMarkedSpacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/MarkedSpace.cpp (161556 => 161557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/MarkedSpace.cpp 2014-01-09 17:19:34 UTC (rev 161556)
+++ trunk/Source/JavaScriptCore/heap/MarkedSpace.cpp 2014-01-09 17:21:02 UTC (rev 161557)
</span><span class="lines">@@ -105,7 +105,6 @@
</span><span class="cx"> {
</span><span class="cx"> Free free(Free::FreeAll, this);
</span><span class="cx"> forEachBlock(free);
</span><del>- ASSERT(!m_blocks.set().size());
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> struct LastChanceToFinalize : MarkedBlock::VoidFunctor {
</span><span class="lines">@@ -144,27 +143,17 @@
</span><span class="cx"> m_normalSpace.largeAllocator.reset();
</span><span class="cx"> m_normalDestructorSpace.largeAllocator.reset();
</span><span class="cx"> m_immortalStructureDestructorSpace.largeAllocator.reset();
</span><del>-
- m_blocksWithNewObjects.clear();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MarkedSpace::visitWeakSets(HeapRootVisitor& heapRootVisitor)
</span><span class="cx"> {
</span><span class="cx"> VisitWeakSet visitWeakSet(heapRootVisitor);
</span><del>- if (m_heap->operationInProgress() == EdenCollection) {
- for (unsigned i = 0; i < m_blocksWithNewObjects.size(); ++i)
- visitWeakSet(m_blocksWithNewObjects[i]);
- } else
- forEachBlock(visitWeakSet);
</del><ins>+ forEachBlock(visitWeakSet);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MarkedSpace::reapWeakSets()
</span><span class="cx"> {
</span><del>- if (m_heap->operationInProgress() == EdenCollection) {
- for (unsigned i = 0; i < m_blocksWithNewObjects.size(); ++i)
- m_blocksWithNewObjects[i]->reapWeakSet();
- } else
- forEachBlock<ReapWeakSet>();
</del><ins>+ forEachBlock<ReapWeakSet>();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <typename Functor>
</span><span class="lines">@@ -316,24 +305,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#ifndef NDEBUG
-struct VerifyMarked : MarkedBlock::VoidFunctor {
- void operator()(MarkedBlock* block) { ASSERT(block->needsSweeping()); }
-};
-#endif
-
-void MarkedSpace::clearMarks()
-{
- if (m_heap->operationInProgress() == EdenCollection) {
- for (unsigned i = 0; i < m_blocksWithNewObjects.size(); ++i)
- m_blocksWithNewObjects[i]->clearMarks();
- } else
- forEachBlock<ClearMarks>();
-#ifndef NDEBUG
- forEachBlock<VerifyMarked>();
-#endif
-}
-
</del><span class="cx"> void MarkedSpace::willStartIterating()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!isIterating());
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapMarkedSpaceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/MarkedSpace.h (161556 => 161557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/MarkedSpace.h 2014-01-09 17:19:34 UTC (rev 161556)
+++ trunk/Source/JavaScriptCore/heap/MarkedSpace.h 2014-01-09 17:21:02 UTC (rev 161557)
</span><span class="lines">@@ -46,19 +46,9 @@
</span><span class="cx"> class SlotVisitor;
</span><span class="cx">
</span><span class="cx"> struct ClearMarks : MarkedBlock::VoidFunctor {
</span><del>- void operator()(MarkedBlock* block)
- {
- block->clearMarks();
- }
</del><ins>+ void operator()(MarkedBlock* block) { block->clearMarks(); }
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-struct ClearRememberedSet : MarkedBlock::VoidFunctor {
- void operator()(MarkedBlock* block)
- {
- block->clearRememberedSet();
- }
-};
-
</del><span class="cx"> struct Sweep : MarkedBlock::VoidFunctor {
</span><span class="cx"> void operator()(MarkedBlock* block) { block->sweep(); }
</span><span class="cx"> };
</span><span class="lines">@@ -115,10 +105,8 @@
</span><span class="cx">
</span><span class="cx"> void didAddBlock(MarkedBlock*);
</span><span class="cx"> void didConsumeFreeList(MarkedBlock*);
</span><del>- void didAllocateInBlock(MarkedBlock*);
</del><span class="cx">
</span><span class="cx"> void clearMarks();
</span><del>- void clearRememberedSet();
</del><span class="cx"> void clearNewlyAllocated();
</span><span class="cx"> void sweep();
</span><span class="cx"> size_t objectCount();
</span><span class="lines">@@ -162,7 +150,6 @@
</span><span class="cx"> size_t m_capacity;
</span><span class="cx"> bool m_isIterating;
</span><span class="cx"> MarkedBlockSet m_blocks;
</span><del>- Vector<MarkedBlock*> m_blocksWithNewObjects;
</del><span class="cx">
</span><span class="cx"> DelayedReleaseScope* m_currentDelayedReleaseScope;
</span><span class="cx"> };
</span><span class="lines">@@ -275,16 +262,11 @@
</span><span class="cx"> m_blocks.add(block);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void MarkedSpace::didAllocateInBlock(MarkedBlock* block)
</del><ins>+inline void MarkedSpace::clearMarks()
</ins><span class="cx"> {
</span><del>- m_blocksWithNewObjects.append(block);
</del><ins>+ forEachBlock<ClearMarks>();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-inline void MarkedSpace::clearRememberedSet()
-{
- forEachBlock<ClearRememberedSet>();
-}
-
</del><span class="cx"> inline size_t MarkedSpace::objectCount()
</span><span class="cx"> {
</span><span class="cx"> return forEachBlock<MarkCount>();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapSlotVisitorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/SlotVisitor.cpp (161556 => 161557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/SlotVisitor.cpp 2014-01-09 17:19:34 UTC (rev 161556)
+++ trunk/Source/JavaScriptCore/heap/SlotVisitor.cpp 2014-01-09 17:21:02 UTC (rev 161557)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx">
</span><span class="cx"> SlotVisitor::~SlotVisitor()
</span><span class="cx"> {
</span><del>- clearMarkStack();
</del><ins>+ ASSERT(m_stack.isEmpty());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SlotVisitor::setup()
</span><span class="lines">@@ -63,11 +63,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SlotVisitor::clearMarkStack()
-{
- m_stack.clear();
-}
-
</del><span class="cx"> void SlotVisitor::append(ConservativeRoots& conservativeRoots)
</span><span class="cx"> {
</span><span class="cx"> StackStats::probe();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapSlotVisitorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/SlotVisitor.h (161556 => 161557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/SlotVisitor.h 2014-01-09 17:19:34 UTC (rev 161556)
+++ trunk/Source/JavaScriptCore/heap/SlotVisitor.h 2014-01-09 17:21:02 UTC (rev 161557)
</span><span class="lines">@@ -49,10 +49,6 @@
</span><span class="cx"> SlotVisitor(GCThreadSharedData&);
</span><span class="cx"> ~SlotVisitor();
</span><span class="cx">
</span><del>- MarkStackArray& markStack() { return m_stack; }
-
- Heap* heap() const;
-
</del><span class="cx"> void append(ConservativeRoots&);
</span><span class="cx">
</span><span class="cx"> template<typename T> void append(JITWriteBarrier<T>*);
</span><span class="lines">@@ -65,19 +61,17 @@
</span><span class="cx"> void appendUnbarrieredValue(JSValue*);
</span><span class="cx"> template<typename T>
</span><span class="cx"> void appendUnbarrieredWeak(Weak<T>*);
</span><del>- void unconditionallyAppend(JSCell*);
</del><span class="cx">
</span><span class="cx"> void addOpaqueRoot(void*);
</span><span class="cx"> bool containsOpaqueRoot(void*);
</span><span class="cx"> TriState containsOpaqueRootTriState(void*);
</span><span class="cx"> int opaqueRootCount();
</span><span class="cx">
</span><del>- GCThreadSharedData& sharedData() const { return m_shared; }
</del><ins>+ GCThreadSharedData& sharedData() { return m_shared; }
</ins><span class="cx"> bool isEmpty() { return m_stack.isEmpty(); }
</span><span class="cx">
</span><span class="cx"> void setup();
</span><span class="cx"> void reset();
</span><del>- void clearMarkStack();
</del><span class="cx">
</span><span class="cx"> size_t bytesVisited() const { return m_bytesVisited; }
</span><span class="cx"> size_t bytesCopied() const { return m_bytesCopied; }
</span><span class="lines">@@ -95,7 +89,7 @@
</span><span class="cx">
</span><span class="cx"> void copyLater(JSCell*, CopyToken, void*, size_t);
</span><span class="cx">
</span><del>- void reportExtraMemoryUsage(JSCell* owner, size_t);
</del><ins>+ void reportExtraMemoryUsage(size_t size);
</ins><span class="cx">
</span><span class="cx"> void addWeakReferenceHarvester(WeakReferenceHarvester*);
</span><span class="cx"> void addUnconditionalFinalizer(UnconditionalFinalizer*);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapSlotVisitorInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/SlotVisitorInlines.h (161556 => 161557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/SlotVisitorInlines.h 2014-01-09 17:19:34 UTC (rev 161556)
+++ trunk/Source/JavaScriptCore/heap/SlotVisitorInlines.h 2014-01-09 17:21:02 UTC (rev 161557)
</span><span class="lines">@@ -105,14 +105,6 @@
</span><span class="cx">
</span><span class="cx"> MARK_LOG_CHILD(*this, cell);
</span><span class="cx">
</span><del>- unconditionallyAppend(cell);
-}
-
-ALWAYS_INLINE void SlotVisitor::unconditionallyAppend(JSCell* cell)
-{
- ASSERT(Heap::isMarked(cell));
- m_visitCount++;
-
</del><span class="cx"> // Should never attempt to mark something that is zapped.
</span><span class="cx"> ASSERT(!cell->isZapped());
</span><span class="cx">
</span><span class="lines">@@ -226,9 +218,6 @@
</span><span class="cx"> inline void SlotVisitor::copyLater(JSCell* owner, CopyToken token, void* ptr, size_t bytes)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(bytes);
</span><del>- // We don't do any copying during EdenCollections.
- ASSERT(heap()->operationInProgress() != EdenCollection);
-
</del><span class="cx"> m_bytesCopied += bytes;
</span><span class="cx">
</span><span class="cx"> CopiedBlock* block = CopiedSpace::blockFor(ptr);
</span><span class="lines">@@ -237,15 +226,14 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (block->isPinned())
+ return;
+
</ins><span class="cx"> block->reportLiveBytes(owner, token, bytes);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void SlotVisitor::reportExtraMemoryUsage(JSCell* owner, size_t size)
</del><ins>+inline void SlotVisitor::reportExtraMemoryUsage(size_t size)
</ins><span class="cx"> {
</span><del>- // We don't want to double-count the extra memory that was reported in previous collections.
- if (heap()->operationInProgress() == EdenCollection && MarkedBlock::blockFor(owner)->isRemembered(owner))
- return;
-
</del><span class="cx"> size_t* counter = &m_shared.m_vm->heap.m_extraMemoryUsage;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(COMPARE_AND_SWAP)
</span><span class="lines">@@ -259,11 +247,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline Heap* SlotVisitor::heap() const
-{
- return &sharedData().m_vm->heap;
-}
-
</del><span class="cx"> } // namespace JSC
</span><span class="cx">
</span><span class="cx"> #endif // SlotVisitorInlines_h
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitRepatchcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/Repatch.cpp (161556 => 161557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/Repatch.cpp 2014-01-09 17:19:34 UTC (rev 161556)
+++ trunk/Source/JavaScriptCore/jit/Repatch.cpp 2014-01-09 17:21:02 UTC (rev 161557)
</span><span class="lines">@@ -39,7 +39,6 @@
</span><span class="cx"> #include "PolymorphicPutByIdList.h"
</span><span class="cx"> #include "RepatchBuffer.h"
</span><span class="cx"> #include "ScratchRegisterAllocator.h"
</span><del>-#include "StackAlignment.h"
</del><span class="cx"> #include "StructureRareDataInlines.h"
</span><span class="cx"> #include "StructureStubClearingWatchpoint.h"
</span><span class="cx"> #include "ThunkGenerators.h"
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSGenericTypedArrayViewInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewInlines.h (161556 => 161557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewInlines.h 2014-01-09 17:19:34 UTC (rev 161556)
+++ trunk/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewInlines.h 2014-01-09 17:21:02 UTC (rev 161557)
</span><span class="lines">@@ -447,7 +447,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> case OversizeTypedArray: {
</span><del>- visitor.reportExtraMemoryUsage(thisObject, thisObject->byteSize());
</del><ins>+ visitor.reportExtraMemoryUsage(thisObject->byteSize());
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSPropertyNameIteratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSPropertyNameIterator.h (161556 => 161557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSPropertyNameIterator.h 2014-01-09 17:19:34 UTC (rev 161556)
+++ trunk/Source/JavaScriptCore/runtime/JSPropertyNameIterator.h 2014-01-09 17:21:02 UTC (rev 161557)
</span><span class="lines">@@ -109,9 +109,9 @@
</span><span class="cx"> return m_enumerationCache.get();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- inline void StructureRareData::setEnumerationCache(VM& vm, const Structure*, JSPropertyNameIterator* value)
</del><ins>+ inline void StructureRareData::setEnumerationCache(VM& vm, const Structure* owner, JSPropertyNameIterator* value)
</ins><span class="cx"> {
</span><del>- m_enumerationCache.set(vm, this, value);
</del><ins>+ m_enumerationCache.set(vm, owner, value);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSStringcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSString.cpp (161556 => 161557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSString.cpp 2014-01-09 17:19:34 UTC (rev 161556)
+++ trunk/Source/JavaScriptCore/runtime/JSString.cpp 2014-01-09 17:21:02 UTC (rev 161557)
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> else {
</span><span class="cx"> StringImpl* impl = thisObject->m_value.impl();
</span><span class="cx"> ASSERT(impl);
</span><del>- visitor.reportExtraMemoryUsage(thisObject, impl->costDuringGC());
</del><ins>+ visitor.reportExtraMemoryUsage(impl->costDuringGC());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeStructureRareDataInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/StructureRareDataInlines.h (161556 => 161557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/StructureRareDataInlines.h 2014-01-09 17:19:34 UTC (rev 161556)
+++ trunk/Source/JavaScriptCore/runtime/StructureRareDataInlines.h 2014-01-09 17:21:02 UTC (rev 161557)
</span><span class="lines">@@ -35,9 +35,9 @@
</span><span class="cx"> return m_previous.get();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void StructureRareData::setPreviousID(VM& vm, Structure*, Structure* structure)
</del><ins>+inline void StructureRareData::setPreviousID(VM& vm, Structure* transition, Structure* structure)
</ins><span class="cx"> {
</span><del>- m_previous.set(vm, this, structure);
</del><ins>+ m_previous.set(vm, transition, structure);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void StructureRareData::clearPreviousID()
</span><span class="lines">@@ -50,9 +50,9 @@
</span><span class="cx"> return m_objectToStringValue.get();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void StructureRareData::setObjectToStringValue(VM& vm, const JSCell*, JSString* value)
</del><ins>+inline void StructureRareData::setObjectToStringValue(VM& vm, const JSCell* owner, JSString* value)
</ins><span class="cx"> {
</span><del>- m_objectToStringValue.set(vm, this, value);
</del><ins>+ m_objectToStringValue.set(vm, owner, value);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeWeakMapDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/WeakMapData.cpp (161556 => 161557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/WeakMapData.cpp 2014-01-09 17:19:34 UTC (rev 161556)
+++ trunk/Source/JavaScriptCore/runtime/WeakMapData.cpp 2014-01-09 17:21:02 UTC (rev 161557)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> // Rough approximation of the external storage needed for the hashtable.
</span><span class="cx"> // This isn't exact, but it is close enough, and proportional to the actual
</span><span class="cx"> // external mermory usage.
</span><del>- visitor.reportExtraMemoryUsage(thisObj, thisObj->m_map.capacity() * (sizeof(JSObject*) + sizeof(WriteBarrier<Unknown>)));
</del><ins>+ visitor.reportExtraMemoryUsage(thisObj->m_map.capacity() * (sizeof(JSObject*) + sizeof(WriteBarrier<Unknown>)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WeakMapData::set(VM& vm, JSObject* key, JSValue value)
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (161556 => 161557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-01-09 17:19:34 UTC (rev 161556)
+++ trunk/Source/WTF/ChangeLog 2014-01-09 17:21:02 UTC (rev 161557)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-01-09 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r161540.
+ http://trac.webkit.org/changeset/161540
+ https://bugs.webkit.org/show_bug.cgi?id=126704
+
+ Caused assertion failures on multiple tests (Requested by ap
+ on #webkit).
+
+ * wtf/Bitmap.h:
+ (WTF::WordType>::count):
+
</ins><span class="cx"> 2014-01-07 Mark Hahnenberg <mhahnenberg@apple.com>
</span><span class="cx">
</span><span class="cx"> Marking should be generational
</span></span></pre></div>
<a id="trunkSourceWTFwtfBitmaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Bitmap.h (161556 => 161557)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Bitmap.h 2014-01-09 17:19:34 UTC (rev 161556)
+++ trunk/Source/WTF/wtf/Bitmap.h 2014-01-09 17:21:02 UTC (rev 161557)
</span><span class="lines">@@ -196,7 +196,7 @@
</span><span class="cx"> ++result;
</span><span class="cx"> }
</span><span class="cx"> for (size_t i = start / wordSize; i < words; ++i)
</span><del>- result += WTF::bitCount(static_cast<unsigned>(bits[i]));
</del><ins>+ result += WTF::bitCount(bits[i]);
</ins><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>