Skip to content

V
V8
Commit a10e4a17 authored by Mathias Bynens's avatar Mathias Bynens Committed by Commit Bot
Browse files
Options

[js] Check `comparefn` in (Typed)Array#sort 

This patch ensures a `TypeError` is thrown when the argument passed to
`Array.prototype.sort` or `%TypedArray%.prototype.sort` is neither a
function nor `undefined`.

Every other major JavaScript engine already threw in this case. Making
V8’s behavior match increases interoperability.

https://github.com/tc39/ecma262/pull/785

BUG=v8:6542

Cq-Include-Trybots: master.tryserver.v8:v8_linux_noi18n_rel_ng
Change-Id: I412a59810abdd118217c8d8361389ec6c2f640bd
Reviewed-on: https://chromium-review.googlesource.com/668356
Commit-Queue: Mathias Bynens <mathias@chromium.org>
Reviewed-by: 's avatarYang Guo <yangguo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#48028}
parent 01dcb1ef
Hide whitespace changes
Inline Side-by-side
Showing with 68 additions and 24 deletions
src/js/array.js
View file @ a10e4a17
......@@ -1005,6 +1005,10 @@ DEFINE_METHOD(
sort(comparefn) {
CHECK_OBJECT_COERCIBLE(this, "Array.prototype.sort");
if (!IS_UNDEFINED(comparefn) && !IS_CALLABLE(comparefn)) {
throw %make_type_error(kBadSortComparisonFunction, comparefn);
}
var array = TO_OBJECT(this);
var length = TO_LENGTH(array.length);
return InnerArraySort(array, length, comparefn);
......
src/js/typedarray.js
View file @ a10e4a17
......@@ -330,6 +330,10 @@ DEFINE_METHOD(
sort(comparefn) {
ValidateTypedArray(this, "%TypedArray%.prototype.sort");
if (!IS_UNDEFINED(comparefn) && !IS_CALLABLE(comparefn)) {
throw %make_type_error(kBadSortComparisonFunction, comparefn);
}
var length = %_TypedArrayGetLength(this);
if (IS_UNDEFINED(comparefn)) {
......
src/messages.h
View file @ a10e4a17
......@@ -271,6 +271,8 @@ class ErrorUtils : public AllStatic {
T(ArrayFunctionsOnSealed, "Cannot add/remove sealed array elements") \
T(AwaitNotInAsyncFunction, "await is only valid in async function") \
T(AtomicsWaitNotAllowed, "Atomics.wait cannot be called in this context") \
T(BadSortComparisonFunction, \
"The comparison function must be either a function or undefined") \
T(CalledNonCallable, "% is not a function") \
T(CalledOnNonObject, "% called on non-object") \
T(CalledOnNullOrUndefined, "% called on null or undefined") \
......
test/cctest/interpreter/bytecode_expectations/AsyncGenerators.golden
View file @ a10e4a17
......@@ -428,7 +428,7 @@ bytecodes: [
B(TestTypeOf), U8(5),
B(JumpIfFalse), U8(4),
B(Jump), U8(18),
B(Wide), B(LdaSmi), I16(134),
B(Wide), B(LdaSmi), I16(135),
B(Star), R(18),
B(LdaConstant), U8(16),
B(Star), R(19),
......
test/cctest/interpreter/bytecode_expectations/ForAwaitOf.golden
View file @ a10e4a17
......@@ -143,7 +143,7 @@ bytecodes: [
B(TestTypeOf), U8(5),
B(JumpIfFalse), U8(4),
B(Jump), U8(18),
B(Wide), B(LdaSmi), I16(134),
B(Wide), B(LdaSmi), I16(135),
B(Star), R(19),
B(LdaConstant), U8(13),
B(Star), R(20),
......@@ -432,7 +432,7 @@ bytecodes: [
B(TestTypeOf), U8(5),
B(JumpIfFalse), U8(4),
B(Jump), U8(18),
B(Wide), B(LdaSmi), I16(134),
B(Wide), B(LdaSmi), I16(135),
B(Star), R(19),
B(LdaConstant), U8(13),
B(Star), R(20),
......@@ -743,7 +743,7 @@ bytecodes: [
B(TestTypeOf), U8(5),
B(JumpIfFalse), U8(4),
B(Jump), U8(18),
B(Wide), B(LdaSmi), I16(134),
B(Wide), B(LdaSmi), I16(135),
B(Star), R(19),
B(LdaConstant), U8(13),
B(Star), R(20),
......@@ -991,7 +991,7 @@ bytecodes: [
B(TestTypeOf), U8(5),
B(JumpIfFalse), U8(4),
B(Jump), U8(18),
B(Wide), B(LdaSmi), I16(134),
B(Wide), B(LdaSmi), I16(135),
B(Star), R(16),
B(LdaConstant), U8(10),
B(Star), R(17),
......
test/cctest/interpreter/bytecode_expectations/ForOf.golden
View file @ a10e4a17
......@@ -86,7 +86,7 @@ bytecodes: [
B(TestTypeOf), U8(5),
B(JumpIfFalse), U8(4),
B(Jump), U8(18),
B(Wide), B(LdaSmi), I16(134),
B(Wide), B(LdaSmi), I16(135),
B(Star), R(11),
B(LdaConstant), U8(8),
B(Star), R(12),
......@@ -227,7 +227,7 @@ bytecodes: [
B(TestTypeOf), U8(5),
B(JumpIfFalse), U8(4),
B(Jump), U8(18),
B(Wide), B(LdaSmi), I16(134),
B(Wide), B(LdaSmi), I16(135),
B(Star), R(12),
B(LdaConstant), U8(8),
B(Star), R(13),
......@@ -380,7 +380,7 @@ bytecodes: [
B(TestTypeOf), U8(5),
B(JumpIfFalse), U8(4),
B(Jump), U8(18),
B(Wide), B(LdaSmi), I16(134),
B(Wide), B(LdaSmi), I16(135),
B(Star), R(11),
B(LdaConstant), U8(8),
B(Star), R(12),
......@@ -523,7 +523,7 @@ bytecodes: [
B(TestTypeOf), U8(5),
B(JumpIfFalse), U8(4),
B(Jump), U8(18),
B(Wide), B(LdaSmi), I16(134),
B(Wide), B(LdaSmi), I16(135),
B(Star), R(10),
B(LdaConstant), U8(10),
B(Star), R(11),
......
test/cctest/interpreter/bytecode_expectations/ForOfLoop.golden
View file @ a10e4a17
......@@ -90,7 +90,7 @@ bytecodes: [
B(TestTypeOf), U8(5),
B(JumpIfFalse), U8(4),
B(Jump), U8(18),
B(Wide), B(LdaSmi), I16(134),
B(Wide), B(LdaSmi), I16(135),
B(Star), R(13),
B(LdaConstant), U8(7),
B(Star), R(14),
......@@ -268,7 +268,7 @@ bytecodes: [
B(TestTypeOf), U8(5),
B(JumpIfFalse), U8(4),
B(Jump), U8(18),
B(Wide), B(LdaSmi), I16(134),
B(Wide), B(LdaSmi), I16(135),
B(Star), R(13),
B(LdaConstant), U8(11),
B(Star), R(14),
......@@ -422,7 +422,7 @@ bytecodes: [
B(TestTypeOf), U8(5),
B(JumpIfFalse), U8(4),
B(Jump), U8(18),
B(Wide), B(LdaSmi), I16(134),
B(Wide), B(LdaSmi), I16(135),
B(Star), R(11),
B(LdaConstant), U8(9),
B(Star), R(12),
......@@ -524,7 +524,7 @@ bytecodes: [
B(JumpIfUndefined), U8(6),
B(Ldar), R(6),
B(JumpIfNotNull), U8(16),
B(LdaSmi), I8(63),
B(LdaSmi), I8(64),
B(Star), R(17),
B(LdaConstant), U8(4),
B(Star), R(18),
......@@ -580,7 +580,7 @@ bytecodes: [
B(TestTypeOf), U8(5),
B(JumpIfFalse), U8(4),
B(Jump), U8(18),
B(Wide), B(LdaSmi), I16(134),
B(Wide), B(LdaSmi), I16(135),
B(Star), R(16),
B(LdaConstant), U8(9),
B(Star), R(17),
......@@ -754,7 +754,7 @@ bytecodes: [
B(TestTypeOf), U8(5),
B(JumpIfFalse), U8(4),
B(Jump), U8(18),
B(Wide), B(LdaSmi), I16(134),
B(Wide), B(LdaSmi), I16(135),
B(Star), R(16),
B(LdaConstant), U8(10),
B(Star), R(17),
......@@ -953,7 +953,7 @@ bytecodes: [
B(TestTypeOf), U8(5),
B(JumpIfFalse), U8(4),
B(Jump), U8(18),
B(Wide), B(LdaSmi), I16(134),
B(Wide), B(LdaSmi), I16(135),
B(Star), R(15),
B(LdaConstant), U8(14),
B(Star), R(16),
......@@ -1116,7 +1116,7 @@ bytecodes: [
B(TestTypeOf), U8(5),
B(JumpIfFalse), U8(4),
B(Jump), U8(18),
B(Wide), B(LdaSmi), I16(134),
B(Wide), B(LdaSmi), I16(135),
B(Star), R(20),
B(LdaConstant), U8(7),
B(Star), R(21),
......@@ -1358,7 +1358,7 @@ bytecodes: [
B(TestTypeOf), U8(5),
B(JumpIfFalse), U8(4),
B(Jump), U8(18),
B(Wide), B(LdaSmi), I16(134),
B(Wide), B(LdaSmi), I16(135),
B(Star), R(20),
B(LdaConstant), U8(9),
B(Star), R(21),
......
test/cctest/interpreter/bytecode_expectations/Generators.golden
View file @ a10e4a17
......@@ -257,7 +257,7 @@ bytecodes: [
B(TestTypeOf), U8(5),
B(JumpIfFalse), U8(4),
B(Jump), U8(18),
B(Wide), B(LdaSmi), I16(134),
B(Wide), B(LdaSmi), I16(135),
B(Star), R(14),
B(LdaConstant), U8(15),
B(Star), R(15),
......
test/cctest/interpreter/bytecode_expectations/StandardForLoop.golden
View file @ a10e4a17
......@@ -231,7 +231,7 @@ bytecodes: [
B(JumpIfUndefined), U8(6),
B(Ldar), R(3),
B(JumpIfNotNull), U8(16),
B(LdaSmi), I8(63),
B(LdaSmi), I8(64),
B(Star), R(4),
B(LdaConstant), U8(1),
B(Star), R(5),
......
test/mjsunit/harmony/array-sort-comparefn.js 0 → 100644
View file @ a10e4a17
// Copyright 2017 the V8 project authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
// Array.prototype.sort + TypedArray.prototype.sort: comparefn must be either a
// function or undefined.
// https://github.com/tc39/ecma262/pull/785
const types = [
Array,
Int8Array, Uint8Array,
Int16Array, Uint16Array,
Int32Array, Uint32Array,
Uint8ClampedArray,
Float32Array, Float64Array,
];
for (const type of types) {
const array = new type();
array[0] = 1;
array[1] = 2;
array[2] = 3;
array.sort();
array.sort(undefined);
array.sort(() => {});
assertThrows(() => { array.sort(null); }, TypeError);
assertThrows(() => { array.sort(true); }, TypeError);
assertThrows(() => { array.sort(false); }, TypeError);
assertThrows(() => { array.sort(''); }, TypeError);
assertThrows(() => { array.sort(0); }, TypeError);
assertThrows(() => { array.sort(42); }, TypeError);
assertThrows(() => { array.sort([]); }, TypeError);
assertThrows(() => { array.sort(/./); }, TypeError);
assertThrows(() => { array.sort({}); }, TypeError);
assertThrows(() => { array.sort(Symbol()); }, TypeError);
}
test/test262/test262.status
View file @ a10e4a17
......@@ -513,10 +513,6 @@
'language/statements/for-await-of/escaped-of': [FAIL],
'language/statements/for-of/escaped-of': [FAIL],
# https://bugs.chromium.org/p/v8/issues/detail?id=6542
'built-ins/Array/prototype/sort/comparefn-nonfunction-call-throws': [FAIL],
'built-ins/TypedArray/prototype/sort/comparefn-nonfunction-call-throws': [FAIL],
# https://bugs.chromium.org/p/v8/issues/detail?id=6543
'language/statements/labeled/value-await-non-module-escaped': [FAIL],
'language/statements/labeled/value-yield-non-strict-escaped': [FAIL],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment