[proxies] Fix Object.prototype.hasOwnProperty

test/mjsunit/harmony/proxies.js

 // Copyright 2011 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 953 matching lines @@
   var p = create(handler)
   assertTrue(Object.prototype.hasOwnProperty.call(p, "a"))
   assertEquals("a", key)
   assertTrue(Object.prototype.hasOwnProperty.call(p, 99))
   assertEquals("99", key)
   assertFalse(Object.prototype.hasOwnProperty.call(p, "z"))
   assertEquals("z", key)
 }
 
 TestHasOwn({
-  has(t, k) { key = k; return k < "z" }
+  getOwnPropertyDescriptor(t, k) {
+    key = k; if (k < "z") return {configurable: true}
+  },
+  has() { assertUnreachable() }
 })
 
 TestHasOwn({
-  has(t, k) { return this.hasOwn2(k) },
-  hasOwn2(k) { key = k; return k < "z" }
+  getOwnPropertyDescriptor(t, k) { return this.getOwnPropertyDescriptor2(k) },
+  getOwnPropertyDescriptor2(k) {
+    key = k; if (k < "z") return {configurable: true}
+  }
 })
 
-TestHasOwn(new Proxy({}, {
-  get(pt, pk, pr) {
-    return (t, k) => { key = k; return k < "z" }
-  }
-}))
 
 
 // ---------------------------------------------------------------------------
 function TestHasOwnThrow(handler) {
   TestWithProxies(TestHasOwnThrow2, handler)
 }
 
 function TestHasOwnThrow2(create, handler) {
   var p = create(handler)
   assertThrows(function(){ Object.prototype.hasOwnProperty.call(p, "a")},
     "myexn")
   assertThrows(function(){ Object.prototype.hasOwnProperty.call(p, 99)},
     "myexn")
 }
 
 TestHasOwnThrow({
-  has(t, k) { throw "myexn" }
+  getOwnPropertyDescriptor(t, k) { throw "myexn" }
 })
 
 TestHasOwnThrow({
-  has(t, k) { return this.hasOwn2(k) },
-  hasOwn2(k) { throw "myexn" }
-})
-
-TestHasOwnThrow(new Proxy({}, {
-  get(pt, pk, pr) { throw "myexn" }
-}))
-
-TestHasOwnThrow(new Proxy({}, {
-  get(pt, pk, pr) {
-    return (t, k) => { throw "myexn" }
-  }
-}));
-
+  getOwnPropertyDescriptor(t, k) { return this.getOwnPropertyDescriptor2(k) },
+  getOwnPropertyDescriptor2(k) { throw "myexn" }
+});
 
 
 // ---------------------------------------------------------------------------
 // Instanceof (instanceof)
 
 (function TestProxyInstanceof() {
   var o1 = {}
   var p1 = new Proxy({}, {})
   var p2 = new Proxy(o1, {})
   var p3 = new Proxy(p2, {})
@@ skipping 521 matching lines @@
   var o = new C();
 
   function f() {
     return o.x;
   }
   assertEquals(10, f());
   assertEquals(10, f());
   %OptimizeFunctionOnNextCall(f);
   assertEquals(10, f());
 })();