1 files changed, 31 insertions, 0 deletions
diff --git a/js/src/tests/test262/built-ins/RegExp/prototype/Symbol.replace/fn-err.js b/js/src/tests/test262/built-ins/RegExp/prototype/Symbol.replace/fn-err.js
new file mode 100644
index 0000000000..32e0ccd115
--- /dev/null
+++ b/js/src/tests/test262/built-ins/RegExp/prototype/Symbol.replace/fn-err.js
@@ -0,0 +1,31 @@
+// Copyright (C) 2015 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+description: >
+    Behavior when error is thrown by functional replaceValue.
+es6id: 21.2.5.8
+info: |
+    16. Repeat, for each result in results,
+        [...]
+        m. If functionalReplace is true, then
+           i. Let replacerArgs be «matched».
+           ii. Append in list order the elements of captures to the end of the
+               List replacerArgs.
+           iii. Append position and S as the last two elements of replacerArgs.
+           iv. Let replValue be Call(replaceValue, undefined, replacerArgs).
+           v. Let replacement be ToString(replValue).
+        [...]
+        o. ReturnIfAbrupt(replacement).
+features: [Symbol.replace]
+---*/
+
+var replacer = function() {
+  throw new Test262Error();
+};
+
+assert.throws(Test262Error, function() {
+  /./[Symbol.replace]('a', replacer);
+});
+
+reportCompare(0, 0);