| Index: src/ia32/ic-ia32.cc
|
| diff --git a/src/ia32/ic-ia32.cc b/src/ia32/ic-ia32.cc
|
| index eb6965837e8cec478e8830c361c125b28ad55a39..3b5ef00684741147fef2a7a41f2a08920a3f8ce7 100644
|
| --- a/src/ia32/ic-ia32.cc
|
| +++ b/src/ia32/ic-ia32.cc
|
| @@ -835,7 +835,9 @@ static void KeyedStoreGenerateGenericHelper(
|
| ebx,
|
| edi,
|
| slow);
|
| - ElementsTransitionGenerator::GenerateSmiToDouble(masm, slow);
|
| + AllocationSiteMode mode = AllocationSiteInfo::GetMode(FAST_SMI_ELEMENTS,
|
| + FAST_DOUBLE_ELEMENTS);
|
| + ElementsTransitionGenerator::GenerateSmiToDouble(masm, mode, slow);
|
| __ mov(ebx, FieldOperand(edx, JSObject::kElementsOffset));
|
| __ jmp(&fast_double_without_map_check);
|
|
|
| @@ -846,7 +848,9 @@ static void KeyedStoreGenerateGenericHelper(
|
| ebx,
|
| edi,
|
| slow);
|
| - ElementsTransitionGenerator::GenerateMapChangeElementsTransition(masm);
|
| + mode = AllocationSiteInfo::GetMode(FAST_SMI_ELEMENTS, FAST_ELEMENTS);
|
| + ElementsTransitionGenerator::GenerateMapChangeElementsTransition(masm, mode,
|
| + slow);
|
| __ mov(ebx, FieldOperand(edx, JSObject::kElementsOffset));
|
| __ jmp(&finish_object_store);
|
|
|
| @@ -860,7 +864,8 @@ static void KeyedStoreGenerateGenericHelper(
|
| ebx,
|
| edi,
|
| slow);
|
| - ElementsTransitionGenerator::GenerateDoubleToObject(masm, slow);
|
| + mode = AllocationSiteInfo::GetMode(FAST_DOUBLE_ELEMENTS, FAST_ELEMENTS);
|
| + ElementsTransitionGenerator::GenerateDoubleToObject(masm, mode, slow);
|
| __ mov(ebx, FieldOperand(edx, JSObject::kElementsOffset));
|
| __ jmp(&finish_object_store);
|
| }
|
| @@ -1650,7 +1655,9 @@ void KeyedStoreIC::GenerateTransitionElementsSmiToDouble(MacroAssembler* masm) {
|
| // Must return the modified receiver in eax.
|
| 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);
|
| __ mov(eax, edx);
|
| __ Ret();
|
| __ bind(&fail);
|
| @@ -1676,7 +1683,9 @@ void KeyedStoreIC::GenerateTransitionElementsDoubleToObject(
|
| // Must return the modified receiver in eax.
|
| 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);
|
| __ mov(eax, edx);
|
| __ Ret();
|
| __ bind(&fail);
|
|
|