Revert "Make instanceof and Object.getPrototypeOf work for proxies, plus a few other tweaks."

src/v8natives.js

 // Copyright 2006-2008 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 318 matching lines @@
 // ES5 8.10.3.
 function IsGenericDescriptor(desc) {
   return !(IsAccessorDescriptor(desc) || IsDataDescriptor(desc));
 }
 
 
 function IsInconsistentDescriptor(desc) {
   return IsAccessorDescriptor(desc) && IsDataDescriptor(desc);
 }
 
-
 // ES5 8.10.4
 function FromPropertyDescriptor(desc) {
   if (IS_UNDEFINED(desc)) return desc;
   var obj = new $Object();
   if (IsDataDescriptor(desc)) {
     obj.value = desc.getValue();
     obj.writable = desc.isWritable();
   }
   if (IsAccessorDescriptor(desc)) {
     obj.get = desc.getGet();
@@ skipping 43 matching lines @@
     desc.setSet(set);
   }
 
   if (IsInconsistentDescriptor(desc)) {
     throw MakeTypeError("value_and_accessor", [obj]);
   }
   return desc;
 }
 
 
-// For Harmony proxies.
-function ToCompletePropertyDescriptor(obj) {
-  var desc = ToPropertyDescriptor(obj)
-  if (IsGenericDescriptor(desc) || IsDataDescriptor(desc)) {
-    if (!("value" in desc)) desc.value = void 0;
-    if (!("writable" in desc)) desc.writable = false;
-  } else {
-    // Is accessor descriptor.
-    if (!("get" in desc)) desc.get = void 0;
-    if (!("set" in desc)) desc.set = void 0;
-  }
-  if (!("enumerable" in desc)) desc.enumerable = false;
-  if (!("configurable" in desc)) desc.configurable = false;
-  return desc;
-}
-
-
 function PropertyDescriptor() {
   // Initialize here so they are all in-object and have the same map.
   // Default values from ES5 8.6.1.
   this.value_ = void 0;
   this.hasValue_ = false;
   this.writable_ = false;
   this.hasWritable_ = false;
   this.enumerable_ = false;
   this.hasEnumerable_ = false;
   this.configurable_ = false;
@@ skipping 128 matching lines @@
   }
   desc.setEnumerable(desc_array[ENUMERABLE_INDEX]);
   desc.setConfigurable(desc_array[CONFIGURABLE_INDEX]);
 
   return desc;
 }
 
 
 // ES5 section 8.12.2.
 function GetProperty(obj, p) {
-  if (%IsJSProxy(obj)) {
-    var handler = %GetHandler(obj);
-    var getProperty = handler.getPropertyDescriptor;
-    if (IS_UNDEFINED(getProperty)) {
-      throw MakeTypeError("handler_trap_missing",
-                          [handler, "getPropertyDescriptor"]);
-    }
-    var descriptor = getProperty.call(handler, p);
-    if (IS_UNDEFINED(descriptor)) return descriptor;
-    var desc = ToCompletePropertyDescriptor(descriptor);
-    if (!desc.configurable) {
-      throw MakeTypeError("proxy_prop_not_configurable",
-                          [handler, "getPropertyDescriptor", p, descriptor]);
-    }
-    return desc;
-  }
   var prop = GetOwnProperty(obj);
   if (!IS_UNDEFINED(prop)) return prop;
-  var proto = %GetPrototype(obj);
+  var proto = obj.__proto__;
   if (IS_NULL(proto)) return void 0;
   return GetProperty(proto, p);
 }
 
 
 // ES5 section 8.12.6
 function HasProperty(obj, p) {
-  if (%IsJSProxy(obj)) {
-    var handler = %GetHandler(obj)
-    var has = handler.has
-    if (IS_UNDEFINED(has)) has = DerivedHasTrap
-    return ToBoolean(has.call(handler, obj, p))
-  }
   var desc = GetProperty(obj, p);
   return IS_UNDEFINED(desc) ? false : true;
 }
 
 
 // ES5 section 8.12.1.
 function GetOwnProperty(obj, p) {
   // GetOwnProperty returns an array indexed by the constants
   // defined in macros.py.
   // If p is not a property on obj undefined is returned.
@@ skipping 168 matching lines @@
     }
   }
   return true;
 }
 
 
 // ES5 section 15.2.3.2.
 function ObjectGetPrototypeOf(obj) {
   if (!IS_SPEC_OBJECT(obj))
     throw MakeTypeError("obj_ctor_property_non_object", ["getPrototypeOf"]);
-  return %GetPrototype(obj);
+  return obj.__proto__;
 }
 
 
 // ES5 section 15.2.3.3
 function ObjectGetOwnPropertyDescriptor(obj, p) {
   if (!IS_SPEC_OBJECT(obj))
     throw MakeTypeError("obj_ctor_property_non_object", ["getOwnPropertyDescriptor"]);
   var desc = GetOwnProperty(obj, p);
   return FromPropertyDescriptor(desc);
 }
 
 
-// For Harmony proxies
-function ToStringArray(obj, trap) {
-  if (!IS_SPEC_OBJECT(obj)) {
-    throw MakeTypeError("proxy_non_object_prop_names", [obj, trap]);
-  }
-  var n = ToUint32(obj.length);
-  var array = new $Array(n);
-  var names = {}
-  for (var index = 0; index < n; index++) {
-    var s = ToString(obj[index]);
-    if (s in names) {
-      throw MakeTypeError("proxy_repeated_prop_name", [obj, trap, s])
-    }
-    array[index] = s;
-    names.s = 0;
-  }
-  return array;
-}
-
-
 // ES5 section 15.2.3.4.
 function ObjectGetOwnPropertyNames(obj) {
   if (!IS_SPEC_OBJECT(obj))
     throw MakeTypeError("obj_ctor_property_non_object", ["getOwnPropertyNames"]);
 
-  // Special handling for proxies.
-  if (%IsJSProxy(obj)) {
-    var handler = %GetHandler(obj);
-    var getOwnPropertyNames = handler.getOwnPropertyNames;
-    if (IS_UNDEFINED(getOwnPropertyNames)) {
-      throw MakeTypeError("handler_trap_missing",
-                          [handler, "getOwnPropertyNames"]);
-    }
-    var names = getOwnPropertyNames.call(handler);
-    return ToStringArray(names, "getOwnPropertyNames");
-  }
-
   // Find all the indexed properties.
 
   // Get the local element names.
   var propertyNames = %GetLocalElementNames(obj);
 
   // Get names for indexed interceptor properties.
   if (%GetInterceptorInfo(obj) & 1) {
     var indexedInterceptorNames =
         %GetIndexedInterceptorElementNames(obj);
     if (indexedInterceptorNames)
@@ skipping 538 matching lines @@
 // ----------------------------------------------------------------------------
 
 function SetupFunction() {
   InstallFunctions($Function.prototype, DONT_ENUM, $Array(
     "bind", FunctionBind,
     "toString", FunctionToString
   ));
 }
 
 SetupFunction();