1 files changed, 25 insertions, 0 deletions
diff --git a/js/src/tests/test262/built-ins/String/prototype/codePointAt/return-abrupt-from-this.js b/js/src/tests/test262/built-ins/String/prototype/codePointAt/return-abrupt-from-this.js
new file mode 100644
index 0000000000..c83735ca0f
--- /dev/null
+++ b/js/src/tests/test262/built-ins/String/prototype/codePointAt/return-abrupt-from-this.js
@@ -0,0 +1,25 @@
+// Copyright (C) 2015 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+es6id: 21.1.3.3
+description: >
+  Returns abrupt from ToString(this)
+info: |
+  21.1.3.3 String.prototype.codePointAt ( pos )
+
+  1. Let O be RequireObjectCoercible(this value).
+  2. Let S be ToString(O).
+  3. ReturnIfAbrupt(S).
+---*/
+
+var o = {
+  toString: function() {
+    throw new Test262Error();
+  }
+};
+
+assert.throws(Test262Error, function() {
+  String.prototype.codePointAt.call(o, 1);
+});
+
+reportCompare(0, 0);