1 files changed, 47 insertions, 0 deletions
diff --git a/js/src/tests/test262/built-ins/JSON/parse/revived-proxy-revoked.js b/js/src/tests/test262/built-ins/JSON/parse/revived-proxy-revoked.js
new file mode 100644
index 0000000000..b0f82dcca5
--- /dev/null
+++ b/js/src/tests/test262/built-ins/JSON/parse/revived-proxy-revoked.js
@@ -0,0 +1,47 @@
+// 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-json.parse
+description: Behavior when revived value is a revoked Proxy exotic object
+info: |
+  [...]
+  7. If IsCallable(reviver) is true, then
+     a. Let root be ObjectCreate(%ObjectPrototype%).
+     b. Let rootName be the empty String.
+     c. Let status be CreateDataProperty(root, rootName, unfiltered).
+     d. Assert: status is true.
+     e. Return ? InternalizeJSONProperty(root, rootName).
+
+  24.3.1.1 Runtime Semantics: InternalizeJSONProperty
+
+  [...]
+  2. If Type(val) is Object, then
+     a. Let isArray be ? IsArray(val).
+
+  7.2.2 IsArray
+
+  [...]
+  3. If argument is a Proxy exotic object, then
+     a. If the value of the [[ProxyHandler]] internal slot of argument is null,
+        throw a TypeError exception.
+     b. Let target be the value of the [[ProxyTarget]] internal slot of
+        argument.
+     c. Return ? IsArray(target).
+features: [Proxy]
+---*/
+
+var handle = Proxy.revocable([], {});
+var returnCount = 0;
+
+handle.revoke();
+
+assert.throws(TypeError, function() {
+  JSON.parse('[null, null]', function() {
+    this[1] = handle.proxy;
+    returnCount += 1;
+  });
+});
+
+assert.sameValue(returnCount, 1, 'invocation returns normally');
+
+reportCompare(0, 0);