<!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>[174943] releases/WebKitGTK/webkit-2.6/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/174943">174943</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-10-21 03:52:15 -0700 (Tue, 21 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/174091">r174091</a> - DFG HasStructureProperty codegen should use one fewer registers
https://bugs.webkit.org/show_bug.cgi?id=137235
Reviewed by Andreas Kling.
This was an obvious source of inefficiency and it was causing us to run out of registers on
x86-32.
* dfg/DFGSpeculativeJIT32_64.cpp:
(JSC::DFG::SpeculativeJIT::compile):
* dfg/DFGSpeculativeJIT64.cpp:
(JSC::DFG::SpeculativeJIT::compile):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit26SourceJavaScriptCoreChangeLog">releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceJavaScriptCoredfgDFGSpeculativeJIT32_64cpp">releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceJavaScriptCoredfgDFGSpeculativeJIT64cpp">releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit26SourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/ChangeLog (174942 => 174943)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/ChangeLog 2014-10-21 10:46:49 UTC (rev 174942)
+++ releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/ChangeLog 2014-10-21 10:52:15 UTC (rev 174943)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2014-09-29 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><ins>+ DFG HasStructureProperty codegen should use one fewer registers
+ https://bugs.webkit.org/show_bug.cgi?id=137235
+
+ Reviewed by Andreas Kling.
+
+ This was an obvious source of inefficiency and it was causing us to run out of registers on
+ x86-32.
+
+ * dfg/DFGSpeculativeJIT32_64.cpp:
+ (JSC::DFG::SpeculativeJIT::compile):
+ * dfg/DFGSpeculativeJIT64.cpp:
+ (JSC::DFG::SpeculativeJIT::compile):
+
+2014-09-29 Filip Pizlo <fpizlo@apple.com>
+
</ins><span class="cx"> Don't use GPRResult unless you're flushing registers and making a runtime function call
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=137234
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceJavaScriptCoredfgDFGSpeculativeJIT32_64cpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp (174942 => 174943)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp 2014-10-21 10:46:49 UTC (rev 174942)
+++ releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp 2014-10-21 10:52:15 UTC (rev 174943)
</span><span class="lines">@@ -4624,20 +4624,18 @@
</span><span class="cx"> JSValueOperand base(this, node->child1());
</span><span class="cx"> SpeculateCellOperand property(this, node->child2());
</span><span class="cx"> SpeculateCellOperand enumerator(this, node->child3());
</span><del>- GPRTemporary scratch(this);
</del><span class="cx"> GPRTemporary resultPayload(this);
</span><span class="cx"> GPRTemporary resultTag(this);
</span><span class="cx">
</span><span class="cx"> GPRReg baseTagGPR = base.tagGPR();
</span><span class="cx"> GPRReg basePayloadGPR = base.payloadGPR();
</span><span class="cx"> GPRReg propertyGPR = property.gpr();
</span><del>- GPRReg scratchGPR = scratch.gpr();
</del><span class="cx"> GPRReg resultPayloadGPR = resultPayload.gpr();
</span><span class="cx"> GPRReg resultTagGPR = resultTag.gpr();
</span><span class="cx">
</span><del>- m_jit.load32(MacroAssembler::Address(basePayloadGPR, JSCell::structureIDOffset()), scratchGPR);
</del><ins>+ m_jit.load32(MacroAssembler::Address(basePayloadGPR, JSCell::structureIDOffset()), resultTagGPR);
</ins><span class="cx"> MacroAssembler::Jump wrongStructure = m_jit.branch32(MacroAssembler::NotEqual,
</span><del>- scratchGPR,
</del><ins>+ resultTagGPR,
</ins><span class="cx"> MacroAssembler::Address(enumerator.gpr(), JSPropertyNameEnumerator::cachedStructureIDOffset()));
</span><span class="cx">
</span><span class="cx"> moveTrueTo(resultPayloadGPR);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceJavaScriptCoredfgDFGSpeculativeJIT64cpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp (174942 => 174943)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp 2014-10-21 10:46:49 UTC (rev 174942)
+++ releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp 2014-10-21 10:52:15 UTC (rev 174943)
</span><span class="lines">@@ -4691,17 +4691,15 @@
</span><span class="cx"> JSValueOperand base(this, node->child1());
</span><span class="cx"> SpeculateCellOperand property(this, node->child2());
</span><span class="cx"> SpeculateCellOperand enumerator(this, node->child3());
</span><del>- GPRTemporary scratch(this);
</del><span class="cx"> GPRTemporary result(this);
</span><span class="cx">
</span><span class="cx"> GPRReg baseGPR = base.gpr();
</span><span class="cx"> GPRReg propertyGPR = property.gpr();
</span><del>- GPRReg scratchGPR = scratch.gpr();
</del><span class="cx"> GPRReg resultGPR = result.gpr();
</span><span class="cx">
</span><del>- m_jit.load32(MacroAssembler::Address(baseGPR, JSCell::structureIDOffset()), scratchGPR);
</del><ins>+ m_jit.load32(MacroAssembler::Address(baseGPR, JSCell::structureIDOffset()), resultGPR);
</ins><span class="cx"> MacroAssembler::Jump wrongStructure = m_jit.branch32(MacroAssembler::NotEqual,
</span><del>- scratchGPR,
</del><ins>+ resultGPR,
</ins><span class="cx"> MacroAssembler::Address(enumerator.gpr(), JSPropertyNameEnumerator::cachedStructureIDOffset()));
</span><span class="cx">
</span><span class="cx"> moveTrueTo(resultGPR);
</span></span></pre>
</div>
</div>
</body>
</html>