<!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>[185768] 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/185768">185768</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2015-06-19 14:17:54 -0700 (Fri, 19 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Employ explicit operator bool() instead of using the UnspecifiedBoolType workaround.
https://bugs.webkit.org/show_bug.cgi?id=146154
Reviewed by Darin Adler.
* assembler/MacroAssemblerCodeRef.h:
(JSC::MacroAssemblerCodePtr::dataLocation):
(JSC::MacroAssemblerCodePtr::operator bool):
(JSC::MacroAssemblerCodePtr::operator==):
(JSC::MacroAssemblerCodeRef::tryToDisassemble):
(JSC::MacroAssemblerCodeRef::operator bool):
(JSC::MacroAssemblerCodeRef::dump):
(JSC::MacroAssemblerCodePtr::operator UnspecifiedBoolType*): Deleted.
(JSC::MacroAssemblerCodeRef::operator UnspecifiedBoolType*): Deleted.
* bytecode/CodeOrigin.cpp:
(JSC::CodeOrigin::isApproximatelyEqualTo):
- Fixed a bug here where we were expecting to compare Executable pointers, but
ended up comparing a (UnspecifiedBoolType*)1 with another
(UnspecifiedBoolType*)1.
* bytecode/LLIntCallLinkInfo.h:
(JSC::LLIntCallLinkInfo::~LLIntCallLinkInfo):
(JSC::LLIntCallLinkInfo::isLinked):
(JSC::LLIntCallLinkInfo::unlink):
* dfg/DFGBlockWorklist.h:
(JSC::DFG::BlockWith::BlockWith):
(JSC::DFG::BlockWith::operator bool):
(JSC::DFG::BlockWithOrder::BlockWithOrder):
(JSC::DFG::BlockWithOrder::operator bool):
(JSC::DFG::BlockWith::operator UnspecifiedBoolType*): Deleted.
(JSC::DFG::BlockWithOrder::operator UnspecifiedBoolType*): Deleted.
* dfg/DFGIntegerRangeOptimizationPhase.cpp:
* dfg/DFGLazyNode.h:
(JSC::DFG::LazyNode::operator!):
(JSC::DFG::LazyNode::operator bool):
(JSC::DFG::LazyNode::operator UnspecifiedBoolType*): Deleted.
* heap/CopyWriteBarrier.h:
(JSC::CopyWriteBarrier::operator!):
(JSC::CopyWriteBarrier::operator bool):
(JSC::CopyWriteBarrier::get):
(JSC::CopyWriteBarrier::operator UnspecifiedBoolType*): Deleted.
* heap/Handle.h:
(JSC::HandleBase::operator!):
(JSC::HandleBase::operator bool):
(JSC::HandleBase::slot):
(JSC::HandleBase::operator UnspecifiedBoolType*): Deleted.
* heap/Strong.h:
(JSC::Strong::operator!):
(JSC::Strong::operator bool):
(JSC::Strong::swap):
(JSC::Strong::operator UnspecifiedBoolType*): Deleted.
* jit/JITWriteBarrier.h:
(JSC::JITWriteBarrierBase::operator bool):
(JSC::JITWriteBarrierBase::operator!):
(JSC::JITWriteBarrierBase::setFlagOnBarrier):
(JSC::JITWriteBarrierBase::operator UnspecifiedBoolType*): Deleted.
* runtime/JSArray.cpp:
(JSC::JSArray::setLengthWithArrayStorage):
* runtime/JSCJSValue.h:
* runtime/JSCJSValueInlines.h:
(JSC::JSValue::JSValue):
(JSC::JSValue::operator bool):
(JSC::JSValue::operator==):
(JSC::JSValue::operator UnspecifiedBoolType*): Deleted.
* runtime/JSObject.h:
(JSC::JSObject::hasSparseMap):
* runtime/PropertyDescriptor.h:
(JSC::PropertyDescriptor::writablePresent):
(JSC::PropertyDescriptor::enumerablePresent):
(JSC::PropertyDescriptor::configurablePresent):
(JSC::PropertyDescriptor::setterPresent):
(JSC::PropertyDescriptor::getterPresent):
* runtime/WriteBarrier.h:
(JSC::WriteBarrierBase::slot):
(JSC::WriteBarrierBase::operator bool):
(JSC::WriteBarrierBase::operator!):
(JSC::WriteBarrierBase<Unknown>::tagPointer):
(JSC::WriteBarrierBase<Unknown>::payloadPointer):
(JSC::WriteBarrierBase<Unknown>::operator bool):
(JSC::WriteBarrierBase<Unknown>::operator!):
(JSC::WriteBarrierBase::operator UnspecifiedBoolType*): Deleted.
(JSC::WriteBarrierBase<Unknown>::operator UnspecifiedBoolType*): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerCodeRefh">trunk/Source/JavaScriptCore/assembler/MacroAssemblerCodeRef.h</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeCodeOrigincpp">trunk/Source/JavaScriptCore/bytecode/CodeOrigin.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeLLIntCallLinkInfoh">trunk/Source/JavaScriptCore/bytecode/LLIntCallLinkInfo.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGBlockWorklisth">trunk/Source/JavaScriptCore/dfg/DFGBlockWorklist.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGIntegerRangeOptimizationPhasecpp">trunk/Source/JavaScriptCore/dfg/DFGIntegerRangeOptimizationPhase.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGLazyNodeh">trunk/Source/JavaScriptCore/dfg/DFGLazyNode.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapCopyWriteBarrierh">trunk/Source/JavaScriptCore/heap/CopyWriteBarrier.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapHandleh">trunk/Source/JavaScriptCore/heap/Handle.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapStrongh">trunk/Source/JavaScriptCore/heap/Strong.h</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITWriteBarrierh">trunk/Source/JavaScriptCore/jit/JITWriteBarrier.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSArraycpp">trunk/Source/JavaScriptCore/runtime/JSArray.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSCJSValueh">trunk/Source/JavaScriptCore/runtime/JSCJSValue.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSCJSValueInlinesh">trunk/Source/JavaScriptCore/runtime/JSCJSValueInlines.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSObjecth">trunk/Source/JavaScriptCore/runtime/JSObject.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimePropertyDescriptorh">trunk/Source/JavaScriptCore/runtime/PropertyDescriptor.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeWriteBarrierh">trunk/Source/JavaScriptCore/runtime/WriteBarrier.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (185767 => 185768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-06-19 20:47:33 UTC (rev 185767)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-06-19 21:17:54 UTC (rev 185768)
</span><span class="lines">@@ -1,3 +1,89 @@
</span><ins>+2015-06-19 Mark Lam <mark.lam@apple.com>
+
+ Employ explicit operator bool() instead of using the UnspecifiedBoolType workaround.
+ https://bugs.webkit.org/show_bug.cgi?id=146154
+
+ Reviewed by Darin Adler.
+
+ * assembler/MacroAssemblerCodeRef.h:
+ (JSC::MacroAssemblerCodePtr::dataLocation):
+ (JSC::MacroAssemblerCodePtr::operator bool):
+ (JSC::MacroAssemblerCodePtr::operator==):
+ (JSC::MacroAssemblerCodeRef::tryToDisassemble):
+ (JSC::MacroAssemblerCodeRef::operator bool):
+ (JSC::MacroAssemblerCodeRef::dump):
+ (JSC::MacroAssemblerCodePtr::operator UnspecifiedBoolType*): Deleted.
+ (JSC::MacroAssemblerCodeRef::operator UnspecifiedBoolType*): Deleted.
+
+ * bytecode/CodeOrigin.cpp:
+ (JSC::CodeOrigin::isApproximatelyEqualTo):
+ - Fixed a bug here where we were expecting to compare Executable pointers, but
+ ended up comparing a (UnspecifiedBoolType*)1 with another
+ (UnspecifiedBoolType*)1.
+
+ * bytecode/LLIntCallLinkInfo.h:
+ (JSC::LLIntCallLinkInfo::~LLIntCallLinkInfo):
+ (JSC::LLIntCallLinkInfo::isLinked):
+ (JSC::LLIntCallLinkInfo::unlink):
+ * dfg/DFGBlockWorklist.h:
+ (JSC::DFG::BlockWith::BlockWith):
+ (JSC::DFG::BlockWith::operator bool):
+ (JSC::DFG::BlockWithOrder::BlockWithOrder):
+ (JSC::DFG::BlockWithOrder::operator bool):
+ (JSC::DFG::BlockWith::operator UnspecifiedBoolType*): Deleted.
+ (JSC::DFG::BlockWithOrder::operator UnspecifiedBoolType*): Deleted.
+ * dfg/DFGIntegerRangeOptimizationPhase.cpp:
+ * dfg/DFGLazyNode.h:
+ (JSC::DFG::LazyNode::operator!):
+ (JSC::DFG::LazyNode::operator bool):
+ (JSC::DFG::LazyNode::operator UnspecifiedBoolType*): Deleted.
+ * heap/CopyWriteBarrier.h:
+ (JSC::CopyWriteBarrier::operator!):
+ (JSC::CopyWriteBarrier::operator bool):
+ (JSC::CopyWriteBarrier::get):
+ (JSC::CopyWriteBarrier::operator UnspecifiedBoolType*): Deleted.
+ * heap/Handle.h:
+ (JSC::HandleBase::operator!):
+ (JSC::HandleBase::operator bool):
+ (JSC::HandleBase::slot):
+ (JSC::HandleBase::operator UnspecifiedBoolType*): Deleted.
+ * heap/Strong.h:
+ (JSC::Strong::operator!):
+ (JSC::Strong::operator bool):
+ (JSC::Strong::swap):
+ (JSC::Strong::operator UnspecifiedBoolType*): Deleted.
+ * jit/JITWriteBarrier.h:
+ (JSC::JITWriteBarrierBase::operator bool):
+ (JSC::JITWriteBarrierBase::operator!):
+ (JSC::JITWriteBarrierBase::setFlagOnBarrier):
+ (JSC::JITWriteBarrierBase::operator UnspecifiedBoolType*): Deleted.
+ * runtime/JSArray.cpp:
+ (JSC::JSArray::setLengthWithArrayStorage):
+ * runtime/JSCJSValue.h:
+ * runtime/JSCJSValueInlines.h:
+ (JSC::JSValue::JSValue):
+ (JSC::JSValue::operator bool):
+ (JSC::JSValue::operator==):
+ (JSC::JSValue::operator UnspecifiedBoolType*): Deleted.
+ * runtime/JSObject.h:
+ (JSC::JSObject::hasSparseMap):
+ * runtime/PropertyDescriptor.h:
+ (JSC::PropertyDescriptor::writablePresent):
+ (JSC::PropertyDescriptor::enumerablePresent):
+ (JSC::PropertyDescriptor::configurablePresent):
+ (JSC::PropertyDescriptor::setterPresent):
+ (JSC::PropertyDescriptor::getterPresent):
+ * runtime/WriteBarrier.h:
+ (JSC::WriteBarrierBase::slot):
+ (JSC::WriteBarrierBase::operator bool):
+ (JSC::WriteBarrierBase::operator!):
+ (JSC::WriteBarrierBase<Unknown>::tagPointer):
+ (JSC::WriteBarrierBase<Unknown>::payloadPointer):
+ (JSC::WriteBarrierBase<Unknown>::operator bool):
+ (JSC::WriteBarrierBase<Unknown>::operator!):
+ (JSC::WriteBarrierBase::operator UnspecifiedBoolType*): Deleted.
+ (JSC::WriteBarrierBase<Unknown>::operator UnspecifiedBoolType*): Deleted.
+
</ins><span class="cx"> 2015-06-19 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Add a JSC symlink in /System/Library/PrivateFrameworks
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerCodeRefh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerCodeRef.h (185767 => 185768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerCodeRef.h 2015-06-19 20:47:33 UTC (rev 185767)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerCodeRef.h 2015-06-19 21:17:54 UTC (rev 185768)
</span><span class="lines">@@ -318,11 +318,7 @@
</span><span class="cx"> void* dataLocation() const { ASSERT_VALID_CODE_POINTER(m_value); return m_value; }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- typedef void* (MacroAssemblerCodePtr::*UnspecifiedBoolType);
- operator UnspecifiedBoolType*() const
- {
- return !!m_value ? reinterpret_cast<UnspecifiedBoolType*>(1) : 0;
- }
</del><ins>+ explicit operator bool() const { return m_value; }
</ins><span class="cx">
</span><span class="cx"> bool operator==(const MacroAssemblerCodePtr& other) const
</span><span class="cx"> {
</span><span class="lines">@@ -442,11 +438,7 @@
</span><span class="cx"> return JSC::tryToDisassemble(m_codePtr, size(), prefix, WTF::dataFile());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- typedef void* (MacroAssemblerCodeRef::*UnspecifiedBoolType);
- operator UnspecifiedBoolType*() const
- {
- return !!m_codePtr ? reinterpret_cast<UnspecifiedBoolType*>(1) : 0;
- }
</del><ins>+ explicit operator bool() const { return !!m_codePtr; }
</ins><span class="cx">
</span><span class="cx"> void dump(PrintStream& out) const
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeCodeOrigincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/CodeOrigin.cpp (185767 => 185768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/CodeOrigin.cpp 2015-06-19 20:47:33 UTC (rev 185767)
+++ trunk/Source/JavaScriptCore/bytecode/CodeOrigin.cpp 2015-06-19 21:17:54 UTC (rev 185768)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> if (!a.inlineCallFrame)
</span><span class="cx"> return true;
</span><span class="cx">
</span><del>- if (a.inlineCallFrame->executable != b.inlineCallFrame->executable)
</del><ins>+ if (a.inlineCallFrame->executable.get() != b.inlineCallFrame->executable.get())
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> a = a.inlineCallFrame->caller;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeLLIntCallLinkInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/LLIntCallLinkInfo.h (185767 => 185768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/LLIntCallLinkInfo.h 2015-06-19 20:47:33 UTC (rev 185767)
+++ trunk/Source/JavaScriptCore/bytecode/LLIntCallLinkInfo.h 2015-06-19 21:17:54 UTC (rev 185768)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> remove();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- bool isLinked() { return callee; }
</del><ins>+ bool isLinked() { return !!callee; }
</ins><span class="cx">
</span><span class="cx"> void unlink()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGBlockWorklisth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGBlockWorklist.h (185767 => 185768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGBlockWorklist.h 2015-06-19 20:47:33 UTC (rev 185767)
+++ trunk/Source/JavaScriptCore/dfg/DFGBlockWorklist.h 2015-06-19 21:17:54 UTC (rev 185768)
</span><span class="lines">@@ -65,11 +65,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- typedef void* (BlockWith<T>::*UnspecifiedBoolType);
- operator UnspecifiedBoolType*() const
- {
- return block ? reinterpret_cast<UnspecifiedBoolType*>(1) : nullptr;
- }
</del><ins>+ explicit operator bool() const { return block; }
</ins><span class="cx">
</span><span class="cx"> BasicBlock* block;
</span><span class="cx"> T data;
</span><span class="lines">@@ -141,11 +137,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- typedef void* (BlockWithOrder::*UnspecifiedBoolType);
- operator UnspecifiedBoolType*() const
- {
- return block ? reinterpret_cast<UnspecifiedBoolType*>(1) : nullptr;
- }
</del><ins>+ explicit operator bool() const { return block; }
</ins><span class="cx">
</span><span class="cx"> BasicBlock* block;
</span><span class="cx"> VisitOrder order;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGIntegerRangeOptimizationPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGIntegerRangeOptimizationPhase.cpp (185767 => 185768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGIntegerRangeOptimizationPhase.cpp 2015-06-19 20:47:33 UTC (rev 185767)
+++ trunk/Source/JavaScriptCore/dfg/DFGIntegerRangeOptimizationPhase.cpp 2015-06-19 21:17:54 UTC (rev 185768)
</span><span class="lines">@@ -114,10 +114,7 @@
</span><span class="cx">
</span><span class="cx"> typedef void* (Relationship::*UnspecifiedBoolType);
</span><span class="cx">
</span><del>- operator UnspecifiedBoolType*() const
- {
- return m_left ? reinterpret_cast<UnspecifiedBoolType*>(1) : 0;
- }
</del><ins>+ explicit operator bool() const { return m_left; }
</ins><span class="cx">
</span><span class="cx"> Node* left() const { return m_left; }
</span><span class="cx"> Node* right() const { return m_right; }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGLazyNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGLazyNode.h (185767 => 185768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGLazyNode.h 2015-06-19 20:47:33 UTC (rev 185767)
+++ trunk/Source/JavaScriptCore/dfg/DFGLazyNode.h 2015-06-19 21:17:54 UTC (rev 185768)
</span><span class="lines">@@ -141,13 +141,8 @@
</span><span class="cx">
</span><span class="cx"> bool operator!() const { return !asValue() && !asNode(); }
</span><span class="cx">
</span><del>- typedef void* (LazyNode::*UnspecifiedBoolType);
</del><ins>+ explicit operator bool() const { return !!*this; }
</ins><span class="cx">
</span><del>- operator UnspecifiedBoolType*() const
- {
- return !!*this ? reinterpret_cast<UnspecifiedBoolType*>(1) : 0;
- }
-
</del><span class="cx"> void dump(PrintStream& out) const;
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapCopyWriteBarrierh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/CopyWriteBarrier.h (185767 => 185768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/CopyWriteBarrier.h 2015-06-19 20:47:33 UTC (rev 185767)
+++ trunk/Source/JavaScriptCore/heap/CopyWriteBarrier.h 2015-06-19 21:17:54 UTC (rev 185768)
</span><span class="lines">@@ -50,8 +50,7 @@
</span><span class="cx">
</span><span class="cx"> bool operator!() const { return !m_value; }
</span><span class="cx">
</span><del>- typedef T* (CopyWriteBarrier::*UnspecifiedBoolType);
- operator UnspecifiedBoolType*() const { return m_value ? reinterpret_cast<UnspecifiedBoolType*>(1) : 0; }
</del><ins>+ explicit operator bool() const { return m_value; }
</ins><span class="cx">
</span><span class="cx"> T* get() const
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapHandleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/Handle.h (185767 => 185768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/Handle.h 2015-06-19 20:47:33 UTC (rev 185767)
+++ trunk/Source/JavaScriptCore/heap/Handle.h 2015-06-19 21:17:54 UTC (rev 185768)
</span><span class="lines">@@ -52,9 +52,7 @@
</span><span class="cx"> public:
</span><span class="cx"> bool operator!() const { return !m_slot || !*m_slot; }
</span><span class="cx">
</span><del>- // This conversion operator allows implicit conversion to bool but not to other integer types.
- typedef JSValue (HandleBase::*UnspecifiedBoolType);
- operator UnspecifiedBoolType*() const { return (m_slot && *m_slot) ? reinterpret_cast<UnspecifiedBoolType*>(1) : 0; }
</del><ins>+ explicit operator bool() const { return m_slot && *m_slot; }
</ins><span class="cx">
</span><span class="cx"> HandleSlot slot() const { return m_slot; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapStrongh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/Strong.h (185767 => 185768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/Strong.h 2015-06-19 20:47:33 UTC (rev 185767)
+++ trunk/Source/JavaScriptCore/heap/Strong.h 2015-06-19 21:17:54 UTC (rev 185768)
</span><span class="lines">@@ -84,9 +84,7 @@
</span><span class="cx">
</span><span class="cx"> bool operator!() const { return !slot() || !*slot(); }
</span><span class="cx">
</span><del>- // This conversion operator allows implicit conversion to bool but not to other integer types.
- typedef JSValue (HandleBase::*UnspecifiedBoolType);
- operator UnspecifiedBoolType*() const { return !!*this ? reinterpret_cast<UnspecifiedBoolType*>(1) : 0; }
</del><ins>+ explicit operator bool() const { return !!*this; }
</ins><span class="cx">
</span><span class="cx"> void swap(Strong& other)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITWriteBarrierh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITWriteBarrier.h (185767 => 185768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITWriteBarrier.h 2015-06-19 20:47:33 UTC (rev 185767)
+++ trunk/Source/JavaScriptCore/jit/JITWriteBarrier.h 2015-06-19 21:17:54 UTC (rev 185768)
</span><span class="lines">@@ -43,8 +43,7 @@
</span><span class="cx"> #define JITWriteBarrierFlag ((void*)2)
</span><span class="cx"> class JITWriteBarrierBase {
</span><span class="cx"> public:
</span><del>- typedef void* (JITWriteBarrierBase::*UnspecifiedBoolType);
- operator UnspecifiedBoolType*() const { return get() ? reinterpret_cast<UnspecifiedBoolType*>(1) : 0; }
</del><ins>+ explicit operator bool() const { return get(); }
</ins><span class="cx"> bool operator!() const { return !get(); }
</span><span class="cx">
</span><span class="cx"> void setFlagOnBarrier()
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSArraycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSArray.cpp (185767 => 185768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSArray.cpp 2015-06-19 20:47:33 UTC (rev 185767)
+++ trunk/Source/JavaScriptCore/runtime/JSArray.cpp 2015-06-19 21:17:54 UTC (rev 185768)
</span><span class="lines">@@ -376,7 +376,7 @@
</span><span class="cx"> unsigned usedVectorLength = min(length, storage->vectorLength());
</span><span class="cx"> for (unsigned i = newLength; i < usedVectorLength; ++i) {
</span><span class="cx"> WriteBarrier<Unknown>& valueSlot = storage->m_vector[i];
</span><del>- bool hadValue = valueSlot;
</del><ins>+ bool hadValue { valueSlot };
</ins><span class="cx"> valueSlot.clear();
</span><span class="cx"> storage->m_numValuesInVector -= hadValue;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSCJSValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSCJSValue.h (185767 => 185768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSCJSValue.h 2015-06-19 20:47:33 UTC (rev 185767)
+++ trunk/Source/JavaScriptCore/runtime/JSCJSValue.h 2015-06-19 21:17:54 UTC (rev 185768)
</span><span class="lines">@@ -195,8 +195,7 @@
</span><span class="cx"> explicit JSValue(long long);
</span><span class="cx"> explicit JSValue(unsigned long long);
</span><span class="cx">
</span><del>- typedef void* (JSValue::*UnspecifiedBoolType);
- operator UnspecifiedBoolType*() const;
</del><ins>+ explicit operator bool() const;
</ins><span class="cx"> bool operator==(const JSValue& other) const;
</span><span class="cx"> bool operator!=(const JSValue& other) const;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSCJSValueInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSCJSValueInlines.h (185767 => 185768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSCJSValueInlines.h 2015-06-19 20:47:33 UTC (rev 185767)
+++ trunk/Source/JavaScriptCore/runtime/JSCJSValueInlines.h 2015-06-19 21:17:54 UTC (rev 185768)
</span><span class="lines">@@ -213,10 +213,10 @@
</span><span class="cx"> u.asBits.payload = reinterpret_cast<int32_t>(const_cast<JSCell*>(ptr));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline JSValue::operator UnspecifiedBoolType*() const
</del><ins>+inline JSValue::operator bool() const
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(tag() != DeletedValueTag);
</span><del>- return tag() != EmptyValueTag ? reinterpret_cast<UnspecifiedBoolType*>(1) : 0;
</del><ins>+ return tag() != EmptyValueTag;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline bool JSValue::operator==(const JSValue& other) const
</span><span class="lines">@@ -362,9 +362,9 @@
</span><span class="cx"> u.asInt64 = reinterpret_cast<uintptr_t>(const_cast<JSCell*>(ptr));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline JSValue::operator UnspecifiedBoolType*() const
</del><ins>+inline JSValue::operator bool() const
</ins><span class="cx"> {
</span><del>- return u.asInt64 ? reinterpret_cast<UnspecifiedBoolType*>(1) : 0;
</del><ins>+ return u.asInt64;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline bool JSValue::operator==(const JSValue& other) const
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSObject.h (185767 => 185768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSObject.h 2015-06-19 20:47:33 UTC (rev 185767)
+++ trunk/Source/JavaScriptCore/runtime/JSObject.h 2015-06-19 21:17:54 UTC (rev 185768)
</span><span class="lines">@@ -429,7 +429,7 @@
</span><span class="cx"> case ALL_CONTIGUOUS_INDEXING_TYPES:
</span><span class="cx"> return false;
</span><span class="cx"> case ALL_ARRAY_STORAGE_INDEXING_TYPES:
</span><del>- return m_butterfly->arrayStorage()->m_sparseMap;
</del><ins>+ return !!m_butterfly->arrayStorage()->m_sparseMap;
</ins><span class="cx"> default:
</span><span class="cx"> RELEASE_ASSERT_NOT_REACHED();
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimePropertyDescriptorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/PropertyDescriptor.h (185767 => 185768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/PropertyDescriptor.h 2015-06-19 20:47:33 UTC (rev 185767)
+++ trunk/Source/JavaScriptCore/runtime/PropertyDescriptor.h 2015-06-19 21:17:54 UTC (rev 185768)
</span><span class="lines">@@ -77,8 +77,8 @@
</span><span class="cx"> bool writablePresent() const { return m_seenAttributes & WritablePresent; }
</span><span class="cx"> bool enumerablePresent() const { return m_seenAttributes & EnumerablePresent; }
</span><span class="cx"> bool configurablePresent() const { return m_seenAttributes & ConfigurablePresent; }
</span><del>- bool setterPresent() const { return m_setter; }
- bool getterPresent() const { return m_getter; }
</del><ins>+ bool setterPresent() const { return !!m_setter; }
+ bool getterPresent() const { return !!m_getter; }
</ins><span class="cx"> bool equalTo(ExecState*, const PropertyDescriptor& other) const;
</span><span class="cx"> bool attributesEqual(const PropertyDescriptor& other) const;
</span><span class="cx"> unsigned attributesOverridingCurrent(const PropertyDescriptor& current) const;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeWriteBarrierh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/WriteBarrier.h (185767 => 185768)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/WriteBarrier.h 2015-06-19 20:47:33 UTC (rev 185767)
+++ trunk/Source/JavaScriptCore/runtime/WriteBarrier.h 2015-06-19 21:17:54 UTC (rev 185768)
</span><span class="lines">@@ -113,8 +113,7 @@
</span><span class="cx">
</span><span class="cx"> T** slot() { return reinterpret_cast<T**>(&m_cell); }
</span><span class="cx">
</span><del>- typedef T* (WriteBarrierBase::*UnspecifiedBoolType);
- operator UnspecifiedBoolType*() const { return m_cell ? reinterpret_cast<UnspecifiedBoolType*>(1) : 0; }
</del><ins>+ explicit operator bool() const { return m_cell; }
</ins><span class="cx">
</span><span class="cx"> bool operator!() const { return !m_cell; }
</span><span class="cx">
</span><span class="lines">@@ -165,8 +164,7 @@
</span><span class="cx"> int32_t* tagPointer() { return &bitwise_cast<EncodedValueDescriptor*>(&m_value)->asBits.tag; }
</span><span class="cx"> int32_t* payloadPointer() { return &bitwise_cast<EncodedValueDescriptor*>(&m_value)->asBits.payload; }
</span><span class="cx">
</span><del>- typedef JSValue (WriteBarrierBase::*UnspecifiedBoolType);
- operator UnspecifiedBoolType*() const { return get() ? reinterpret_cast<UnspecifiedBoolType*>(1) : 0; }
</del><ins>+ explicit operator bool() const { return !!get(); }
</ins><span class="cx"> bool operator!() const { return !get(); }
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre>
</div>
</div>
</body>
</html>