1 files changed, 37 insertions, 0 deletions
diff --git a/js/src/tests/test262/built-ins/Proxy/ownKeys/return-type-throws-null.js b/js/src/tests/test262/built-ins/Proxy/ownKeys/return-type-throws-null.js
new file mode 100644
index 0000000000..3bb2aac425
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Proxy/ownKeys/return-type-throws-null.js
@@ -0,0 +1,37 @@
+// Copyright (C) 2017 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+esid: sec-proxy-object-internal-methods-and-internal-slots-ownpropertykeys
+description: >
+    The returned list must not have entries whose type does not match
+    « String, Symbol ».
+info: |
+    [[OwnPropertyKeys]] ( )
+
+    ...
+    7. Let trapResultArray be ? Call(trap, handler, « target »).
+    8. Let trapResult be ?
+        CreateListFromArrayLike(trapResultArray, « String, Symbol »).
+    ...
+
+    CreateListFromArrayLike ( obj [ , elementTypes ] )
+
+    ...
+    6. Repeat, while index < len
+      ...
+      d. If Type(next) is not an element of elementTypes,
+          throw a TypeError exception.
+features: [Proxy]
+---*/
+
+var p = new Proxy({}, {
+  ownKeys: function() {
+    return [null];
+  }
+});
+
+assert.throws(TypeError, function() {
+  Object.keys(p);
+});
+
+reportCompare(0, 0);