<!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>[198057] 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/198057">198057</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-03-11 19:28:32 -0800 (Fri, 11 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[JSC] Remove a few jumps from DFG
https://bugs.webkit.org/show_bug.cgi?id=155347
Patch by Benjamin Poulain <bpoulain@apple.com> on 2016-03-11
Reviewed by Mark Lam.
Usually, setting ValueTrue or ValueFalse is set
by Compare+Or. There are 3 places in DFG with branches instead.
This patch changes them to the usual pattern.
* dfg/DFGSpeculativeJIT64.cpp:
(JSC::DFG::SpeculativeJIT::compileObjectEquality):
(JSC::DFG::SpeculativeJIT::compileObjectToObjectOrOtherEquality):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSpeculativeJIT64cpp">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (198056 => 198057)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-03-12 03:11:04 UTC (rev 198056)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-03-12 03:28:32 UTC (rev 198057)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-03-11 Benjamin Poulain <bpoulain@apple.com>
+
+ [JSC] Remove a few jumps from DFG
+ https://bugs.webkit.org/show_bug.cgi?id=155347
+
+ Reviewed by Mark Lam.
+
+ Usually, setting ValueTrue or ValueFalse is set
+ by Compare+Or. There are 3 places in DFG with branches instead.
+
+ This patch changes them to the usual pattern.
+
+ * dfg/DFGSpeculativeJIT64.cpp:
+ (JSC::DFG::SpeculativeJIT::compileObjectEquality):
+ (JSC::DFG::SpeculativeJIT::compileObjectToObjectOrOtherEquality):
+
</ins><span class="cx"> 2016-03-11 Saam barati <sbarati@apple.com>
</span><span class="cx">
</span><span class="cx"> [ES6] Make Object.assign spec compliant
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJIT64cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp (198056 => 198057)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp 2016-03-12 03:11:04 UTC (rev 198056)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp 2016-03-12 03:28:32 UTC (rev 198057)
</span><span class="lines">@@ -1369,14 +1369,9 @@
</span><span class="cx"> MacroAssembler::Address(op2GPR, JSCell::typeInfoFlagsOffset()),
</span><span class="cx"> MacroAssembler::TrustedImm32(MasqueradesAsUndefined)));
</span><span class="cx"> }
</span><del>-
- MacroAssembler::Jump falseCase = m_jit.branch64(MacroAssembler::NotEqual, op1GPR, op2GPR);
- m_jit.move(TrustedImm32(ValueTrue), resultGPR);
- MacroAssembler::Jump done = m_jit.jump();
- falseCase.link(&m_jit);
- m_jit.move(TrustedImm32(ValueFalse), resultGPR);
- done.link(&m_jit);
</del><span class="cx">
</span><ins>+ m_jit.compare64(MacroAssembler::Equal, op1GPR, op2GPR, resultGPR);
+ m_jit.or32(TrustedImm32(ValueFalse), resultGPR);
</ins><span class="cx"> jsValueResult(resultGPR, m_currentNode, DataFormatJSBoolean);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1468,8 +1463,8 @@
</span><span class="cx"> // At this point we know that we can perform a straight-forward equality comparison on pointer
</span><span class="cx"> // values because both left and right are pointers to objects that have no special equality
</span><span class="cx"> // protocols.
</span><del>- MacroAssembler::Jump falseCase = m_jit.branch64(MacroAssembler::NotEqual, op1GPR, op2GPR);
- MacroAssembler::Jump trueCase = m_jit.jump();
</del><ins>+ m_jit.compare64(MacroAssembler::Equal, op1GPR, op2GPR, resultGPR);
+ MacroAssembler::Jump done = m_jit.jump();
</ins><span class="cx">
</span><span class="cx"> rightNotCell.link(&m_jit);
</span><span class="cx">
</span><span class="lines">@@ -1485,14 +1480,10 @@
</span><span class="cx"> MacroAssembler::NotEqual, resultGPR,
</span><span class="cx"> MacroAssembler::TrustedImm64(ValueNull)));
</span><span class="cx"> }
</span><del>-
- falseCase.link(&m_jit);
- m_jit.move(TrustedImm32(ValueFalse), resultGPR);
- MacroAssembler::Jump done = m_jit.jump();
- trueCase.link(&m_jit);
- m_jit.move(TrustedImm32(ValueTrue), resultGPR);
</del><ins>+ m_jit.move(TrustedImm32(0), result.gpr());
+
</ins><span class="cx"> done.link(&m_jit);
</span><del>-
</del><ins>+ m_jit.or32(TrustedImm32(ValueFalse), resultGPR);
</ins><span class="cx"> jsValueResult(resultGPR, m_currentNode, DataFormatJSBoolean);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>