<!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>[185639] 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/185639">185639</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2015-06-16 22:18:21 -0700 (Tue, 16 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove unused template parameter InlineCapacity from SegmentedVector.
<https://webkit.org/b/146044>
Reviewed by Anders Carlsson.
Source/JavaScriptCore:
* bytecode/ArrayProfile.h:
* dfg/DFGCommonData.h:
Source/WTF:
* wtf/SegmentedVector.h:
(WTF::SegmentedVectorIterator::operator=):
(WTF::SegmentedVectorIterator::SegmentedVectorIterator):
(WTF::SegmentedVector::at):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeArrayProfileh">trunk/Source/JavaScriptCore/bytecode/ArrayProfile.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGCommonDatah">trunk/Source/JavaScriptCore/dfg/DFGCommonData.h</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfSegmentedVectorh">trunk/Source/WTF/wtf/SegmentedVector.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (185638 => 185639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-06-17 05:11:49 UTC (rev 185638)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-06-17 05:18:21 UTC (rev 185639)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-06-16 Andreas Kling <akling@apple.com>
+
+ Remove unused template parameter InlineCapacity from SegmentedVector.
+ <https://webkit.org/b/146044>
+
+ Reviewed by Anders Carlsson.
+
+ * bytecode/ArrayProfile.h:
+ * dfg/DFGCommonData.h:
+
</ins><span class="cx"> 2015-06-16 Michael Saboff <msaboff@apple.com>
</span><span class="cx">
</span><span class="cx"> Inlining in the DFG trashes ByteCodeParser::m_currentInstruction for the calling function
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeArrayProfileh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/ArrayProfile.h (185638 => 185639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/ArrayProfile.h 2015-06-17 05:11:49 UTC (rev 185638)
+++ trunk/Source/JavaScriptCore/bytecode/ArrayProfile.h 2015-06-17 05:18:21 UTC (rev 185639)
</span><span class="lines">@@ -247,7 +247,7 @@
</span><span class="cx"> ArrayModes m_observedArrayModes;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-typedef SegmentedVector<ArrayProfile, 4, 0> ArrayProfileVector;
</del><ins>+typedef SegmentedVector<ArrayProfile, 4> ArrayProfileVector;
</ins><span class="cx">
</span><span class="cx"> } // namespace JSC
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGCommonDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGCommonData.h (185638 => 185639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGCommonData.h 2015-06-17 05:11:49 UTC (rev 185638)
+++ trunk/Source/JavaScriptCore/dfg/DFGCommonData.h 2015-06-17 05:18:21 UTC (rev 185639)
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> Vector<WeakReferenceTransition> transitions;
</span><span class="cx"> Vector<WriteBarrier<JSCell>> weakReferences;
</span><span class="cx"> Vector<WriteBarrier<Structure>> weakStructureReferences;
</span><del>- SegmentedVector<CodeBlockJettisoningWatchpoint, 1, 0> watchpoints;
</del><ins>+ SegmentedVector<CodeBlockJettisoningWatchpoint, 1> watchpoints;
</ins><span class="cx"> Vector<JumpReplacement> jumpReplacements;
</span><span class="cx">
</span><span class="cx"> RefPtr<Profiler::Compilation> compilation;
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (185638 => 185639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2015-06-17 05:11:49 UTC (rev 185638)
+++ trunk/Source/WTF/ChangeLog 2015-06-17 05:18:21 UTC (rev 185639)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-06-16 Andreas Kling <akling@apple.com>
+
+ Remove unused template parameter InlineCapacity from SegmentedVector.
+ <https://webkit.org/b/146044>
+
+ Reviewed by Anders Carlsson.
+
+ * wtf/SegmentedVector.h:
+ (WTF::SegmentedVectorIterator::operator=):
+ (WTF::SegmentedVectorIterator::SegmentedVectorIterator):
+ (WTF::SegmentedVector::at):
+
</ins><span class="cx"> 2015-06-16 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> Use NakedPtr<Exception>& to return exception results.
</span></span></pre></div>
<a id="trunkSourceWTFwtfSegmentedVectorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/SegmentedVector.h (185638 => 185639)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/SegmentedVector.h 2015-06-17 05:11:49 UTC (rev 185638)
+++ trunk/Source/WTF/wtf/SegmentedVector.h 2015-06-17 05:18:21 UTC (rev 185639)
</span><span class="lines">@@ -35,12 +35,12 @@
</span><span class="cx"> namespace WTF {
</span><span class="cx">
</span><span class="cx"> // An iterator for SegmentedVector. It supports only the pre ++ operator
</span><del>- template <typename T, size_t SegmentSize = 8, size_t InlineCapacity = 32> class SegmentedVector;
- template <typename T, size_t SegmentSize = 8, size_t InlineCapacity = 32> class SegmentedVectorIterator {
</del><ins>+ template <typename T, size_t SegmentSize = 8> class SegmentedVector;
+ template <typename T, size_t SegmentSize = 8> class SegmentedVectorIterator {
</ins><span class="cx"> private:
</span><del>- friend class SegmentedVector<T, SegmentSize, InlineCapacity>;
</del><ins>+ friend class SegmentedVector<T, SegmentSize>;
</ins><span class="cx"> public:
</span><del>- typedef SegmentedVectorIterator<T, SegmentSize, InlineCapacity> Iterator;
</del><ins>+ typedef SegmentedVectorIterator<T, SegmentSize> Iterator;
</ins><span class="cx">
</span><span class="cx"> ~SegmentedVectorIterator() { }
</span><span class="cx">
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx"> return m_index != other.m_index || m_segment != other.m_segment || &m_vector != &other.m_vector;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- SegmentedVectorIterator& operator=(const SegmentedVectorIterator<T, SegmentSize, InlineCapacity>& other)
</del><ins>+ SegmentedVectorIterator& operator=(const SegmentedVectorIterator<T, SegmentSize>& other)
</ins><span class="cx"> {
</span><span class="cx"> m_vector = other.m_vector;
</span><span class="cx"> m_segment = other.m_segment;
</span><span class="lines">@@ -85,14 +85,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- SegmentedVectorIterator(SegmentedVector<T, SegmentSize, InlineCapacity>& vector, size_t segment, size_t index)
</del><ins>+ SegmentedVectorIterator(SegmentedVector<T, SegmentSize>& vector, size_t segment, size_t index)
</ins><span class="cx"> : m_vector(vector)
</span><span class="cx"> , m_segment(segment)
</span><span class="cx"> , m_index(index)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- SegmentedVector<T, SegmentSize, InlineCapacity>& m_vector;
</del><ins>+ SegmentedVector<T, SegmentSize>& m_vector;
</ins><span class="cx"> size_t m_segment;
</span><span class="cx"> size_t m_index;
</span><span class="cx"> };
</span><span class="lines">@@ -101,14 +101,14 @@
</span><span class="cx"> // stored in its buffer when it grows. Therefore, it is safe to keep
</span><span class="cx"> // pointers into a SegmentedVector. The default tuning values are
</span><span class="cx"> // optimized for segmented vectors that get large; you may want to use
</span><del>- // SegmentedVector<thingy, 1, 0> if you don't expect a lot of entries.
- template <typename T, size_t SegmentSize, size_t InlineCapacity>
</del><ins>+ // SegmentedVector<thingy, 1> if you don't expect a lot of entries.
+ template <typename T, size_t SegmentSize>
</ins><span class="cx"> class SegmentedVector {
</span><del>- friend class SegmentedVectorIterator<T, SegmentSize, InlineCapacity>;
</del><ins>+ friend class SegmentedVectorIterator<T, SegmentSize>;
</ins><span class="cx"> WTF_MAKE_NONCOPYABLE(SegmentedVector);
</span><span class="cx">
</span><span class="cx"> public:
</span><del>- typedef SegmentedVectorIterator<T, SegmentSize, InlineCapacity> Iterator;
</del><ins>+ typedef SegmentedVectorIterator<T, SegmentSize> Iterator;
</ins><span class="cx">
</span><span class="cx"> SegmentedVector()
</span><span class="cx"> : m_size(0)
</span><span class="lines">@@ -130,7 +130,7 @@
</span><span class="cx">
</span><span class="cx"> const T& at(size_t index) const
</span><span class="cx"> {
</span><del>- return const_cast<SegmentedVector<T, SegmentSize, InlineCapacity>*>(this)->at(index);
</del><ins>+ return const_cast<SegmentedVector<T, SegmentSize>*>(this)->at(index);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> T& operator[](size_t index)
</span></span></pre>
</div>
</div>
</body>
</html>