1 files changed, 28 insertions, 0 deletions
diff --git a/js/src/tests/test262/built-ins/Map/get-set-method-failure.js b/js/src/tests/test262/built-ins/Map/get-set-method-failure.js
new file mode 100644
index 0000000000..0f00f969cf
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Map/get-set-method-failure.js
@@ -0,0 +1,28 @@
+// Copyright (C) 2015 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+es6id: 23.1.1.1
+description: >
+  new Map returns abrupt from getting Map.prototype.set.
+info: |
+  Map ( [ iterable ] )
+
+  ...
+  7. Else,
+    a. Let adder be Get(map, "add").
+    b. ReturnIfAbrupt(adder).
+---*/
+
+Object.defineProperty(Map.prototype, 'set', {
+  get: function() {
+    throw new Test262Error();
+  }
+});
+
+new Map();
+
+assert.throws(Test262Error, function() {
+  new Map([]);
+});
+
+reportCompare(0, 0);