Changeset 207235 in webkit

Timestamp:

Oct 12, 2016 12:40:51 PM (8 years ago)

Author:

keith_miller@apple.com

Message:

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):

Location:

trunk

Files:

• JSTests/ChakraCore/test/Array/array_sort.baseline-jsc (modified) (1 diff)
• JSTests/ChangeLog (modified) (1 diff)
• JSTests/stress/array-sort-bad-comparator.js (added)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/builtins/ArrayPrototype.js (modified) (2 diffs)

trunk/JSTests/ChakraCore/test/Array/array_sort.baseline-jsc

@@ -8 +8 @@
 10
 1,1.2,4,4.8,12
+TypeError: Array.prototype.sort requires the comparsion function be a function or undefined
 1,2,3

trunk/JSTests/ChangeLog

@@ +1 @@
+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):
+
 2016-10-12  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+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):
+
 2016-10-12  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/JavaScriptCore/builtins/ArrayPrototype.js

@@ -607 +607 @@
     }
 
-    function comparatorSort(array, comparator)
-    {
-        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;
-
+    function comparatorSort(array, length, comparator)
+    {
         var valueCount = compact(array, length);
         mergeSort(array, valueCount, comparator);
     }
 
-    function stringSort(array)
-    {
-        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;
-
+    function stringSort(array, length)
+    {
         var valueCount = compact(array, length);
 
@@ -641 +627 @@
         @throwTypeError("Array.prototype.sort requires that |this| not be null or undefined");
 
-    if (typeof this == "string")
-        @throwTypeError("Attempted to assign to readonly property.");
-
-    var array = @Object(this);
+    var array = @Object(this);
+
+    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;
 
     if (typeof comparator == "function")
-        comparatorSort(array, comparator);
+        comparatorSort(array, length, comparator);
+    else if (comparator === @undefined)
+        stringSort(array, length);
     else
-        stringSort(array);
+        @throwTypeError("Array.prototype.sort requires the comparsion function be a function or undefined");
 
     return array;