Minor cleanup and optimisation of element methods.

src/objects-inl.h

 // Copyright 2012 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 5028 matching lines @@
   return GetLocalPropertyAttribute(name) != ABSENT;
 }
 
 
 PropertyAttributes JSReceiver::GetPropertyAttribute(String* key) {
   return GetPropertyAttributeWithReceiver(this, key);
 }
 
 
 PropertyAttributes JSReceiver::GetElementAttribute(uint32_t index) {
-  return GetElementAttributeWithReceiver(this, index, true);
+  if (IsJSProxy()) {
+    return JSProxy::cast(this)->GetElementAttributeWithHandler(this, index);
+  }
+  return JSObject::cast(this)->GetElementAttributeWithReceiver(
+      this, index, true);
 }
 
 
 // TODO(504): this may be useful in other places too where JSGlobalProxy
 // is used.
 Object* JSObject::BypassGlobalProxy() {
   if (IsJSGlobalProxy()) {
     Object* proto = GetPrototype();
     if (proto->IsNull()) return GetHeap()->undefined_value();
     ASSERT(proto->IsJSGlobalObject());
     return proto;
   }
   return this;
 }
 
 
 MaybeObject* JSReceiver::GetIdentityHash(CreationFlag flag) {
   return IsJSProxy()
       ? JSProxy::cast(this)->GetIdentityHash(flag)
       : JSObject::cast(this)->GetIdentityHash(flag);
 }
 
 
 bool JSReceiver::HasElement(uint32_t index) {
   if (IsJSProxy()) {
     return JSProxy::cast(this)->HasElementWithHandler(index);
   }
-  return JSObject::cast(this)->GetElementAttribute(index) != ABSENT;
+  return JSObject::cast(this)->GetElementAttributeWithReceiver(
+      this, index, true) != ABSENT;
 }
 
 
 bool JSReceiver::HasLocalElement(uint32_t index) {
   if (IsJSProxy()) {
     return JSProxy::cast(this)->HasElementWithHandler(index);
   }
-  return JSObject::cast(this)->GetLocalElementAttribute(index) != ABSENT;
+  return JSObject::cast(this)->GetElementAttributeWithReceiver(
+      this, index, false) != ABSENT;
 }
 
 
-PropertyAttributes JSReceiver::GetElementAttributeWithReceiver(
-    JSReceiver* receiver, uint32_t index, bool continue_search) {
-  if (IsJSProxy()) {
-    return JSProxy::cast(this)->GetElementAttributeWithHandler(receiver, index);
-  }
-  return JSObject::cast(this)->GetElementAttributeWithReceiver(
-      receiver, index, continue_search);
-}
-
-
 PropertyAttributes JSReceiver::GetLocalElementAttribute(uint32_t index) {
   if (IsJSProxy()) {
     return JSProxy::cast(this)->GetElementAttributeWithHandler(this, index);
   }
   return JSObject::cast(this)->GetElementAttributeWithReceiver(
       this, index, false);
 }
 
 
 bool AccessorInfo::all_can_read() {
@@ skipping 444 matching lines @@
 #undef WRITE_UINT32_FIELD
 #undef READ_SHORT_FIELD
 #undef WRITE_SHORT_FIELD
 #undef READ_BYTE_FIELD
 #undef WRITE_BYTE_FIELD
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_OBJECTS_INL_H_