<!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>[164122] tags/Safari-538.16.6</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/164122">164122</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-02-14 12:57:45 -0800 (Fri, 14 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/164119">r164119</a>. </pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari538166LayoutTestsChangeLog">tags/Safari-538.16.6/LayoutTests/ChangeLog</a></li>
<li><a href="#tagsSafari538166SourceJavaScriptCoreChangeLog">tags/Safari-538.16.6/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#tagsSafari538166SourceJavaScriptCorejitJITOperationscpp">tags/Safari-538.16.6/Source/JavaScriptCore/jit/JITOperations.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#tagsSafari538166LayoutTestsjsregressscripttestsvariadicclosurecalljs">tags/Safari-538.16.6/LayoutTests/js/regress/script-tests/variadic-closure-call.js</a></li>
<li><a href="#tagsSafari538166LayoutTestsjsregressvariadicclosurecallexpectedtxt">tags/Safari-538.16.6/LayoutTests/js/regress/variadic-closure-call-expected.txt</a></li>
<li><a href="#tagsSafari538166LayoutTestsjsregressvariadicclosurecallhtml">tags/Safari-538.16.6/LayoutTests/js/regress/variadic-closure-call.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari538166LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.16.6/LayoutTests/ChangeLog (164121 => 164122)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.16.6/LayoutTests/ChangeLog 2014-02-14 20:56:02 UTC (rev 164121)
+++ tags/Safari-538.16.6/LayoutTests/ChangeLog 2014-02-14 20:57:45 UTC (rev 164122)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-02-14 Lucas Forschler <lforschler@apple.com>
+
+ Merge r164119
+
+ 2014-02-14 Filip Pizlo <fpizlo@apple.com>
+
+ Don't optimize variadic closure calls
+ https://bugs.webkit.org/show_bug.cgi?id=128835
+
+ Reviewed by Gavin Barraclough.
+
+ Add a test that covers both the performance and correctness of this case.
+
+ * js/regress/script-tests/variadic-closure-call.js: Added.
+ (foo.bar):
+ (foo):
+ * js/regress/variadic-closure-call-expected.txt: Added.
+ * js/regress/variadic-closure-call.html: Added.
+
</ins><span class="cx"> 2014-02-05 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r163418
</span></span></pre></div>
<a id="tagsSafari538166LayoutTestsjsregressscripttestsvariadicclosurecalljsfromrev164119trunkLayoutTestsjsregressscripttestsvariadicclosurecalljs"></a>
<div class="copfile"><h4>Copied: tags/Safari-538.16.6/LayoutTests/js/regress/script-tests/variadic-closure-call.js (from rev 164119, trunk/LayoutTests/js/regress/script-tests/variadic-closure-call.js) (0 => 164122)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.16.6/LayoutTests/js/regress/script-tests/variadic-closure-call.js (rev 0)
+++ tags/Safari-538.16.6/LayoutTests/js/regress/script-tests/variadic-closure-call.js 2014-02-14 20:57:45 UTC (rev 164122)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+function foo(a) {
+ var x = 42 + a;
+ function bar(a, b, c) {
+ var result = a + b + c;
+ for (var i = 3; i < arguments.length; ++i)
+ result = arguments[i] * x;
+ return result;
+ }
+ return bar.apply(this, arguments);
+}
+
+// Warm everything up with variadic calls that don't fail arity checks.
+for (var i = 0; i < 100000; ++i) {
+ var args = [];
+ var n = (i % 8) + 8;
+ for (var j = 0; j < n; ++j)
+ args.push(j);
+ var result = foo.apply(null, args);
+ if (("" + result) != ("" + [294, 336, 378, 420, 462, 504, 546, 588][n - 8]))
+ throw "Error: bad result for i = " + i + ": " + result;
+}
+
+// Start failing some arity checks.
+for (var i = 0; i < 100000; ++i) {
+ var args = [];
+ var n = i % 16;
+ for (var j = 0; j < n; ++j)
+ args.push(j);
+ var result = foo.apply(null, args);
+ if (("" + result) != ("" + [0/0, 0/0, 0/0, 3, 126, 168, 210, 252, 294, 336, 378, 420, 462, 504, 546, 588][n]))
+ throw "Error: bad result for i = " + i + ": " + result;
+}
+
</ins></span></pre></div>
<a id="tagsSafari538166LayoutTestsjsregressvariadicclosurecallexpectedtxtfromrev164119trunkLayoutTestsjsregressvariadicclosurecallexpectedtxt"></a>
<div class="copfile"><h4>Copied: tags/Safari-538.16.6/LayoutTests/js/regress/variadic-closure-call-expected.txt (from rev 164119, trunk/LayoutTests/js/regress/variadic-closure-call-expected.txt) (0 => 164122)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.16.6/LayoutTests/js/regress/variadic-closure-call-expected.txt (rev 0)
+++ tags/Safari-538.16.6/LayoutTests/js/regress/variadic-closure-call-expected.txt 2014-02-14 20:57:45 UTC (rev 164122)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+JSRegress/variadic-closure-call
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS no exception thrown
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="tagsSafari538166LayoutTestsjsregressvariadicclosurecallhtmlfromrev164119trunkLayoutTestsjsregressvariadicclosurecallhtml"></a>
<div class="copfile"><h4>Copied: tags/Safari-538.16.6/LayoutTests/js/regress/variadic-closure-call.html (from rev 164119, trunk/LayoutTests/js/regress/variadic-closure-call.html) (0 => 164122)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.16.6/LayoutTests/js/regress/variadic-closure-call.html (rev 0)
+++ tags/Safari-538.16.6/LayoutTests/js/regress/variadic-closure-call.html 2014-02-14 20:57:45 UTC (rev 164122)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+</head>
+<body>
+<script src="resources/regress-pre.js"></script>
+<script src="script-tests/variadic-closure-call.js"></script>
+<script src="resources/regress-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="tagsSafari538166SourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.16.6/Source/JavaScriptCore/ChangeLog (164121 => 164122)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.16.6/Source/JavaScriptCore/ChangeLog 2014-02-14 20:56:02 UTC (rev 164121)
+++ tags/Safari-538.16.6/Source/JavaScriptCore/ChangeLog 2014-02-14 20:57:45 UTC (rev 164122)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2014-02-14 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r164119
+
+ 2014-02-14 Filip Pizlo <fpizlo@apple.com>
+
+ Don't optimize variadic closure calls
+ https://bugs.webkit.org/show_bug.cgi?id=128835
+
+ Reviewed by Gavin Barraclough.
+
+ Read the check that had been in JITStubs.cpp, back in the day. This code came
+ from the DFG and the DFG didn't need these checks.
+
+ * jit/JITOperations.cpp:
+
+2014-02-14 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r164063
</span><span class="cx">
</span><span class="cx"> 2014-02-13 Mark Hahnenberg <mhahnenberg@apple.com>
</span></span></pre></div>
<a id="tagsSafari538166SourceJavaScriptCorejitJITOperationscpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-538.16.6/Source/JavaScriptCore/jit/JITOperations.cpp (164121 => 164122)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-538.16.6/Source/JavaScriptCore/jit/JITOperations.cpp 2014-02-14 20:56:02 UTC (rev 164121)
+++ tags/Safari-538.16.6/Source/JavaScriptCore/jit/JITOperations.cpp 2014-02-14 20:57:45 UTC (rev 164122)
</span><span class="lines">@@ -804,7 +804,7 @@
</span><span class="cx"> codeBlock = 0;
</span><span class="cx"> else {
</span><span class="cx"> codeBlock = jsCast<FunctionExecutable*>(callee->executable())->codeBlockForCall();
</span><del>- if (execCallee->argumentCountIncludingThis() < static_cast<size_t>(codeBlock->numParameters()))
</del><ins>+ if (execCallee->argumentCountIncludingThis() < static_cast<size_t>(codeBlock->numParameters()) || callLinkInfo.callType == CallLinkInfo::CallVarargs)
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>