Index: src/objects.cc |
diff --git a/src/objects.cc b/src/objects.cc |
index 4fb289aaa014b40c5011ef391cdc6da334defdeb..0ea99e3b6cb670f42779107d544b1cae9ebf4611 100644 |
--- a/src/objects.cc |
+++ b/src/objects.cc |
@@ -692,10 +692,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; |
} |
} |
@@ -5552,7 +5549,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 |
@@ -5570,7 +5567,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 |
@@ -8917,7 +8914,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; |
} |
@@ -9055,7 +9052,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; |
} |
@@ -9916,10 +9913,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); |