1 files changed, 43 insertions, 0 deletions
diff --git a/js/src/tests/test262/built-ins/Map/iterator-close-after-set-failure.js b/js/src/tests/test262/built-ins/Map/iterator-close-after-set-failure.js
new file mode 100644
index 0000000000..17645d1ccb
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Map/iterator-close-after-set-failure.js
@@ -0,0 +1,43 @@
+// Copyright (C) 2015 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+esid: sec-map-iterable
+description: >
+  The iterator is closed when `Map.prototype.set` throws an error.
+info: |
+  Map ( [ iterable ] )
+
+  ...
+  9. Repeat
+    ...
+    k. Let status be Call(adder, map, «k.[[value]], v.[[value]]»).
+    l. If status is an abrupt completion, return IteratorClose(iter, status).
+features: [Symbol.iterator]
+---*/
+
+var count = 0;
+var iterable = {};
+iterable[Symbol.iterator] = function() {
+  return {
+    next: function() {
+      return {
+        value: [],
+        done: false
+      };
+    },
+    return: function() {
+      count += 1;
+    }
+  };
+};
+Map.prototype.set = function() {
+  throw new Test262Error();
+}
+
+assert.throws(Test262Error, function() {
+  new Map(iterable);
+});
+
+assert.sameValue(count, 1);
+
+reportCompare(0, 0);