<!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>[209778] 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/209778">209778</a></dd>
<dt>Author</dt> <dd>jfbastien@apple.com</dd>
<dt>Date</dt> <dd>2016-12-13 14:27:48 -0800 (Tue, 13 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>std::expected: fix rvalue forwarding issues
https://bugs.webkit.org/show_bug.cgi?id=165812
Reviewed by Mark Lam.
* wtf/Expected.h:
(WTF::UnexpectedType::UnexpectedType):
(WTF::ExpectedDetail::Base::Base):
(WTF::Expected::Expected):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfExpectedh">trunk/Source/WTF/wtf/Expected.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (209777 => 209778)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-12-13 22:15:13 UTC (rev 209777)
+++ trunk/Source/WTF/ChangeLog 2016-12-13 22:27:48 UTC (rev 209778)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-12-13 JF Bastien <jfbastien@apple.com>
+
+ std::expected: fix rvalue forwarding issues
+ https://bugs.webkit.org/show_bug.cgi?id=165812
+
+ Reviewed by Mark Lam.
+
+ * wtf/Expected.h:
+ (WTF::UnexpectedType::UnexpectedType):
+ (WTF::ExpectedDetail::Base::Base):
+ (WTF::Expected::Expected):
+
</ins><span class="cx"> 2016-12-13 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r209544.
</span></span></pre></div>
<a id="trunkSourceWTFwtfExpectedh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Expected.h (209777 => 209778)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Expected.h 2016-12-13 22:15:13 UTC (rev 209777)
+++ trunk/Source/WTF/wtf/Expected.h 2016-12-13 22:27:48 UTC (rev 209778)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> public:
</span><span class="cx"> UnexpectedType() = delete;
</span><span class="cx"> constexpr explicit UnexpectedType(const E& e) : val(e) { }
</span><del>- constexpr explicit UnexpectedType(E&& e) : val(WTFMove(e)) { }
</del><ins>+ constexpr explicit UnexpectedType(E&& e) : val(std::forward<E>(e)) { }
</ins><span class="cx"> constexpr const E& value() const { return val; }
</span><span class="cx"> RELAXED_CONSTEXPR E& value() { return val; }
</span><span class="cx">
</span><span class="lines">@@ -104,7 +104,9 @@
</span><span class="cx"> constexpr Storage(ValueTagType) : val() { }
</span><span class="cx"> constexpr Storage(ErrorTagType) : err() { }
</span><span class="cx"> constexpr Storage(ValueTagType, const ValueType& val) : val(val) { }
</span><ins>+ constexpr Storage(ValueTagType, ValueType&& val) : val(std::forward<ValueType>(val)) { }
</ins><span class="cx"> constexpr Storage(ErrorTagType, const ErrorType& err) : err(err) { }
</span><ins>+ constexpr Storage(ErrorTagType, ErrorType&& err) : err(std::forward<ErrorType>(err)) { }
</ins><span class="cx"> ~Storage() { }
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -131,6 +133,7 @@
</span><span class="cx"> constexpr Storage(ValueTagType) : dummy() { }
</span><span class="cx"> constexpr Storage(ErrorTagType) : err() { }
</span><span class="cx"> constexpr Storage(ErrorTagType, const ErrorType& err) : err(err) { }
</span><ins>+ constexpr Storage(ErrorTagType, ErrorType&& err) : err(std::forward<ErrorType>(err)) { }
</ins><span class="cx"> ~Storage() { }
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -158,7 +161,9 @@
</span><span class="cx"> constexpr Base(ValueTagType tag) : s(tag), has(true) { }
</span><span class="cx"> constexpr Base(ErrorTagType tag) : s(tag), has(false) { }
</span><span class="cx"> constexpr Base(ValueTagType tag, const ValueType& val) : s(tag, val), has(true) { }
</span><ins>+ constexpr Base(ValueTagType tag, ValueType&& val) : s(tag, std::forward<ValueType>(val)), has(true) { }
</ins><span class="cx"> constexpr Base(ErrorTagType tag, const ErrorType& err) : s(tag, err), has(false) { }
</span><ins>+ constexpr Base(ErrorTagType tag, ErrorType&& err) : s(tag, std::forward<ErrorType>(err)), has(false) { }
</ins><span class="cx"> Base(const Base& o)
</span><span class="cx"> : has(o.has)
</span><span class="cx"> {
</span><span class="lines">@@ -254,7 +259,7 @@
</span><span class="cx"> Expected(const Expected&) = default;
</span><span class="cx"> Expected(Expected&&) = default;
</span><span class="cx"> constexpr Expected(const ValueType& e) : base(ExpectedDetail::ValueTag, e) { }
</span><del>- constexpr Expected(ValueType&& e) : base(ExpectedDetail::ValueTag, WTFMove(e)) { }
</del><ins>+ constexpr Expected(ValueType&& e) : base(ExpectedDetail::ValueTag, std::forward<ValueType>(e)) { }
</ins><span class="cx"> // template <class... Args> constexpr explicit Expected(in_place_t, Args&&...);
</span><span class="cx"> // template <class U, class... Args> constexpr explicit Expected(in_place_t, std::initializer_list<U>, Args&&...);
</span><span class="cx"> constexpr Expected(UnexpectedType<ErrorType> const& u) : base(ExpectedDetail::ErrorTag, u.value()) { }
</span></span></pre>
</div>
</div>
</body>
</html>