Changeset 267554 in webkit

Timestamp:

Sep 24, 2020, 7:51:45 PM (6 years ago)

Author:

Ross Kirsling

Message:

%TypedArray%.prototype.sort must throw if comparator is defined and uncallable
​https://bugs.webkit.org/show_bug.cgi?id=216952

Reviewed by Yusuke Suzuki.

JSTests:

• stress/typedarray-sort.js:

Fix test.

• test262/expectations.yaml:

Mark two test cases as passing.

Source/JavaScriptCore:

• builtins/TypedArrayPrototype.js:

(sort):

Location:

trunk

Files:

• JSTests/ChangeLog (modified) (1 diff)
• JSTests/stress/typedarray-sort.js (modified) (1 diff)
• JSTests/test262/expectations.yaml (modified) (1 diff)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/builtins/TypedArrayPrototype.js (modified) (1 diff)

trunk/JSTests/ChangeLog

@@ +1 @@
+2020-09-24  Ross Kirsling  <ross.kirsling@sony.com>
+
+        %TypedArray%.prototype.sort must throw if comparator is defined and uncallable
+        https://bugs.webkit.org/show_bug.cgi?id=216952
+
+        Reviewed by Yusuke Suzuki.
+
+        * stress/typedarray-sort.js:
+        Fix test.
+
+        * test262/expectations.yaml:
+        Mark two test cases as passing.
+
 2020-09-24  Ross Kirsling  <ross.kirsling@sony.com>
 

trunk/JSTests/stress/typedarray-sort.js

@@ -50 +50 @@
 
 debug("4.0 Wrong Type for Callback Test");
-shouldBeTrue("testPrototypeFunction('sort', '(8)', [12, 15, 10, 13, 44], [10, 12, 13, 15, 44])");
-shouldBeTrue("testPrototypeFunction('sort', '(\"wrong\")', [12, 15, 10, 13, 44], [10, 12, 13, 15, 44])");
-shouldBeTrue("testPrototypeFunction('sort', '(new Object())', [12, 15, 10, 13, 44], [10, 12, 13, 15, 44])");
-shouldBeTrue("testPrototypeFunction('sort', '(null)', [12, 15, 10, 13, 44], [10, 12, 13, 15, 44])");
+shouldThrow("testPrototypeFunction('sort', '(8)', [12, 15, 10, 13, 44], [10, 12, 13, 15, 44])");
+shouldThrow("testPrototypeFunction('sort', '(\"wrong\")', [12, 15, 10, 13, 44], [10, 12, 13, 15, 44])");
+shouldThrow("testPrototypeFunction('sort', '(new Object())', [12, 15, 10, 13, 44], [10, 12, 13, 15, 44])");
+shouldThrow("testPrototypeFunction('sort', '(null)', [12, 15, 10, 13, 44], [10, 12, 13, 15, 44])");
 debug("");
 finishJSTest();

trunk/JSTests/test262/expectations.yaml

@@ -1252 +1252 @@
   default: 'TypeError: Underlying ArrayBuffer has been detached from the view (Testing with Float64Array.)'
   strict mode: 'TypeError: Underlying ArrayBuffer has been detached from the view (Testing with Float64Array.)'
-test/built-ins/TypedArray/prototype/sort/comparefn-nonfunction-call-throws.js:
-  default: 'Test262Error: Expected a TypeError to be thrown but no exception was thrown at all (Testing with Float64Array.)'
-  strict mode: 'Test262Error: Expected a TypeError to be thrown but no exception was thrown at all (Testing with Float64Array.)'
 test/built-ins/TypedArray/prototype/toLocaleString/calls-tostring-from-each-value.js:
   default: 'Test262Error: should not call valueOf if toString is present (Testing with Float64Array.)'

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2020-09-24  Ross Kirsling  <ross.kirsling@sony.com>
+
+        %TypedArray%.prototype.sort must throw if comparator is defined and uncallable
+        https://bugs.webkit.org/show_bug.cgi?id=216952
+
+        Reviewed by Yusuke Suzuki.
+
+        * builtins/TypedArrayPrototype.js:
+        (sort):
+
 2020-09-24  Ross Kirsling  <ross.kirsling@sony.com>
 

trunk/Source/JavaScriptCore/builtins/TypedArrayPrototype.js

@@ -218 +218 @@
     }
 
-    var length = @typedArrayLength(this);
-
+    if (comparator !== @undefined && !@isCallable(comparator))
+        @throwTypeError("TypedArray.prototype.sort requires the comparator argument to be a function or undefined");
+
+    var length = @typedArrayLength(this);
     if (length < 2)
         return;
 
-    if (@isCallable(comparator))
+    if (comparator !== @undefined)
         mergeSort(this, length, comparator);
     else
         @typedArraySort(this);
-    
+
     return this;
 }