<!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>[206709] 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/206709">206709</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2016-10-01 14:14:19 -0700 (Sat, 01 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Get rid of isMarkedOrNewlyAllocated
https://bugs.webkit.org/show_bug.cgi?id=162842
Reviewed by Dan Bernstein.
This function has become dead code. This change removes it.
* heap/CellContainer.h:
* heap/CellContainerInlines.h:
(JSC::CellContainer::isMarkedOrNewlyAllocated): Deleted.
* heap/LargeAllocation.h:
(JSC::LargeAllocation::isLive):
(JSC::LargeAllocation::isMarkedOrNewlyAllocated): Deleted.
* heap/MarkedBlock.cpp:
(JSC::MarkedBlock::Handle::isMarkedOrNewlyAllocated): Deleted.
(JSC::MarkedBlock::isMarkedOrNewlyAllocated): Deleted.
* heap/MarkedBlock.h:
(JSC::MarkedBlock::Handle::isMarkedOrNewlyAllocated): Deleted.
(JSC::MarkedBlock::isMarkedOrNewlyAllocated): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapCellContainerh">trunk/Source/JavaScriptCore/heap/CellContainer.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapCellContainerInlinesh">trunk/Source/JavaScriptCore/heap/CellContainerInlines.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapLargeAllocationh">trunk/Source/JavaScriptCore/heap/LargeAllocation.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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (206708 => 206709)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-10-01 16:31:44 UTC (rev 206708)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-10-01 21:14:19 UTC (rev 206709)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-10-01 Filip Pizlo <fpizlo@apple.com>
+
+ Get rid of isMarkedOrNewlyAllocated
+ https://bugs.webkit.org/show_bug.cgi?id=162842
+
+ Reviewed by Dan Bernstein.
+
+ This function has become dead code. This change removes it.
+
+ * heap/CellContainer.h:
+ * heap/CellContainerInlines.h:
+ (JSC::CellContainer::isMarkedOrNewlyAllocated): Deleted.
+ * heap/LargeAllocation.h:
+ (JSC::LargeAllocation::isLive):
+ (JSC::LargeAllocation::isMarkedOrNewlyAllocated): Deleted.
+ * heap/MarkedBlock.cpp:
+ (JSC::MarkedBlock::Handle::isMarkedOrNewlyAllocated): Deleted.
+ (JSC::MarkedBlock::isMarkedOrNewlyAllocated): Deleted.
+ * heap/MarkedBlock.h:
+ (JSC::MarkedBlock::Handle::isMarkedOrNewlyAllocated): Deleted.
+ (JSC::MarkedBlock::isMarkedOrNewlyAllocated): Deleted.
+
</ins><span class="cx"> 2016-10-01 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Rename DebugHookID to DebugHookType
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapCellContainerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/CellContainer.h (206708 => 206709)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/CellContainer.h 2016-10-01 16:31:44 UTC (rev 206708)
+++ trunk/Source/JavaScriptCore/heap/CellContainer.h 2016-10-01 21:14:19 UTC (rev 206709)
</span><span class="lines">@@ -83,8 +83,6 @@
</span><span class="cx">
</span><span class="cx"> bool isMarked(HeapCell*) const;
</span><span class="cx"> bool isMarked(HeapVersion markingVersion, HeapCell*) const;
</span><del>- bool isMarkedOrNewlyAllocated(HeapCell*) const;
- bool isMarkedOrNewlyAllocated(HeapVersion markingVersion, HeapCell*) const;
</del><span class="cx">
</span><span class="cx"> void noteMarked();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapCellContainerInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/CellContainerInlines.h (206708 => 206709)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/CellContainerInlines.h 2016-10-01 16:31:44 UTC (rev 206708)
+++ trunk/Source/JavaScriptCore/heap/CellContainerInlines.h 2016-10-01 21:14:19 UTC (rev 206709)
</span><span class="lines">@@ -59,20 +59,6 @@
</span><span class="cx"> return markedBlock().isMarked(markingVersion, cell);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline bool CellContainer::isMarkedOrNewlyAllocated(HeapCell* cell) const
-{
- if (isLargeAllocation())
- return largeAllocation().isMarkedOrNewlyAllocated();
- return markedBlock().isMarkedOrNewlyAllocated(cell);
-}
-
-inline bool CellContainer::isMarkedOrNewlyAllocated(HeapVersion markingVersion, HeapCell* cell) const
-{
- if (isLargeAllocation())
- return largeAllocation().isMarkedOrNewlyAllocated();
- return markedBlock().isMarkedOrNewlyAllocated(markingVersion, cell);
-}
-
</del><span class="cx"> inline void CellContainer::noteMarked()
</span><span class="cx"> {
</span><span class="cx"> if (!isLargeAllocation())
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapLargeAllocationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/LargeAllocation.h (206708 => 206709)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/LargeAllocation.h 2016-10-01 16:31:44 UTC (rev 206708)
+++ trunk/Source/JavaScriptCore/heap/LargeAllocation.h 2016-10-01 21:14:19 UTC (rev 206709)
</span><span class="lines">@@ -72,9 +72,7 @@
</span><span class="cx"> ALWAYS_INLINE bool isMarked() { return m_isMarked.load(std::memory_order_relaxed); }
</span><span class="cx"> ALWAYS_INLINE bool isMarked(HeapCell*) { return m_isMarked.load(std::memory_order_relaxed); }
</span><span class="cx"> ALWAYS_INLINE bool isMarkedConcurrently(HeapVersion, HeapCell*) { return m_isMarked.load(std::memory_order_relaxed); }
</span><del>- bool isMarkedOrNewlyAllocated() { return isMarked() || isNewlyAllocated(); }
- bool isMarkedOrNewlyAllocated(HeapCell*) { return isMarkedOrNewlyAllocated(); }
- bool isLive() { return isMarkedOrNewlyAllocated(); }
</del><ins>+ bool isLive() { return isMarked() || isNewlyAllocated(); }
</ins><span class="cx">
</span><span class="cx"> bool hasValidCell() const { return m_hasValidCell; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapMarkedBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/MarkedBlock.cpp (206708 => 206709)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/MarkedBlock.cpp 2016-10-01 16:31:44 UTC (rev 206708)
+++ trunk/Source/JavaScriptCore/heap/MarkedBlock.cpp 2016-10-01 21:14:19 UTC (rev 206709)
</span><span class="lines">@@ -388,16 +388,6 @@
</span><span class="cx"> return isMarked(vm()->heap.objectSpace().markingVersion(), p);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool MarkedBlock::Handle::isMarkedOrNewlyAllocated(const HeapCell* cell)
-{
- return isMarkedOrNewlyAllocated(vm()->heap.objectSpace().markingVersion(), cell);
-}
-
-bool MarkedBlock::isMarkedOrNewlyAllocated(const HeapCell* cell)
-{
- return isMarkedOrNewlyAllocated(vm()->heap.objectSpace().markingVersion(), cell);
-}
-
</del><span class="cx"> void MarkedBlock::Handle::didConsumeFreeList()
</span><span class="cx"> {
</span><span class="cx"> if (false)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapMarkedBlockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/MarkedBlock.h (206708 => 206709)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/MarkedBlock.h 2016-10-01 16:31:44 UTC (rev 206708)
+++ trunk/Source/JavaScriptCore/heap/MarkedBlock.h 2016-10-01 21:14:19 UTC (rev 206709)
</span><span class="lines">@@ -160,9 +160,6 @@
</span><span class="cx"> bool isLive(const HeapCell*);
</span><span class="cx"> bool isLiveCell(const void*);
</span><span class="cx">
</span><del>- bool isMarkedOrNewlyAllocated(const HeapCell*);
- bool isMarkedOrNewlyAllocated(HeapVersion markingVersion, const HeapCell*);
-
</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">@@ -256,9 +253,6 @@
</span><span class="cx"> bool isMarkedConcurrently(HeapVersion markingVersion, const void*);
</span><span class="cx"> bool testAndSetMarked(const void*);
</span><span class="cx">
</span><del>- bool isMarkedOrNewlyAllocated(const HeapCell*);
- bool isMarkedOrNewlyAllocated(HeapVersion markingVersion, const HeapCell*);
-
</del><span class="cx"> bool isAtom(const void*);
</span><span class="cx"> void clearMarked(const void*);
</span><span class="cx">
</span><span class="lines">@@ -549,16 +543,6 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline bool MarkedBlock::Handle::isMarkedOrNewlyAllocated(HeapVersion markingVersion, const HeapCell* cell)
-{
- return m_block->isMarked(markingVersion, cell) || (m_newlyAllocated && isNewlyAllocated(cell));
-}
-
-inline bool MarkedBlock::isMarkedOrNewlyAllocated(HeapVersion markingVersion, const HeapCell* cell)
-{
- return isMarked(markingVersion, cell) || (m_handle.m_newlyAllocated && m_handle.isNewlyAllocated(cell));
-}
-
</del><span class="cx"> inline bool MarkedBlock::isAtom(const void* p)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(MarkedBlock::isAtomAligned(p));
</span></span></pre>
</div>
</div>
</body>
</html>