1 files changed, 35 insertions, 0 deletions
diff --git a/js/src/tests/test262/built-ins/String/raw/returns-abrupt-from-next-key-toString.js b/js/src/tests/test262/built-ins/String/raw/returns-abrupt-from-next-key-toString.js
new file mode 100644
index 0000000000..5d39385342
--- /dev/null
+++ b/js/src/tests/test262/built-ins/String/raw/returns-abrupt-from-next-key-toString.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.
+/*---
+es6id: 21.1.2.4
+description: >
+  Returns abrupt from nextKey.
+info: |
+  21.1.2.4 String.raw ( template , ...substitutions )
+
+  ...
+  10. Let stringElements be a new List.
+  11. Let nextIndex be 0.
+  12. Repeat
+    a. Let nextKey be ToString(nextIndex).
+    b. Let nextSeg be ToString(Get(raw, nextKey)).
+    c. ReturnIfAbrupt(nextSeg).
+  ...
+---*/
+
+var obj = {
+  raw: {
+    length: 1,
+    '0': {
+      toString: function() {
+        throw new Test262Error();
+      }
+    }
+  }
+};
+
+assert.throws(Test262Error, function() {
+  String.raw(obj);
+});
+
+reportCompare(0, 0);