<!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>[196949] 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/196949">196949</a></dd>
<dt>Author</dt> <dd>keith_miller@apple.com</dd>
<dt>Date</dt> <dd>2016-02-22 11:43:01 -0800 (Mon, 22 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Builtins that should not rely on iteration do.
https://bugs.webkit.org/show_bug.cgi?id=154475
Reviewed by Geoffrey Garen.
When changing the behavior of varargs calls to use ES6 iterators the
call builtin function's use of a varargs call was overlooked. The use
of iterators is observable outside the scope of the the call function,
thus it must be reimplemented.
* builtins/FunctionPrototype.js:
(call):
* tests/stress/call-apply-builtin-functions-dont-use-iterators.js: Added.
(test):
(addAll):
(catch):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebuiltinsFunctionPrototypejs">trunk/Source/JavaScriptCore/builtins/FunctionPrototype.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoretestsstresscallapplybuiltinfunctionsdontuseiteratorsjs">trunk/Source/JavaScriptCore/tests/stress/call-apply-builtin-functions-dont-use-iterators.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (196948 => 196949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-02-22 19:41:00 UTC (rev 196948)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-02-22 19:43:01 UTC (rev 196949)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-02-22 Keith Miller <keith_miller@apple.com>
+
+ Builtins that should not rely on iteration do.
+ https://bugs.webkit.org/show_bug.cgi?id=154475
+
+ Reviewed by Geoffrey Garen.
+
+ When changing the behavior of varargs calls to use ES6 iterators the
+ call builtin function's use of a varargs call was overlooked. The use
+ of iterators is observable outside the scope of the the call function,
+ thus it must be reimplemented.
+
+ * builtins/FunctionPrototype.js:
+ (call):
+ * tests/stress/call-apply-builtin-functions-dont-use-iterators.js: Added.
+ (test):
+ (addAll):
+ (catch):
+
</ins><span class="cx"> 2016-02-22 Konstantin Tokarev <annulen@yandex.ru>
</span><span class="cx">
</span><span class="cx"> [JSC shell] Don't put empty arguments array to VM.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebuiltinsFunctionPrototypejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/builtins/FunctionPrototype.js (196948 => 196949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/builtins/FunctionPrototype.js 2016-02-22 19:41:00 UTC (rev 196948)
+++ trunk/Source/JavaScriptCore/builtins/FunctionPrototype.js 2016-02-22 19:43:01 UTC (rev 196949)
</span><span class="lines">@@ -27,7 +27,12 @@
</span><span class="cx"> {
</span><span class="cx"> "use strict";
</span><span class="cx">
</span><del>- return this.@call(...arguments);
</del><ins>+ let argumentValues = [];
+ // Start from 1 to ignore thisArgument
+ for (let i = 1; i < arguments.length; i++)
+ @putByValDirect(argumentValues, i-1, arguments[i]);
+
+ return this.@apply(thisArgument, argumentValues);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function apply(thisValue, argumentValues)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstresscallapplybuiltinfunctionsdontuseiteratorsjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/call-apply-builtin-functions-dont-use-iterators.js (0 => 196949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/call-apply-builtin-functions-dont-use-iterators.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/call-apply-builtin-functions-dont-use-iterators.js 2016-02-22 19:43:01 UTC (rev 196949)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+(function(){
+ "use strict";
+ var it = [][Symbol.iterator]();
+ while (it) {
+ if (it.hasOwnProperty('next'))
+ delete it.next;
+ it = Object.getPrototypeOf(it);
+ }
+
+ var bind = Function.prototype.bind;
+ var uncurryThis = bind.bind(bind.call);
+
+ var bindFn = uncurryThis(bind);
+ var applyFn = uncurryThis(bind.apply);
+ function test() { print("here"); }
+ var sliceFn = uncurryThis([].slice);
+ function addAll(var_args) {
+ var args = sliceFn(arguments, 0);
+ var result = this;
+ for (var i = 0; i < args.length; i++)
+ result += args[i];
+ return result;
+ }
+ var sum;
+
+ try {
+ sum = applyFn(addAll, 3, [4, 5, 6]);
+ } catch (err) {
+ print('oops ', err);
+ }
+ print('sum ', sum);
+})();
</ins></span></pre>
</div>
</div>
</body>
</html>