Adding upstream version 115.7.0esr.upstream/115.7.0esrupstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 38 insertions, 0 deletions

diff --git a/js/src/tests/test262/built-ins/JSON/parse/reviver-object-own-keys-err.js b/js/src/tests/test262/built-ins/JSON/parse/reviver-object-own-keys-err.js
new file mode 100644
index 0000000000..d795500537
--- /dev/null
+++ b/js/src/tests/test262/built-ins/JSON/parse/reviver-object-own-keys-err.js
@@ -0,0 +1,38 @@
+// Copyright (C) 2016 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+esid: sec-internalizejsonproperty
+description: Abrupt completion from object property enumeration while reviving
+info: |
+  JSON.parse ( text [ , reviver ] )
+
+  [...]
+  7. If IsCallable(reviver) is true, then
+     [...]
+     e. Return ? InternalizeJSONProperty(root, rootName).
+
+  Runtime Semantics: InternalizeJSONProperty ( holder, name)
+
+  1. Let val be ? Get(holder, name).
+  2. If Type(val) is Object, then
+     a. Let isArray be ? IsArray(val).
+     b. If isArray is true, then
+        [...]
+     c. Else,
+        i. Let keys be ? EnumerableOwnProperties(val, "key").
+features: [Proxy]
+---*/
+
+var badKeys = new Proxy({}, {
+  ownKeys: function() {
+    throw new Test262Error();
+  }
+});
+
+assert.throws(Test262Error, function() {
+  JSON.parse('[0,0]', function() {
+    this[1] = badKeys;
+  });
+});
+
+reportCompare(0, 0);