<!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>[198711] trunk</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/198711">198711</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-03-25 22:31:22 -0700 (Fri, 25 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Date.prototype.toLocaleDateString uses overridable Object.create
https://bugs.webkit.org/show_bug.cgi?id=155917
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2016-03-25
Reviewed by Mark Lam.
Source/JavaScriptCore:
* builtins/DatePrototype.js:
(toLocaleString.toDateTimeOptionsAnyAll):
(toLocaleDateString.toDateTimeOptionsDateDate):
(toLocaleTimeString.toDateTimeOptionsTimeTime):
Switch from @Object.create to @Object.@create to guarentee we are
using the built-in create method and not user defined code.
* runtime/CommonIdentifiers.h:
* runtime/ObjectConstructor.cpp:
(JSC::ObjectConstructor::finishCreation):
Setup the @create private symbol.
LayoutTests:
* js/regress-155917-expected.txt: Added.
* js/regress-155917.html: Added.
* js/script-tests/regress-155917.js: Added.
(Object.create):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebuiltinsDatePrototypejs">trunk/Source/JavaScriptCore/builtins/DatePrototype.js</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeCommonIdentifiersh">trunk/Source/JavaScriptCore/runtime/CommonIdentifiers.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeObjectConstructorcpp">trunk/Source/JavaScriptCore/runtime/ObjectConstructor.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsjsregress155917expectedtxt">trunk/LayoutTests/js/regress-155917-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsregress155917html">trunk/LayoutTests/js/regress-155917.html</a></li>
<li><a href="#trunkLayoutTestsjsscripttestsregress155917js">trunk/LayoutTests/js/script-tests/regress-155917.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (198710 => 198711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-03-26 04:37:17 UTC (rev 198710)
+++ trunk/LayoutTests/ChangeLog 2016-03-26 05:31:22 UTC (rev 198711)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-03-25 Joseph Pecoraro <pecoraro@apple.com>
+
+ Date.prototype.toLocaleDateString uses overridable Object.create
+ https://bugs.webkit.org/show_bug.cgi?id=155917
+
+ Reviewed by Mark Lam.
+
+ * js/regress-155917-expected.txt: Added.
+ * js/regress-155917.html: Added.
+ * js/script-tests/regress-155917.js: Added.
+ (Object.create):
+
</ins><span class="cx"> 2016-03-25 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] Audio tracks in alternate groups are not represented correctly as AudioTracks
</span></span></pre></div>
<a id="trunkLayoutTestsjsregress155917expectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress-155917-expected.txt (0 => 198711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress-155917-expected.txt (rev 0)
+++ trunk/LayoutTests/js/regress-155917-expected.txt 2016-03-26 05:31:22 UTC (rev 198711)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+Regression test for https://webkit.org/b/155917. This test should run without throwing an exception.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsjsregress155917html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress-155917.html (0 => 198711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress-155917.html (rev 0)
+++ trunk/LayoutTests/js/regress-155917.html 2016-03-26 05:31:22 UTC (rev 198711)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../resources/js-test-pre.js"></script>
+</head>
+<body>
+<script src="script-tests/regress-155917.js"></script>
+<script src="../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsjsscripttestsregress155917js"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/script-tests/regress-155917.js (0 => 198711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/script-tests/regress-155917.js (rev 0)
+++ trunk/LayoutTests/js/script-tests/regress-155917.js 2016-03-26 05:31:22 UTC (rev 198711)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+description(
+"Regression test for https://webkit.org/b/155917. This test should run without throwing an exception."
+);
+
+Object.create = function() {
+ throw "User defined Object.create should not be used by Date.prototype methods.";
+};
+
+(new Date).toLocaleString();
+(new Date).toLocaleDateString();
+(new Date).toLocaleTimeString();
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (198710 => 198711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-03-26 04:37:17 UTC (rev 198710)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-03-26 05:31:22 UTC (rev 198711)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-03-25 Joseph Pecoraro <pecoraro@apple.com>
+
+ Date.prototype.toLocaleDateString uses overridable Object.create
+ https://bugs.webkit.org/show_bug.cgi?id=155917
+
+ Reviewed by Mark Lam.
+
+ * builtins/DatePrototype.js:
+ (toLocaleString.toDateTimeOptionsAnyAll):
+ (toLocaleDateString.toDateTimeOptionsDateDate):
+ (toLocaleTimeString.toDateTimeOptionsTimeTime):
+ Switch from @Object.create to @Object.@create to guarentee we are
+ using the built-in create method and not user defined code.
+
+ * runtime/CommonIdentifiers.h:
+ * runtime/ObjectConstructor.cpp:
+ (JSC::ObjectConstructor::finishCreation):
+ Setup the @create private symbol.
+
</ins><span class="cx"> 2016-03-25 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> [JSC] Put the x86 Assembler on a binary diet
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebuiltinsDatePrototypejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/builtins/DatePrototype.js (198710 => 198711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/builtins/DatePrototype.js 2016-03-26 04:37:17 UTC (rev 198710)
+++ trunk/Source/JavaScriptCore/builtins/DatePrototype.js 2016-03-26 05:31:22 UTC (rev 198711)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx">
</span><span class="cx"> // Only create descendant if it will have own properties.
</span><span class="cx"> if (needsDefaults) {
</span><del>- options = @Object.create(options)
</del><ins>+ options = @Object.@create(options);
</ins><span class="cx"> options.year = "numeric";
</span><span class="cx"> options.month = "numeric";
</span><span class="cx"> options.day = "numeric";
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx">
</span><span class="cx"> // Only create descendant if it will have own properties.
</span><span class="cx"> if (needsDefaults) {
</span><del>- options = @Object.create(options)
</del><ins>+ options = @Object.@create(options);
</ins><span class="cx"> options.year = "numeric";
</span><span class="cx"> options.month = "numeric";
</span><span class="cx"> options.day = "numeric";
</span><span class="lines">@@ -158,7 +158,7 @@
</span><span class="cx">
</span><span class="cx"> // Only create descendant if it will have own properties.
</span><span class="cx"> if (needsDefaults) {
</span><del>- options = @Object.create(options)
</del><ins>+ options = @Object.@create(options);
</ins><span class="cx"> options.hour = "numeric";
</span><span class="cx"> options.minute = "numeric";
</span><span class="cx"> options.second = "numeric";
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeCommonIdentifiersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/CommonIdentifiers.h (198710 => 198711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/CommonIdentifiers.h 2016-03-26 04:37:17 UTC (rev 198710)
+++ trunk/Source/JavaScriptCore/runtime/CommonIdentifiers.h 2016-03-26 05:31:22 UTC (rev 198711)
</span><span class="lines">@@ -317,6 +317,7 @@
</span><span class="cx"> macro(floor) \
</span><span class="cx"> macro(isFinite) \
</span><span class="cx"> macro(isNaN) \
</span><ins>+ macro(create) \
</ins><span class="cx"> macro(getPrototypeOf) \
</span><span class="cx"> macro(getOwnPropertyDescriptor) \
</span><span class="cx"> macro(getOwnPropertyNames) \
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeObjectConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ObjectConstructor.cpp (198710 => 198711)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ObjectConstructor.cpp 2016-03-26 04:37:17 UTC (rev 198710)
+++ trunk/Source/JavaScriptCore/runtime/ObjectConstructor.cpp 2016-03-26 05:31:22 UTC (rev 198711)
</span><span class="lines">@@ -99,6 +99,7 @@
</span><span class="cx"> // no. of arguments for constructor
</span><span class="cx"> putDirectWithoutTransition(vm, vm.propertyNames->length, jsNumber(1), ReadOnly | DontEnum | DontDelete);
</span><span class="cx">
</span><ins>+ JSC_NATIVE_FUNCTION_WITHOUT_TRANSITION(vm.propertyNames->createPrivateName, objectConstructorCreate, DontEnum, 2);
</ins><span class="cx"> JSC_NATIVE_FUNCTION_WITHOUT_TRANSITION(vm.propertyNames->getPrototypeOfPrivateName, objectConstructorGetPrototypeOf, DontEnum, 1);
</span><span class="cx"> JSC_NATIVE_FUNCTION_WITHOUT_TRANSITION(vm.propertyNames->getOwnPropertyNamesPrivateName, objectConstructorGetOwnPropertyNames, DontEnum, 1);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>