1 files changed, 35 insertions, 0 deletions
diff --git a/js/src/tests/test262/built-ins/RegExp/prototype/Symbol.replace/get-exec-err.js b/js/src/tests/test262/built-ins/RegExp/prototype/Symbol.replace/get-exec-err.js
new file mode 100644
index 0000000000..6d431b44fb
--- /dev/null
+++ b/js/src/tests/test262/built-ins/RegExp/prototype/Symbol.replace/get-exec-err.js
@@ -0,0 +1,35 @@
+// 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 there is an error thrown while accessing the `exec` method of
+    "global" instances
+es6id: 21.2.5.8
+info: |
+    [...]
+    13. Repeat, while done is false
+        a. Let result be RegExpExec(rx, S).
+ 
+    ES6 21.2.5.2.1 Runtime Semantics: RegExpExec ( R, S )
+
+    [...]
+    3. Let exec be Get(R, "exec").
+    4. ReturnIfAbrupt(exec).
+features: [Symbol.replace]
+---*/
+
+var r = { flags: 'g', global: true };
+Object.defineProperty(r, 'exec', {
+  get: function() {
+    throw new Test262Error();
+  }
+});
+
+assert.throws(Test262Error, function() {
+  RegExp.prototype[Symbol.replace].call(r, '', '');
+});
+
+assert.sameValue(r.lastIndex, 0, 'Error thrown after setting `lastIndex`');
+
+reportCompare(0, 0);