<!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>[210660] branches/safari-603-branch</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/210660">210660</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2017-01-12 08:46:08 -0800 (Thu, 12 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/210563">r210563</a>. rdar://problem/29940224</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari603branchJSTestsChangeLog">branches/safari-603-branch/JSTests/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceJavaScriptCoreChangeLog">branches/safari-603-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceJavaScriptCorebuiltinsFunctionPrototypejs">branches/safari-603-branch/Source/JavaScriptCore/builtins/FunctionPrototype.js</a></li>
<li><a href="#branchessafari603branchSourceJavaScriptCoreruntimeIntlDateTimeFormatPrototypecpp">branches/safari-603-branch/Source/JavaScriptCore/runtime/IntlDateTimeFormatPrototype.cpp</a></li>
<li><a href="#branchessafari603branchSourceJavaScriptCoreruntimeIntlNumberFormatPrototypecpp">branches/safari-603-branch/Source/JavaScriptCore/runtime/IntlNumberFormatPrototype.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari603branchJSTestsstresspropertysettersshouldnotbecalledforboundargumentslistentriesjs">branches/safari-603-branch/JSTests/stress/property-setters-should-not-be-called-for-bound-arguments-list-entries.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari603branchJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/JSTests/ChangeLog (210659 => 210660)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/JSTests/ChangeLog 2017-01-12 16:46:05 UTC (rev 210659)
+++ branches/safari-603-branch/JSTests/ChangeLog 2017-01-12 16:46:08 UTC (rev 210660)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2017-01-12 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r210563. rdar://problem/29940224
+
+ 2017-01-10 Mark Lam <mark.lam@apple.com>
+
+ Property setters should not be called for bound arguments list entries.
+ https://bugs.webkit.org/show_bug.cgi?id=165631
+
+ Reviewed by Filip Pizlo.
+
+ * stress/property-setters-should-not-be-called-for-bound-arguments-list-entries.js: Added.
+
+2017-01-12 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r210457. rdar://problem/27330808
</span><span class="cx">
</span><span class="cx"> 2017-01-06 Michael Saboff <msaboff@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchJSTestsstresspropertysettersshouldnotbecalledforboundargumentslistentriesjs"></a>
<div class="addfile"><h4>Added: branches/safari-603-branch/JSTests/stress/property-setters-should-not-be-called-for-bound-arguments-list-entries.js (0 => 210660)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/JSTests/stress/property-setters-should-not-be-called-for-bound-arguments-list-entries.js (rev 0)
+++ branches/safari-603-branch/JSTests/stress/property-setters-should-not-be-called-for-bound-arguments-list-entries.js 2017-01-12 16:46:08 UTC (rev 210660)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+Object.defineProperty(Array.prototype, "0", {
+ set: () => {
+ throw "ERROR: setter should not be called for bound arguments list";
+ }
+});
+
+function dummy() { }
+var f = dummy.bind({}, 1, 2, 3, 4);
</ins></span></pre></div>
<a id="branchessafari603branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/JavaScriptCore/ChangeLog (210659 => 210660)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/JavaScriptCore/ChangeLog 2017-01-12 16:46:05 UTC (rev 210659)
+++ branches/safari-603-branch/Source/JavaScriptCore/ChangeLog 2017-01-12 16:46:08 UTC (rev 210660)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2017-01-12 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r210563. rdar://problem/29940224
+
+ 2017-01-10 Mark Lam <mark.lam@apple.com>
+
+ Property setters should not be called for bound arguments list entries.
+ https://bugs.webkit.org/show_bug.cgi?id=165631
+
+ Reviewed by Filip Pizlo.
+
+ * builtins/FunctionPrototype.js:
+ (bind):
+ - use @putByValDirect to set the bound arguments so that we don't consult the
+ prototype chain for setters.
+
+ * runtime/IntlDateTimeFormatPrototype.cpp:
+ (JSC::IntlDateTimeFormatPrototypeGetterFormat):
+ * runtime/IntlNumberFormatPrototype.cpp:
+ (JSC::IntlNumberFormatPrototypeGetterFormat):
+ - no need to create a bound arguments array because these bound functions binds
+ no arguments according to the spec.
+
+2017-01-12 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r210553. rdar://problem/29941356
</span><span class="cx">
</span><span class="cx"> 2017-01-09 Filip Pizlo <fpizlo@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchSourceJavaScriptCorebuiltinsFunctionPrototypejs"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/JavaScriptCore/builtins/FunctionPrototype.js (210659 => 210660)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/JavaScriptCore/builtins/FunctionPrototype.js 2017-01-12 16:46:05 UTC (rev 210659)
+++ branches/safari-603-branch/Source/JavaScriptCore/builtins/FunctionPrototype.js 2017-01-12 16:46:08 UTC (rev 210660)
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> numBoundArgs = argumentCount - 1;
</span><span class="cx"> boundArgs = @newArrayWithSize(numBoundArgs);
</span><span class="cx"> for (let i = 0; i < numBoundArgs; i++)
</span><del>- boundArgs[i] = arguments[i + 1];
</del><ins>+ @putByValDirect(boundArgs, i, arguments[i + 1]);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> let length = 0;
</span></span></pre></div>
<a id="branchessafari603branchSourceJavaScriptCoreruntimeIntlDateTimeFormatPrototypecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/JavaScriptCore/runtime/IntlDateTimeFormatPrototype.cpp (210659 => 210660)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/JavaScriptCore/runtime/IntlDateTimeFormatPrototype.cpp 2017-01-12 16:46:05 UTC (rev 210659)
+++ branches/safari-603-branch/Source/JavaScriptCore/runtime/IntlDateTimeFormatPrototype.cpp 2017-01-12 16:46:08 UTC (rev 210660)
</span><span class="lines">@@ -137,12 +137,8 @@
</span><span class="cx"> // a. Let F be a new built-in function object as defined in 12.3.4.
</span><span class="cx"> // b. The value of F’s length property is 1. (Note: F’s length property was 0 in ECMA-402 1.0)
</span><span class="cx"> JSFunction* targetObject = JSFunction::create(vm, globalObject, 1, ASCIILiteral("format"), IntlDateTimeFormatFuncFormatDateTime, NoIntrinsic);
</span><del>- JSArray* boundArgs = JSArray::tryCreateUninitialized(vm, globalObject->arrayStructureForIndexingTypeDuringAllocation(ArrayWithUndecided), 0);
- if (!boundArgs)
- return JSValue::encode(throwOutOfMemoryError(state, scope));
-
</del><span class="cx"> // c. Let bf be BoundFunctionCreate(F, «this value»).
</span><del>- boundFormat = JSBoundFunction::create(vm, state, globalObject, targetObject, dtf, boundArgs, 1, ASCIILiteral("format"));
</del><ins>+ boundFormat = JSBoundFunction::create(vm, state, globalObject, targetObject, dtf, nullptr, 1, ASCIILiteral("format"));
</ins><span class="cx"> RETURN_IF_EXCEPTION(scope, encodedJSValue());
</span><span class="cx"> // d. Set dtf.[[boundFormat]] to bf.
</span><span class="cx"> dtf->setBoundFormat(vm, boundFormat);
</span></span></pre></div>
<a id="branchessafari603branchSourceJavaScriptCoreruntimeIntlNumberFormatPrototypecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/JavaScriptCore/runtime/IntlNumberFormatPrototype.cpp (210659 => 210660)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/JavaScriptCore/runtime/IntlNumberFormatPrototype.cpp 2017-01-12 16:46:05 UTC (rev 210659)
+++ branches/safari-603-branch/Source/JavaScriptCore/runtime/IntlNumberFormatPrototype.cpp 2017-01-12 16:46:08 UTC (rev 210660)
</span><span class="lines">@@ -125,12 +125,8 @@
</span><span class="cx"> // a. Let F be a new built-in function object as defined in 11.3.4.
</span><span class="cx"> // b. The value of F’s length property is 1.
</span><span class="cx"> JSFunction* targetObject = JSFunction::create(vm, globalObject, 1, ASCIILiteral("format"), IntlNumberFormatFuncFormatNumber, NoIntrinsic);
</span><del>- JSArray* boundArgs = JSArray::tryCreateUninitialized(vm, globalObject->arrayStructureForIndexingTypeDuringAllocation(ArrayWithUndecided), 0);
- if (!boundArgs)
- return JSValue::encode(throwOutOfMemoryError(state, scope));
-
</del><span class="cx"> // c. Let bf be BoundFunctionCreate(F, «this value»).
</span><del>- boundFormat = JSBoundFunction::create(vm, state, globalObject, targetObject, nf, boundArgs, 1, ASCIILiteral("format"));
</del><ins>+ boundFormat = JSBoundFunction::create(vm, state, globalObject, targetObject, nf, nullptr, 1, ASCIILiteral("format"));
</ins><span class="cx"> RETURN_IF_EXCEPTION(scope, encodedJSValue());
</span><span class="cx"> // d. Set nf.[[boundFormat]] to bf.
</span><span class="cx"> nf->setBoundFormat(vm, boundFormat);
</span></span></pre>
</div>
</div>
</body>
</html>