<!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>[164097] trunk/Source/WTF</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/164097">164097</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-02-14 03:14:56 -0800 (Fri, 14 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>(try)append and insert operations don't need new operator for PODs
https://bugs.webkit.org/show_bug.cgi?id=128185
Patch by Wojciech Bielawski <w.bielawski@samsung.com> on 2014-02-14
Reviewed by Darin Adler.
Vector's methods use VectorCopier to copy data.
VectorCopier for PODs exteded to be used with different types. For different types placement new copy approach is applied. For the same types memcpy is applied.
* wtf/Vector.h:
(WTF::OverflowHandler>::append): use VectorCopier to copy data.
(WTF::OverflowHandler>::tryAppend): use VectorCopier to copy data.
(WTF::OverflowHandler>::insert): use VectorCopier to copy data.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfVectorh">trunk/Source/WTF/wtf/Vector.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (164096 => 164097)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-02-14 11:10:28 UTC (rev 164096)
+++ trunk/Source/WTF/ChangeLog 2014-02-14 11:14:56 UTC (rev 164097)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-02-14 Wojciech Bielawski <w.bielawski@samsung.com>
+
+ (try)append and insert operations don't need new operator for PODs
+ https://bugs.webkit.org/show_bug.cgi?id=128185
+
+ Reviewed by Darin Adler.
+
+ Vector's methods use VectorCopier to copy data.
+ VectorCopier for PODs exteded to be used with different types. For different types placement new copy approach is applied. For the same types memcpy is applied.
+
+ * wtf/Vector.h:
+ (WTF::OverflowHandler>::append): use VectorCopier to copy data.
+ (WTF::OverflowHandler>::tryAppend): use VectorCopier to copy data.
+ (WTF::OverflowHandler>::insert): use VectorCopier to copy data.
+
</ins><span class="cx"> 2014-02-13 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix the iOS build after <http://trac.webkit.org/changeset/164064
</span></span></pre></div>
<a id="trunkSourceWTFwtfVectorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Vector.h (164096 => 164097)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Vector.h 2014-02-14 11:10:28 UTC (rev 164096)
+++ trunk/Source/WTF/wtf/Vector.h 2014-02-14 11:14:56 UTC (rev 164097)
</span><span class="lines">@@ -136,10 +136,11 @@
</span><span class="cx"> template<typename T>
</span><span class="cx"> struct VectorCopier<false, T>
</span><span class="cx"> {
</span><del>- static void uninitializedCopy(const T* src, const T* srcEnd, T* dst)
</del><ins>+ template<typename U>
+ static void uninitializedCopy(const T* src, const T* srcEnd, U* dst)
</ins><span class="cx"> {
</span><span class="cx"> while (src != srcEnd) {
</span><del>- new (NotNull, dst) T(*src);
</del><ins>+ new (NotNull, dst) U(*src);
</ins><span class="cx"> ++dst;
</span><span class="cx"> ++src;
</span><span class="cx"> }
</span><span class="lines">@@ -149,10 +150,15 @@
</span><span class="cx"> template<typename T>
</span><span class="cx"> struct VectorCopier<true, T>
</span><span class="cx"> {
</span><del>- static void uninitializedCopy(const T* src, const T* srcEnd, T* dst)
</del><ins>+ static void uninitializedCopy(const T* src, const T* srcEnd, T* dst)
</ins><span class="cx"> {
</span><span class="cx"> memcpy(dst, src, reinterpret_cast<const char*>(srcEnd) - reinterpret_cast<const char*>(src));
</span><span class="cx"> }
</span><ins>+ template<typename U>
+ static void uninitializedCopy(const T* src, const T* srcEnd, U* dst)
+ {
+ VectorCopier<false, T>::uninitializedCopy(src, srcEnd, dst);
+ }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template <bool canFillWithMemset, typename T>
</span><span class="lines">@@ -1004,7 +1010,6 @@
</span><span class="cx"> // Templatizing these is better than just letting the conversion happen implicitly,
</span><span class="cx"> // because for instance it allows a PassRefPtr to be appended to a RefPtr vector
</span><span class="cx"> // without refcount thrash.
</span><del>-
</del><span class="cx"> template<typename T, size_t inlineCapacity, typename OverflowHandler> template<typename U>
</span><span class="cx"> void Vector<T, inlineCapacity, OverflowHandler>::append(const U* data, size_t dataSize)
</span><span class="cx"> {
</span><span class="lines">@@ -1016,8 +1021,7 @@
</span><span class="cx"> if (newSize < m_size)
</span><span class="cx"> CRASH();
</span><span class="cx"> T* dest = end();
</span><del>- for (size_t i = 0; i < dataSize; ++i)
- new (NotNull, &dest[i]) T(data[i]);
</del><ins>+ VectorCopier<std::is_trivial<T>::value, U>::uninitializedCopy(data, &data[dataSize], dest);
</ins><span class="cx"> m_size = newSize;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1034,8 +1038,7 @@
</span><span class="cx"> if (newSize < m_size)
</span><span class="cx"> return false;
</span><span class="cx"> T* dest = end();
</span><del>- for (size_t i = 0; i < dataSize; ++i)
- new (NotNull, &dest[i]) T(data[i]);
</del><ins>+ VectorCopier<std::is_trivial<T>::value, U>::uninitializedCopy(data, &data[dataSize], dest);
</ins><span class="cx"> m_size = newSize;
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -1097,8 +1100,7 @@
</span><span class="cx"> CRASH();
</span><span class="cx"> T* spot = begin() + position;
</span><span class="cx"> TypeOperations::moveOverlapping(spot, end(), spot + dataSize);
</span><del>- for (size_t i = 0; i < dataSize; ++i)
- new (NotNull, &spot[i]) T(data[i]);
</del><ins>+ VectorCopier<std::is_trivial<T>::value, U>::uninitializedCopy(data, &data[dataSize], spot);
</ins><span class="cx"> m_size = newSize;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>