<!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>[207235] 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/207235">207235</a></dd>
<dt>Author</dt> <dd>keith_miller@apple.com</dd>
<dt>Date</dt> <dd>2016-10-12 12:40:51 -0700 (Wed, 12 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Handle non-function, non-undefined comparator in Array.prototype.sort
https://bugs.webkit.org/show_bug.cgi?id=163085
Reviewed by Yusuke Suzuki.
JSTests:
* ChakraCore/test/Array/array_sort.baseline-jsc:
* stress/array-sort-bad-comparator.js: Added.
(test):
Source/JavaScriptCore:
* builtins/ArrayPrototype.js:
(sort.comparatorSort):
(sort.stringSort):
(sort):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkJSTestsChakraCoretestArrayarray_sortbaselinejsc">trunk/JSTests/ChakraCore/test/Array/array_sort.baseline-jsc</a></li>
<li><a href="#trunkJSTestsChangeLog">trunk/JSTests/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebuiltinsArrayPrototypejs">trunk/Source/JavaScriptCore/builtins/ArrayPrototype.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkJSTestsstressarraysortbadcomparatorjs">trunk/JSTests/stress/array-sort-bad-comparator.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJSTestsChakraCoretestArrayarray_sortbaselinejsc"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/ChakraCore/test/Array/array_sort.baseline-jsc (207234 => 207235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/ChakraCore/test/Array/array_sort.baseline-jsc 2016-10-12 19:35:55 UTC (rev 207234)
+++ trunk/JSTests/ChakraCore/test/Array/array_sort.baseline-jsc 2016-10-12 19:40:51 UTC (rev 207235)
</span><span class="lines">@@ -7,4 +7,5 @@
</span><span class="cx"> 1,2,3
</span><span class="cx"> 10
</span><span class="cx"> 1,1.2,4,4.8,12
</span><ins>+TypeError: Array.prototype.sort requires the comparsion function be a function or undefined
</ins><span class="cx"> 1,2,3
</span></span></pre></div>
<a id="trunkJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/ChangeLog (207234 => 207235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/ChangeLog 2016-10-12 19:35:55 UTC (rev 207234)
+++ trunk/JSTests/ChangeLog 2016-10-12 19:40:51 UTC (rev 207235)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-10-12 Keith Miller <keith_miller@apple.com>
+
+ Handle non-function, non-undefined comparator in Array.prototype.sort
+ https://bugs.webkit.org/show_bug.cgi?id=163085
+
+ Reviewed by Yusuke Suzuki.
+
+ * ChakraCore/test/Array/array_sort.baseline-jsc:
+ * stress/array-sort-bad-comparator.js: Added.
+ (test):
+
</ins><span class="cx"> 2016-10-12 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> Array.prototype.slice should not modify frozen objects.
</span></span></pre></div>
<a id="trunkJSTestsstressarraysortbadcomparatorjs"></a>
<div class="addfile"><h4>Added: trunk/JSTests/stress/array-sort-bad-comparator.js (0 => 207235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/stress/array-sort-bad-comparator.js (rev 0)
+++ trunk/JSTests/stress/array-sort-bad-comparator.js 2016-10-12 19:40:51 UTC (rev 207235)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+//@ runDefault
+
+function test() {
+ try {
+ [1,2].sort(null);
+ return false;
+ } catch (enull) {}
+ try {
+ [1,2].sort(true);
+ return false;
+ } catch (etrue) {}
+ try {
+ [1,2].sort({});
+ return false;
+ } catch (eobj) {}
+ try {
+ [1,2].sort([]);
+ return false;
+ } catch (earr) {}
+ try {
+ [1,2].sort(/a/g);
+ return false;
+ } catch (eregex) {}
+ return true;
+}
+
+if(!test())
+ throw new Error("Bad result");
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (207234 => 207235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-10-12 19:35:55 UTC (rev 207234)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-10-12 19:40:51 UTC (rev 207235)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-10-12 Keith Miller <keith_miller@apple.com>
+
+ Handle non-function, non-undefined comparator in Array.prototype.sort
+ https://bugs.webkit.org/show_bug.cgi?id=163085
+
+ Reviewed by Yusuke Suzuki.
+
+ * builtins/ArrayPrototype.js:
+ (sort.comparatorSort):
+ (sort.stringSort):
+ (sort):
+
</ins><span class="cx"> 2016-10-12 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r207179): ASSERTION FAILED: node.cell != previousCell
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebuiltinsArrayPrototypejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/builtins/ArrayPrototype.js (207234 => 207235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/builtins/ArrayPrototype.js 2016-10-12 19:35:55 UTC (rev 207234)
+++ trunk/Source/JavaScriptCore/builtins/ArrayPrototype.js 2016-10-12 19:40:51 UTC (rev 207235)
</span><span class="lines">@@ -606,28 +606,14 @@
</span><span class="cx"> return dst;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function comparatorSort(array, comparator)
</del><ins>+ function comparatorSort(array, length, comparator)
</ins><span class="cx"> {
</span><del>- var length = array.length >>> 0;
-
- // For compatibility with Firefox and Chrome, do nothing observable
- // to the target array if it has 0 or 1 sortable properties.
- if (length < 2)
- return;
-
</del><span class="cx"> var valueCount = compact(array, length);
</span><span class="cx"> mergeSort(array, valueCount, comparator);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function stringSort(array)
</del><ins>+ function stringSort(array, length)
</ins><span class="cx"> {
</span><del>- var length = array.length >>> 0;
-
- // For compatibility with Firefox and Chrome, do nothing observable
- // to the target array if it has 0 or 1 sortable properties.
- if (length < 2)
- return;
-
</del><span class="cx"> var valueCount = compact(array, length);
</span><span class="cx">
</span><span class="cx"> var strings = @newArrayWithSize(valueCount);
</span><span class="lines">@@ -640,15 +626,21 @@
</span><span class="cx"> if (this == null)
</span><span class="cx"> @throwTypeError("Array.prototype.sort requires that |this| not be null or undefined");
</span><span class="cx">
</span><del>- if (typeof this == "string")
- @throwTypeError("Attempted to assign to readonly property.");
-
</del><span class="cx"> var array = @Object(this);
</span><span class="cx">
</span><ins>+ var length = array.length >>> 0;
+
+ // For compatibility with Firefox and Chrome, do nothing observable
+ // to the target array if it has 0 or 1 sortable properties.
+ if (length < 2)
+ return array;
+
</ins><span class="cx"> if (typeof comparator == "function")
</span><del>- comparatorSort(array, comparator);
</del><ins>+ comparatorSort(array, length, comparator);
+ else if (comparator === @undefined)
+ stringSort(array, length);
</ins><span class="cx"> else
</span><del>- stringSort(array);
</del><ins>+ @throwTypeError("Array.prototype.sort requires the comparsion function be a function or undefined");
</ins><span class="cx">
</span><span class="cx"> return array;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>