1 files changed, 26 insertions, 0 deletions
diff --git a/js/src/tests/test262/built-ins/String/prototype/replace/cstm-replace-get-err.js b/js/src/tests/test262/built-ins/String/prototype/replace/cstm-replace-get-err.js
new file mode 100644
index 0000000000..bad72b1bbc
--- /dev/null
+++ b/js/src/tests/test262/built-ins/String/prototype/replace/cstm-replace-get-err.js
@@ -0,0 +1,26 @@
+// 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 accessing @@replace property
+es6id: 21.1.3.14
+info: |
+    [...]
+    3. If searchValue is neither undefined nor null, then
+       a. Let replacer be GetMethod(searchValue, @@replace).
+       b. ReturnIfAbrupt(replacer).
+features: [Symbol.replace]
+---*/
+
+var poisonedReplace = {};
+Object.defineProperty(poisonedReplace, Symbol.replace, {
+  get: function() {
+    throw new Test262Error();
+  }
+});
+
+assert.throws(Test262Error, function() {
+  ''.replace(poisonedReplace);
+});
+
+reportCompare(0, 0);