| Index: src/mips/ic-mips.cc
|
| diff --git a/src/mips/ic-mips.cc b/src/mips/ic-mips.cc
|
| index 0f9d687b5cfa6a014e22aea5ddf1b7d920e23ea4..6d29c1ed5325a921fa80e9e44795556ca0709ce5 100644
|
| --- a/src/mips/ic-mips.cc
|
| +++ b/src/mips/ic-mips.cc
|
| @@ -1295,7 +1295,9 @@ static void KeyedStoreGenerateGenericHelper(
|
| t0,
|
| slow);
|
| ASSERT(receiver_map.is(a3)); // Transition code expects map in a3
|
| - ElementsTransitionGenerator::GenerateSmiToDouble(masm, slow);
|
| + AllocationSiteMode mode = AllocationSiteInfo::GetMode(FAST_SMI_ELEMENTS,
|
| + FAST_DOUBLE_ELEMENTS);
|
| + ElementsTransitionGenerator::GenerateSmiToDouble(masm, mode, slow);
|
| __ lw(elements, FieldMemOperand(receiver, JSObject::kElementsOffset));
|
| __ jmp(&fast_double_without_map_check);
|
|
|
| @@ -1307,7 +1309,9 @@ static void KeyedStoreGenerateGenericHelper(
|
| t0,
|
| slow);
|
| ASSERT(receiver_map.is(a3)); // Transition code expects map in a3
|
| - ElementsTransitionGenerator::GenerateMapChangeElementsTransition(masm);
|
| + mode = AllocationSiteInfo::GetMode(FAST_SMI_ELEMENTS, FAST_ELEMENTS);
|
| + ElementsTransitionGenerator::GenerateMapChangeElementsTransition(masm, mode,
|
| + slow);
|
| __ lw(elements, FieldMemOperand(receiver, JSObject::kElementsOffset));
|
| __ jmp(&finish_object_store);
|
|
|
| @@ -1321,7 +1325,8 @@ static void KeyedStoreGenerateGenericHelper(
|
| t0,
|
| slow);
|
| ASSERT(receiver_map.is(a3)); // Transition code expects map in a3
|
| - ElementsTransitionGenerator::GenerateDoubleToObject(masm, slow);
|
| + mode = AllocationSiteInfo::GetMode(FAST_DOUBLE_ELEMENTS, FAST_ELEMENTS);
|
| + ElementsTransitionGenerator::GenerateDoubleToObject(masm, mode, slow);
|
| __ lw(elements, FieldMemOperand(receiver, JSObject::kElementsOffset));
|
| __ jmp(&finish_object_store);
|
| }
|
| @@ -1505,7 +1510,9 @@ void KeyedStoreIC::GenerateTransitionElementsSmiToDouble(MacroAssembler* masm) {
|
| // Must return the modified receiver in v0.
|
| if (!FLAG_trace_elements_transitions) {
|
| Label fail;
|
| - ElementsTransitionGenerator::GenerateSmiToDouble(masm, &fail);
|
| + AllocationSiteMode mode = AllocationSiteInfo::GetMode(FAST_SMI_ELEMENTS,
|
| + FAST_DOUBLE_ELEMENTS);
|
| + ElementsTransitionGenerator::GenerateSmiToDouble(masm, mode, &fail);
|
| __ Ret(USE_DELAY_SLOT);
|
| __ mov(v0, a2);
|
| __ bind(&fail);
|
| @@ -1526,7 +1533,9 @@ void KeyedStoreIC::GenerateTransitionElementsDoubleToObject(
|
| // Must return the modified receiver in v0.
|
| if (!FLAG_trace_elements_transitions) {
|
| Label fail;
|
| - ElementsTransitionGenerator::GenerateDoubleToObject(masm, &fail);
|
| + AllocationSiteMode mode = AllocationSiteInfo::GetMode(FAST_DOUBLE_ELEMENTS,
|
| + FAST_ELEMENTS);
|
| + ElementsTransitionGenerator::GenerateDoubleToObject(masm, mode, &fail);
|
| __ Ret(USE_DELAY_SLOT);
|
| __ mov(v0, a2);
|
| __ bind(&fail);
|
|
|