| Index: src/arm/ic-arm.cc
|
| diff --git a/src/arm/ic-arm.cc b/src/arm/ic-arm.cc
|
| index 7b85f43be6eb7e5614308dfa80b5421d0db68867..0a16ba51161d8d0ed8dd43ded3061d5f26707265 100644
|
| --- a/src/arm/ic-arm.cc
|
| +++ b/src/arm/ic-arm.cc
|
| @@ -989,10 +989,10 @@ static void KeyedStoreGenerateGenericHelper(
|
| receiver_map,
|
| r4,
|
| slow);
|
| - ASSERT(receiver_map.is(r3)); // Transition code expects map in r3
|
| AllocationSiteMode mode = AllocationSite::GetMode(FAST_SMI_ELEMENTS,
|
| FAST_DOUBLE_ELEMENTS);
|
| - ElementsTransitionGenerator::GenerateSmiToDouble(masm, mode, slow);
|
| + ElementsTransitionGenerator::GenerateSmiToDouble(
|
| + masm, receiver, key, value, receiver_map, mode, slow);
|
| __ ldr(elements, FieldMemOperand(receiver, JSObject::kElementsOffset));
|
| __ jmp(&fast_double_without_map_check);
|
|
|
| @@ -1003,10 +1003,9 @@ static void KeyedStoreGenerateGenericHelper(
|
| receiver_map,
|
| r4,
|
| slow);
|
| - ASSERT(receiver_map.is(r3)); // Transition code expects map in r3
|
| mode = AllocationSite::GetMode(FAST_SMI_ELEMENTS, FAST_ELEMENTS);
|
| - ElementsTransitionGenerator::GenerateMapChangeElementsTransition(masm, mode,
|
| - slow);
|
| + ElementsTransitionGenerator::GenerateMapChangeElementsTransition(
|
| + masm, receiver, key, value, receiver_map, mode, slow);
|
| __ ldr(elements, FieldMemOperand(receiver, JSObject::kElementsOffset));
|
| __ jmp(&finish_object_store);
|
|
|
| @@ -1019,9 +1018,9 @@ static void KeyedStoreGenerateGenericHelper(
|
| receiver_map,
|
| r4,
|
| slow);
|
| - ASSERT(receiver_map.is(r3)); // Transition code expects map in r3
|
| mode = AllocationSite::GetMode(FAST_DOUBLE_ELEMENTS, FAST_ELEMENTS);
|
| - ElementsTransitionGenerator::GenerateDoubleToObject(masm, mode, slow);
|
| + ElementsTransitionGenerator::GenerateDoubleToObject(
|
| + masm, receiver, key, value, receiver_map, mode, slow);
|
| __ ldr(elements, FieldMemOperand(receiver, JSObject::kElementsOffset));
|
| __ jmp(&finish_object_store);
|
| }
|
|
|