<!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>[188040] 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/188040">188040</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-08-06 09:24:38 -0700 (Thu, 06 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove UnspecifiedBoolType from JSC
https://bugs.webkit.org/show_bug.cgi?id=147597
Patch by Keith Miller <keith_miller@apple.com> on 2015-08-06
Reviewed by Mark Lam.
We were using the safe bool pattern in the code base for implicit casting to booleans.
With C++11 this is no longer necessary and we can instead create an operator bool.
* API/JSRetainPtr.h:
(JSRetainPtr::operator bool):
(JSRetainPtr::operator UnspecifiedBoolType): Deleted.
* dfg/DFGEdge.h:
(JSC::DFG::Edge::operator bool):
(JSC::DFG::Edge::operator UnspecifiedBoolType*): Deleted.
* dfg/DFGIntegerRangeOptimizationPhase.cpp:
* heap/Weak.h:
* heap/WeakInlines.h:
(JSC::bool):
(JSC::UnspecifiedBoolType): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreAPIJSRetainPtrh">trunk/Source/JavaScriptCore/API/JSRetainPtr.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGEdgeh">trunk/Source/JavaScriptCore/dfg/DFGEdge.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGIntegerRangeOptimizationPhasecpp">trunk/Source/JavaScriptCore/dfg/DFGIntegerRangeOptimizationPhase.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapWeakh">trunk/Source/JavaScriptCore/heap/Weak.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapWeakInlinesh">trunk/Source/JavaScriptCore/heap/WeakInlines.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreAPIJSRetainPtrh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/JSRetainPtr.h (188039 => 188040)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/JSRetainPtr.h 2015-08-06 12:31:45 UTC (rev 188039)
+++ trunk/Source/JavaScriptCore/API/JSRetainPtr.h 2015-08-06 16:24:38 UTC (rev 188040)
</span><span class="lines">@@ -57,11 +57,8 @@
</span><span class="cx"> T operator->() const { return m_ptr; }
</span><span class="cx">
</span><span class="cx"> bool operator!() const { return !m_ptr; }
</span><ins>+ explicit operator bool() const { return m_ptr; }
</ins><span class="cx">
</span><del>- // This conversion operator allows implicit conversion to bool but not to other integer types.
- typedef T JSRetainPtr::*UnspecifiedBoolType;
- operator UnspecifiedBoolType() const { return m_ptr ? &JSRetainPtr::m_ptr : 0; }
-
</del><span class="cx"> JSRetainPtr& operator=(const JSRetainPtr&);
</span><span class="cx"> template<typename U> JSRetainPtr& operator=(const JSRetainPtr<U>&);
</span><span class="cx"> JSRetainPtr& operator=(T);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (188039 => 188040)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-08-06 12:31:45 UTC (rev 188039)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-08-06 16:24:38 UTC (rev 188040)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-08-06 Keith Miller <keith_miller@apple.com>
+
+ Remove UnspecifiedBoolType from JSC
+ https://bugs.webkit.org/show_bug.cgi?id=147597
+
+ Reviewed by Mark Lam.
+
+ We were using the safe bool pattern in the code base for implicit casting to booleans.
+ With C++11 this is no longer necessary and we can instead create an operator bool.
+
+ * API/JSRetainPtr.h:
+ (JSRetainPtr::operator bool):
+ (JSRetainPtr::operator UnspecifiedBoolType): Deleted.
+ * dfg/DFGEdge.h:
+ (JSC::DFG::Edge::operator bool):
+ (JSC::DFG::Edge::operator UnspecifiedBoolType*): Deleted.
+ * dfg/DFGIntegerRangeOptimizationPhase.cpp:
+ * heap/Weak.h:
+ * heap/WeakInlines.h:
+ (JSC::bool):
+ (JSC::UnspecifiedBoolType): Deleted.
+
</ins><span class="cx"> 2015-08-05 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> [ES6] Class parser does not allow methods named set and get.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGEdgeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGEdge.h (188039 => 188040)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGEdge.h 2015-08-06 12:31:45 UTC (rev 188039)
+++ trunk/Source/JavaScriptCore/dfg/DFGEdge.h 2015-08-06 16:24:38 UTC (rev 188040)
</span><span class="lines">@@ -158,11 +158,9 @@
</span><span class="cx"> #endif
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><del>-
- typedef void* Edge::*UnspecifiedBoolType;
- operator UnspecifiedBoolType*() const { return reinterpret_cast<UnspecifiedBoolType*>(isSet()); }
-
</del><ins>+
</ins><span class="cx"> bool operator!() const { return !isSet(); }
</span><ins>+ explicit operator bool() const { return isSet(); }
</ins><span class="cx">
</span><span class="cx"> bool operator==(Edge other) const
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGIntegerRangeOptimizationPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGIntegerRangeOptimizationPhase.cpp (188039 => 188040)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGIntegerRangeOptimizationPhase.cpp 2015-08-06 12:31:45 UTC (rev 188039)
+++ trunk/Source/JavaScriptCore/dfg/DFGIntegerRangeOptimizationPhase.cpp 2015-08-06 16:24:38 UTC (rev 188040)
</span><span class="lines">@@ -111,8 +111,6 @@
</span><span class="cx"> return Relationship();
</span><span class="cx"> return Relationship(left, right, kind, offset);
</span><span class="cx"> }
</span><del>-
- typedef void* (Relationship::*UnspecifiedBoolType);
</del><span class="cx">
</span><span class="cx"> explicit operator bool() const { return m_left; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapWeakh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/Weak.h (188039 => 188040)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/Weak.h 2015-08-06 12:31:45 UTC (rev 188039)
+++ trunk/Source/JavaScriptCore/heap/Weak.h 2015-08-06 16:24:38 UTC (rev 188040)
</span><span class="lines">@@ -75,9 +75,7 @@
</span><span class="cx">
</span><span class="cx"> bool was(T*) const;
</span><span class="cx">
</span><del>- // This conversion operator allows implicit conversion to bool but not to other integer types.
- typedef void* (Weak::*UnspecifiedBoolType);
- operator UnspecifiedBoolType*() const;
</del><ins>+ explicit operator bool() const;
</ins><span class="cx">
</span><span class="cx"> WeakImpl* leakImpl() WARN_UNUSED_RETURN;
</span><span class="cx"> void clear()
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapWeakInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/WeakInlines.h (188039 => 188040)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/WeakInlines.h 2015-08-06 12:31:45 UTC (rev 188039)
+++ trunk/Source/JavaScriptCore/heap/WeakInlines.h 2015-08-06 16:24:38 UTC (rev 188040)
</span><span class="lines">@@ -99,9 +99,9 @@
</span><span class="cx"> return !m_impl || !m_impl->jsValue() || m_impl->state() != WeakImpl::Live;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename T> inline Weak<T>::operator UnspecifiedBoolType*() const
</del><ins>+template<typename T> inline Weak<T>::operator bool() const
</ins><span class="cx"> {
</span><del>- return reinterpret_cast<UnspecifiedBoolType*>(!!*this);
</del><ins>+ return !!*this;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T> inline WeakImpl* Weak<T>::leakImpl()
</span></span></pre>
</div>
</div>
</body>
</html>