1 files changed, 18 insertions, 0 deletions
diff --git a/js/src/tests/non262/RegExp/RegExpExec-exec.js b/js/src/tests/non262/RegExp/RegExpExec-exec.js
new file mode 100644
index 0000000000..e92792fcf4
--- /dev/null
+++ b/js/src/tests/non262/RegExp/RegExpExec-exec.js
@@ -0,0 +1,18 @@
+var BUGNUMBER = 887016;
+var summary = "RegExpExec should throw if exec property of non-RegExp is not callable";
+
+print(BUGNUMBER + ": " + summary);
+
+for (var exec of [null, 0, false, undefined, ""]) {
+  // RegExp with non-callable exec
+  var re = /a/;
+  re.exec = exec;
+  RegExp.prototype[Symbol.match].call(re, "foo");
+
+  // non-RegExp with non-callable exec
+  assertThrowsInstanceOf(() => RegExp.prototype[Symbol.match].call({ exec }, "foo"),
+                         TypeError);
+}
+
+if (typeof reportCompare === "function")
+    reportCompare(true, true);