Index: src/objects.cc |
diff --git a/src/objects.cc b/src/objects.cc |
index 5205bcb35bbdb781edf82f74661336fb43d4e1c7..940120541e4ca51be3861fa72dca83c97b44fa80 100644 |
--- a/src/objects.cc |
+++ b/src/objects.cc |
@@ -691,10 +691,7 @@ MaybeObject* Object::GetElementWithReceiver(Object* receiver, uint32_t index) { |
if (js_object->elements() != heap->empty_fixed_array()) { |
MaybeObject* result = js_object->GetElementsAccessor()->Get( |
- js_object->elements(), |
- index, |
- js_object, |
- receiver); |
+ receiver, js_object, index); |
if (result != heap->the_hole_value()) return result; |
} |
} |
@@ -5551,7 +5548,7 @@ MaybeObject* PolymorphicCodeCacheHashTable::Put(MapHandleList* maps, |
MaybeObject* FixedArray::AddKeysFromJSArray(JSArray* array) { |
ElementsAccessor* accessor = array->GetElementsAccessor(); |
MaybeObject* maybe_result = |
- accessor->AddElementsToFixedArray(array->elements(), this, array, array); |
+ accessor->AddElementsToFixedArray(array, array, this); |
FixedArray* result; |
if (!maybe_result->To<FixedArray>(&result)) return maybe_result; |
#ifdef DEBUG |
@@ -5569,7 +5566,7 @@ MaybeObject* FixedArray::AddKeysFromJSArray(JSArray* array) { |
MaybeObject* FixedArray::UnionOfKeys(FixedArray* other) { |
ElementsAccessor* accessor = ElementsAccessor::ForArray(other); |
MaybeObject* maybe_result = |
- accessor->AddElementsToFixedArray(other, this, NULL, NULL); |
+ accessor->AddElementsToFixedArray(NULL, NULL, this, other); |
FixedArray* result; |
if (!maybe_result->To<FixedArray>(&result)) return maybe_result; |
#ifdef DEBUG |
@@ -8895,7 +8892,7 @@ bool JSObject::HasElementWithInterceptor(JSReceiver* receiver, uint32_t index) { |
} |
if (holder_handle->GetElementsAccessor()->HasElement( |
- holder_handle->elements(), index, *holder_handle, *receiver_handle)) { |
+ *receiver_handle, *holder_handle, index)) { |
return true; |
} |
@@ -9033,7 +9030,7 @@ bool JSObject::HasElementWithReceiver(JSReceiver* receiver, uint32_t index) { |
} |
ElementsAccessor* accessor = GetElementsAccessor(); |
- if (accessor->HasElement(elements(), index, this, receiver)) { |
+ if (accessor->HasElement(receiver, this, index)) { |
return true; |
} |
@@ -9894,10 +9891,9 @@ MaybeObject* JSObject::GetElementWithInterceptor(Object* receiver, |
Heap* heap = holder_handle->GetHeap(); |
ElementsAccessor* handler = holder_handle->GetElementsAccessor(); |
- MaybeObject* raw_result = handler->Get(holder_handle->elements(), |
- index, |
+ MaybeObject* raw_result = handler->Get(*this_handle, |
*holder_handle, |
- *this_handle); |
+ index); |
if (raw_result != heap->the_hole_value()) return raw_result; |
RETURN_IF_SCHEDULED_EXCEPTION(isolate); |