1 files changed, 23 insertions, 0 deletions
diff --git a/js/src/tests/test262/built-ins/Object/entries/exception-during-enumeration.js b/js/src/tests/test262/built-ins/Object/entries/exception-during-enumeration.js
new file mode 100644
index 0000000000..ae746122f7
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Object/entries/exception-during-enumeration.js
@@ -0,0 +1,23 @@
+// Copyright (C) 2015 Jordan Harband. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-object.entries
+description: Object.entries should terminate if getting a value throws an exception
+author: Jordan Harband
+---*/
+
+var trappedKey = {
+  get a() {
+    throw new RangeError('This error should be re-thrown');
+  },
+  get b() {
+    throw new Test262Error('Should not try to get the second element');
+  }
+};
+
+assert.throws(RangeError, function() {
+  Object.entries(trappedKey);
+});
+
+reportCompare(0, 0);