<!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>[184666] trunk/Source/JavaScriptCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/184666">184666</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2015-05-20 15:25:20 -0700 (Wed, 20 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove unused MarkedBlock::m_rememberedSet.
<https://webkit.org/b/145224>
Reviewed by Mark Hahnenberg.
The MarkedBlock had a copy of the remembered bit for each of its cells,
and we were maintaining that bitmap despite no one actually ever consulting it.
This patch removes MarkedBlock::m_rememberedSet, freeing up 128 bytes in each
block and making write barriers a little faster.
* heap/Heap.cpp:
(JSC::Heap::clearRememberedSet):
(JSC::Heap::addToRememberedSet):
* heap/HeapInlines.h:
(JSC::Heap::isRemembered):
* heap/MarkedBlock.cpp:
(JSC::MarkedBlock::clearRememberedSet): Deleted.
(JSC::MarkedBlock::clearMarksWithCollectionType):
* heap/MarkedBlock.h:
(JSC::MarkedBlock::setRemembered): Deleted.
(JSC::MarkedBlock::clearRemembered): Deleted.
(JSC::MarkedBlock::atomicClearRemembered): Deleted.
(JSC::MarkedBlock::isRemembered): Deleted.
* heap/MarkedSpace.h:
(JSC::ClearRememberedSet::operator()): Deleted.
(JSC::MarkedSpace::clearRememberedSet): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapHeapcpp">trunk/Source/JavaScriptCore/heap/Heap.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapHeapInlinesh">trunk/Source/JavaScriptCore/heap/HeapInlines.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="#trunkSourceJavaScriptCoreheapMarkedSpaceh">trunk/Source/JavaScriptCore/heap/MarkedSpace.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (184665 => 184666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-05-20 22:23:23 UTC (rev 184665)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-05-20 22:25:20 UTC (rev 184666)
</span><span class="lines">@@ -1,5 +1,35 @@
</span><span class="cx"> 2015-05-20 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><ins>+ Remove unused MarkedBlock::m_rememberedSet.
+ <https://webkit.org/b/145224>
+
+ Reviewed by Mark Hahnenberg.
+
+ The MarkedBlock had a copy of the remembered bit for each of its cells,
+ and we were maintaining that bitmap despite no one actually ever consulting it.
+
+ This patch removes MarkedBlock::m_rememberedSet, freeing up 128 bytes in each
+ block and making write barriers a little faster.
+
+ * heap/Heap.cpp:
+ (JSC::Heap::clearRememberedSet):
+ (JSC::Heap::addToRememberedSet):
+ * heap/HeapInlines.h:
+ (JSC::Heap::isRemembered):
+ * heap/MarkedBlock.cpp:
+ (JSC::MarkedBlock::clearRememberedSet): Deleted.
+ (JSC::MarkedBlock::clearMarksWithCollectionType):
+ * heap/MarkedBlock.h:
+ (JSC::MarkedBlock::setRemembered): Deleted.
+ (JSC::MarkedBlock::clearRemembered): Deleted.
+ (JSC::MarkedBlock::atomicClearRemembered): Deleted.
+ (JSC::MarkedBlock::isRemembered): Deleted.
+ * heap/MarkedSpace.h:
+ (JSC::ClearRememberedSet::operator()): Deleted.
+ (JSC::MarkedSpace::clearRememberedSet): Deleted.
+
+2015-05-20 Andreas Kling <akling@apple.com>
+
</ins><span class="cx"> Eden collections should extend the IncrementalSweeper work list, not replace it.
</span><span class="cx"> <https://webkit.org/b/145213>
</span><span class="cx"> <rdar://problem/21002666>
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapHeapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/Heap.cpp (184665 => 184666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/Heap.cpp 2015-05-20 22:23:23 UTC (rev 184665)
+++ trunk/Source/JavaScriptCore/heap/Heap.cpp 2015-05-20 22:25:20 UTC (rev 184666)
</span><span class="lines">@@ -798,10 +798,8 @@
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(GGC)
</span><span class="cx"> GCPHASE(ClearRememberedSet);
</span><del>- for (auto* cell : rememberedSet) {
- MarkedBlock::blockFor(cell)->clearRemembered(cell);
</del><ins>+ for (auto* cell : rememberedSet)
</ins><span class="cx"> const_cast<JSCell*>(cell)->setRemembered(false);
</span><del>- }
</del><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(rememberedSet);
</span><span class="cx"> #endif
</span><span class="lines">@@ -975,7 +973,6 @@
</span><span class="cx"> ASSERT(!Options::enableConcurrentJIT() || !isCompilationThread());
</span><span class="cx"> if (isRemembered(cell))
</span><span class="cx"> return;
</span><del>- MarkedBlock::blockFor(cell)->setRemembered(cell);
</del><span class="cx"> const_cast<JSCell*>(cell)->setRemembered(true);
</span><span class="cx"> m_slotVisitor.unconditionallyAppend(const_cast<JSCell*>(cell));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapHeapInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/HeapInlines.h (184665 => 184666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/HeapInlines.h 2015-05-20 22:23:23 UTC (rev 184665)
+++ trunk/Source/JavaScriptCore/heap/HeapInlines.h 2015-05-20 22:25:20 UTC (rev 184666)
</span><span class="lines">@@ -75,7 +75,6 @@
</span><span class="cx"> const JSCell* cell = static_cast<const JSCell*>(ptr);
</span><span class="cx"> ASSERT(cell);
</span><span class="cx"> ASSERT(!Options::enableConcurrentJIT() || !isCompilationThread());
</span><del>- ASSERT(MarkedBlock::blockFor(cell)->isRemembered(cell) == cell->isRemembered());
</del><span class="cx"> return cell->isRemembered();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapMarkedBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/MarkedBlock.cpp (184665 => 184666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/MarkedBlock.cpp 2015-05-20 22:23:23 UTC (rev 184665)
+++ trunk/Source/JavaScriptCore/heap/MarkedBlock.cpp 2015-05-20 22:25:20 UTC (rev 184666)
</span><span class="lines">@@ -218,11 +218,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MarkedBlock::clearRememberedSet()
-{
- m_rememberedSet.clearAll();
-}
-
</del><span class="cx"> template <HeapOperation collectionType>
</span><span class="cx"> void MarkedBlock::clearMarksWithCollectionType()
</span><span class="cx"> {
</span><span class="lines">@@ -232,9 +227,6 @@
</span><span class="cx"> ASSERT(m_state != New && m_state != FreeListed);
</span><span class="cx"> if (collectionType == FullCollection) {
</span><span class="cx"> m_marks.clearAll();
</span><del>-#if ENABLE(GGC)
- m_rememberedSet.clearAll();
-#endif
</del><span class="cx"> // This will become true at the end of the mark phase. We set it now to
</span><span class="cx"> // avoid an extra pass to do so later.
</span><span class="cx"> m_state = Marked;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapMarkedBlockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/MarkedBlock.h (184665 => 184666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/MarkedBlock.h 2015-05-20 22:23:23 UTC (rev 184665)
+++ trunk/Source/JavaScriptCore/heap/MarkedBlock.h 2015-05-20 22:25:20 UTC (rev 184666)
</span><span class="lines">@@ -147,7 +147,6 @@
</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();
</del><span class="cx"> template <HeapOperation collectionType>
</span><span class="cx"> void clearMarksWithCollectionType();
</span><span class="cx">
</span><span class="lines">@@ -209,10 +208,8 @@
</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><span class="cx"> WTF::Bitmap<atomsPerBlock, WTF::BitmapAtomic, uint8_t> m_marks;
</span><del>- WTF::Bitmap<atomsPerBlock, WTF::BitmapAtomic, uint8_t> m_rememberedSet;
</del><span class="cx"> #else
</span><span class="cx"> WTF::Bitmap<atomsPerBlock, WTF::BitmapNotAtomic, uint8_t> m_marks;
</span><del>- WTF::Bitmap<atomsPerBlock, WTF::BitmapNotAtomic, uint8_t> m_rememberedSet;
</del><span class="cx"> #endif
</span><span class="cx"> std::unique_ptr<WTF::Bitmap<atomsPerBlock>> m_newlyAllocated;
</span><span class="cx">
</span><span class="lines">@@ -347,26 +344,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="trunkSourceJavaScriptCoreheapMarkedSpaceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/MarkedSpace.h (184665 => 184666)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/MarkedSpace.h 2015-05-20 22:23:23 UTC (rev 184665)
+++ trunk/Source/JavaScriptCore/heap/MarkedSpace.h 2015-05-20 22:25:20 UTC (rev 184666)
</span><span class="lines">@@ -51,13 +51,6 @@
</span><span class="cx"> }
</span><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">@@ -142,7 +135,6 @@
</span><span class="cx"> void didAllocateInBlock(MarkedBlock*);
</span><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"> void zombifySweep();
</span><span class="lines">@@ -277,11 +269,6 @@
</span><span class="cx"> #endif
</span><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>
</div>
</body>
</html>