From f1c1b33b5357c59f4dfe0c8a4b72b9f0bc1b5126 Mon Sep 17 00:00:00 2001
From: Jordan Harband <ljharb@gmail.com>
Date: Mon, 12 Jun 2017 15:21:33 -0700
Subject: [PATCH] Array.prototype.sort and %TypedArray%.prototype.sort should
 throw on a non-undefined non-function (#1059)

Per https://github.com/tc39/ecma262/pull/785/
---
 .../sort/comparefn-nonfunction-call-throws.js | 49 +++++++++++++++++
 .../sort/comparefn-nonfunction-call-throws.js | 54 +++++++++++++++++++
 2 files changed, 103 insertions(+)
 create mode 100644 test/built-ins/Array/prototype/sort/comparefn-nonfunction-call-throws.js
 create mode 100644 test/built-ins/TypedArray/prototype/sort/comparefn-nonfunction-call-throws.js

diff --git a/test/built-ins/Array/prototype/sort/comparefn-nonfunction-call-throws.js b/test/built-ins/Array/prototype/sort/comparefn-nonfunction-call-throws.js
new file mode 100644
index 00000000000..f3377d3a4ca
--- /dev/null
+++ b/test/built-ins/Array/prototype/sort/comparefn-nonfunction-call-throws.js
@@ -0,0 +1,49 @@
+// Copyright (C) 2017 Jordan Harband. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+esid: sec-array.prototype.sort
+description: throws on a non-undefined non-function
+info: >
+  22.1.3.25 Array.prototype.sort ( comparefn )
+
+  Upon entry, the following steps are performed to initialize evaluation
+  of the sort function:
+
+  ...
+  1. If _comparefn_ is not *undefined* and IsCallable(_comparefn_) is *false*, throw a *TypeError* exception.
+  ...
+---*/
+
+var sample = [1, 2, 3];
+
+assert.throws(TypeError, function() {
+ sample.sort(null);
+});
+
+assert.throws(TypeError, function() {
+  sample.sort(true);
+});
+
+assert.throws(TypeError, function() {
+  sample.sort(false);
+});
+
+assert.throws(TypeError, function() {
+  sample.sort('');
+});
+
+assert.throws(TypeError, function() {
+  sample.sort(/a/g);
+});
+
+assert.throws(TypeError, function() {
+  sample.sort(42);
+});
+
+assert.throws(TypeError, function() {
+  sample.sort([]);
+});
+
+assert.throws(TypeError, function() {
+  sample.sort({});
+});
diff --git a/test/built-ins/TypedArray/prototype/sort/comparefn-nonfunction-call-throws.js b/test/built-ins/TypedArray/prototype/sort/comparefn-nonfunction-call-throws.js
new file mode 100644
index 00000000000..e0fcc633c77
--- /dev/null
+++ b/test/built-ins/TypedArray/prototype/sort/comparefn-nonfunction-call-throws.js
@@ -0,0 +1,54 @@
+// Copyright (C) 2017 Jordan Harband. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+esid: sec-%typedarray%.prototype.sort
+description: throws on a non-undefined non-function
+info: >
+  22.2.3.26 %TypedArray%.prototype.sort ( comparefn )
+
+  Upon entry, the following steps are performed to initialize evaluation
+  of the sort function. These steps are used instead of the entry steps
+  in 22.1.3.25:
+
+  ...
+  1. If _comparefn_ is not *undefined* and IsCallable(_comparefn_) is *false*, throw a *TypeError* exception.
+  ...
+
+includes: [testTypedArray.js]
+---*/
+
+testWithTypedArrayConstructors(function(TA) {
+  var sample = new TA([42, 43, 44, 45, 46]);
+
+  assert.throws(TypeError, function() {
+    sample.sort(null);
+  });
+
+  assert.throws(TypeError, function() {
+    sample.sort(true);
+  });
+
+  assert.throws(TypeError, function() {
+    sample.sort(false);
+  });
+
+  assert.throws(TypeError, function() {
+    sample.sort('');
+  });
+
+  assert.throws(TypeError, function() {
+    sample.sort(/a/g);
+  });
+
+  assert.throws(TypeError, function() {
+    sample.sort(42);
+  });
+
+  assert.throws(TypeError, function() {
+    sample.sort([]);
+  });
+
+  assert.throws(TypeError, function() {
+    sample.sort({});
+  });
+});