Bug 1279303 - Implement change to O.getOwnPropertyDescriptors and update tests. r=efaust
authorTom Schuster <evilpies@gmail.com>
Wed, 27 Jul 2016 20:12:04 +0200
changeset 332002 71c43f3a49e42029f96c9b982151a6a6a8aee306
parent 332001 855b04e6a3745f6be837b652bf81e557423408a2
child 332003 bc6fb539da99b972e3a9755ca8e5bbf5d06db14f
push id9858
push userjlund@mozilla.com
push dateMon, 01 Aug 2016 14:37:10 +0000
treeherdermozilla-aurora@203106ef6cb6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersefaust
bugs1279303
milestone50.0a1
Bug 1279303 - Implement change to O.getOwnPropertyDescriptors and update tests. r=efaust
js/src/builtin/Object.js
js/src/tests/test262/built-ins/Object/getOwnPropertyDescriptors/duplicate-keys.js
js/src/tests/test262/built-ins/Object/getOwnPropertyDescriptors/proxy-undefined-descriptor.js
js/src/tests/test262/built-ins/Object/getOwnPropertyDescriptors/shell.js
--- a/js/src/builtin/Object.js
+++ b/js/src/builtin/Object.js
@@ -55,17 +55,18 @@ function ObjectGetOwnPropertyDescriptors
     // Step 4.
     for (var index = 0, len = keys.length; index < len; index++) {
         var key = keys[index];
 
         // Steps 4.a-b.
         var desc = std_Object_getOwnPropertyDescriptor(obj, key);
 
         // Step 4.c.
-        _DefineDataProperty(descriptors, key, desc);
+        if (typeof desc !== "undefined")
+            _DefineDataProperty(descriptors, key, desc);
     }
 
     // Step 5.
     return descriptors;
 }
 
 /* ES6 draft rev 32 (2015 Feb 2) 19.1.2.9. */
 function ObjectGetPrototypeOf(obj) {
--- a/js/src/tests/test262/built-ins/Object/getOwnPropertyDescriptors/duplicate-keys.js
+++ b/js/src/tests/test262/built-ins/Object/getOwnPropertyDescriptors/duplicate-keys.js
@@ -22,10 +22,17 @@ var proxy = new Proxy({}, {
   getOwnPropertyDescriptor(t, name) {
     log += 'getOwnPropertyDescriptor:' + name + '|';
     return descriptors[i++];
   }
 });
 
 var result = Object.getOwnPropertyDescriptors(proxy);
 assert.sameValue(result.hasOwnProperty('DUPLICATE'), true);
-assert.sameValue(result.DUPLICATE, undefined);
+
+var lastDescriptor = descriptors[descriptors.length - 1];
+assert.notSameValue(result.DUPLICATE, lastDescriptor);
+assert.sameValue(result.DUPLICATE.enumerable, lastDescriptor.enumerable);
+assert.sameValue(result.DUPLICATE.configurable, lastDescriptor.configurable);
+assert.sameValue(result.DUPLICATE.value, lastDescriptor.value);
+assert.sameValue(result.DUPLICATE.writable, lastDescriptor.writable);
+
 assert.sameValue(log, 'ownKeys|getOwnPropertyDescriptor:DUPLICATE|getOwnPropertyDescriptor:DUPLICATE|getOwnPropertyDescriptor:DUPLICATE|');
new file mode 100644
--- /dev/null
+++ b/js/src/tests/test262/built-ins/Object/getOwnPropertyDescriptors/proxy-undefined-descriptor.js
@@ -0,0 +1,32 @@
+// Copyright (C) 2016 Jordan Harband. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+description: Object.getOwnPropertyDescriptors should filter out undefined OwnPropertyDescriptors
+esid: sec-object.getownpropertydescriptors
+author: Jordan Harband
+featurewws: [Proxy]
+includes: [proxyTrapsHelper.js]
+---*/
+
+var key = "a";
+var ownKeys = [key];
+var badProxyHandlers = {
+  getOwnPropertyDescriptor: function () {},
+  ownKeys: function () {
+    return ownKeys;
+  }
+};
+var proxy = new Proxy({}, badProxyHandlers);
+
+var keys = Reflect.ownKeys(proxy);
+assert.notSameValue(keys, ownKeys, 'Object.keys returns a new Array');
+assert.sameValue(Array.isArray(keys), true, 'Object.keys returns an Array');
+assert.sameValue(keys.length, ownKeys.length, 'keys and ownKeys have the same length');
+assert.sameValue(keys[0], ownKeys[0], 'keys and ownKeys have the same contents');
+
+var descriptor = Object.getOwnPropertyDescriptor(proxy, key);
+assert.sameValue(descriptor, undefined, "Descriptor matches result of [[GetOwnPropertyDescriptor]] trap");
+
+var result = Object.getOwnPropertyDescriptors(proxy);
+assert.sameValue(key in result, false, "key is not present in result");
--- a/js/src/tests/test262/built-ins/Object/getOwnPropertyDescriptors/shell.js
+++ b/js/src/tests/test262/built-ins/Object/getOwnPropertyDescriptors/shell.js
@@ -1,10 +1,19 @@
 var assert = {
     sameValue: assertEq,
+    notSameValue(a, b, msg) {
+      try {
+        assertEq(a, b);
+        throw "equal"
+      } catch (e) {
+        if (e === "equal")
+          throw new Error("Assertion failed: expected different values, got " + a);
+      }
+    },
     throws(ctor, f) {
       var fullmsg;
       try {
         f();
       } catch (exc) {
         if (exc instanceof ctor)
           return;
         fullmsg = "Assertion failed: expected exception " + ctor.name + ", got " + exc;