<!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>[164166] 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/164166">164166</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-02-15 00:34:07 -0800 (Sat, 15 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Added GetMyArgumentByVal to FTL
https://bugs.webkit.org/show_bug.cgi?id=128850
Patch by Matthew Mirman <mmirman@apple.com> on 2014-02-15
Reviewed by Filip Pizlo.
* ftl/FTLCapabilities.cpp:
(JSC::FTL::canCompile):
* ftl/FTLLowerDFGToLLVM.cpp:
(JSC::FTL::LowerDFGToLLVM::compileNode):
(JSC::FTL::LowerDFGToLLVM::compileGetMyArgumentByVal):
* tests/stress/ftl-getbyval-arguments.js: Added.
(foo):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLCapabilitiescpp">trunk/Source/JavaScriptCore/ftl/FTLCapabilities.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp">trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoretestsstressftlgetbyvalargumentsjs">trunk/Source/JavaScriptCore/tests/stress/ftl-getbyval-arguments.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (164165 => 164166)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-02-15 08:33:43 UTC (rev 164165)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-02-15 08:34:07 UTC (rev 164166)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-02-15 Matthew Mirman <mmirman@apple.com>
+
+ Added GetMyArgumentByVal to FTL
+ https://bugs.webkit.org/show_bug.cgi?id=128850
+
+ Reviewed by Filip Pizlo.
+
+ * ftl/FTLCapabilities.cpp:
+ (JSC::FTL::canCompile):
+ * ftl/FTLLowerDFGToLLVM.cpp:
+ (JSC::FTL::LowerDFGToLLVM::compileNode):
+ (JSC::FTL::LowerDFGToLLVM::compileGetMyArgumentByVal):
+ * tests/stress/ftl-getbyval-arguments.js: Added.
+ (foo):
+
</ins><span class="cx"> 2014-02-15 peavo@outlook.com <peavo@outlook.com>
</span><span class="cx">
</span><span class="cx"> [Win] LLINT is not working.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLCapabilitiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLCapabilities.cpp (164165 => 164166)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLCapabilities.cpp 2014-02-15 08:33:43 UTC (rev 164165)
+++ trunk/Source/JavaScriptCore/ftl/FTLCapabilities.cpp 2014-02-15 08:34:07 UTC (rev 164166)
</span><span class="lines">@@ -46,6 +46,7 @@
</span><span class="cx"> case JSConstant:
</span><span class="cx"> case WeakJSConstant:
</span><span class="cx"> case GetMyArgumentsLength:
</span><ins>+ case GetMyArgumentByVal:
</ins><span class="cx"> case GetLocal:
</span><span class="cx"> case SetLocal:
</span><span class="cx"> case MovHint:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp (164165 => 164166)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2014-02-15 08:33:43 UTC (rev 164165)
+++ trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2014-02-15 08:34:07 UTC (rev 164166)
</span><span class="lines">@@ -299,6 +299,9 @@
</span><span class="cx"> case GetMyArgumentsLength:
</span><span class="cx"> compileGetMyArgumentsLength();
</span><span class="cx"> break;
</span><ins>+ case GetMyArgumentByVal:
+ compileGetMyArgumentByVal();
+ break;
</ins><span class="cx"> case ZombieHint:
</span><span class="cx"> compileZombieHint();
</span><span class="cx"> break;
</span><span class="lines">@@ -2030,7 +2033,28 @@
</span><span class="cx"> return;
</span><span class="cx"> } }
</span><span class="cx"> }
</span><del>-
</del><ins>+
+ void compileGetMyArgumentByVal()
+ {
+ LValue property = lowInt32(m_node->child1());
+ TypedPointer argsPtr = addressFor(m_node->origin.semantic.stackOffset());
+ LValue args = argsPtr.value();
+ LValue propPtr = m_out.signExt(property, m_out.intPtr);
+
+ speculate(Uncountable, noValue(), 0,
+ m_out.aboveOrEqual(propPtr,
+ addressFor(m_node->origin.semantic.stackOffset() + JSStack::ArgumentCount).value()));
+
+ speculate(Uncountable, noValue(), 0,
+ m_out.notNull(
+ addressFor(m_node->origin.semantic.stackOffset()).value())); // Where is SlowArgumentData?
+
+ setJSValue(m_out.load64(m_out.baseIndex(
+ argsPtr.heap(),
+ args, propPtr, ScaleEight,
+ JSStack::ThisArgument * sizeof(Register) + sizeof(Register))));
+ }
+
</ins><span class="cx"> void compilePutByVal()
</span><span class="cx"> {
</span><span class="cx"> Edge child1 = m_graph.varArgChild(m_node, 0);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressftlgetbyvalargumentsjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/ftl-getbyval-arguments.js (0 => 164166)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/ftl-getbyval-arguments.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/ftl-getbyval-arguments.js 2014-02-15 08:34:07 UTC (rev 164166)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+function foo(a){
+ return arguments[1];
+}
+noInline(foo);
+
+var r = 0;
+for (var i = 0; i < 100000; ++i) {
+ var r = foo(52, 42);
+}
+
+if (r != 42) throw "Error: "+r;
+
</ins></span></pre>
</div>
</div>
</body>
</html>