| Index: src/arm/ic-arm.cc
|
| diff --git a/src/arm/ic-arm.cc b/src/arm/ic-arm.cc
|
| index 89ebfde6680234def57f45a44442e1eb6848c216..f96ad1d9216cfdfb765c51e474c59454107100f1 100644
|
| --- a/src/arm/ic-arm.cc
|
| +++ b/src/arm/ic-arm.cc
|
| @@ -1230,8 +1230,8 @@ void KeyedStoreIC::GenerateTransitionElementsSmiToDouble(MacroAssembler* masm) {
|
| // Must return the modified receiver in r0.
|
| if (!FLAG_trace_elements_transitions) {
|
| Label fail;
|
| - AllocationSiteMode mode = AllocationSiteInfo::GetMode(FAST_SMI_ELEMENTS,
|
| - FAST_DOUBLE_ELEMENTS);
|
| + AllocationSiteMode mode = AllocationSite::GetMode(FAST_SMI_ELEMENTS,
|
| + FAST_DOUBLE_ELEMENTS);
|
| ElementsTransitionGenerator::GenerateSmiToDouble(masm, mode, &fail);
|
| __ mov(r0, r2);
|
| __ Ret();
|
| @@ -1253,8 +1253,8 @@ void KeyedStoreIC::GenerateTransitionElementsDoubleToObject(
|
| // Must return the modified receiver in r0.
|
| if (!FLAG_trace_elements_transitions) {
|
| Label fail;
|
| - AllocationSiteMode mode = AllocationSiteInfo::GetMode(FAST_DOUBLE_ELEMENTS,
|
| - FAST_ELEMENTS);
|
| + AllocationSiteMode mode = AllocationSite::GetMode(FAST_DOUBLE_ELEMENTS,
|
| + FAST_ELEMENTS);
|
| ElementsTransitionGenerator::GenerateDoubleToObject(masm, mode, &fail);
|
| __ mov(r0, r2);
|
| __ Ret();
|
| @@ -1384,8 +1384,8 @@ static void KeyedStoreGenerateGenericHelper(
|
| r4,
|
| slow);
|
| ASSERT(receiver_map.is(r3)); // Transition code expects map in r3
|
| - AllocationSiteMode mode = AllocationSiteInfo::GetMode(FAST_SMI_ELEMENTS,
|
| - FAST_DOUBLE_ELEMENTS);
|
| + AllocationSiteMode mode = AllocationSite::GetMode(FAST_SMI_ELEMENTS,
|
| + FAST_DOUBLE_ELEMENTS);
|
| ElementsTransitionGenerator::GenerateSmiToDouble(masm, mode, slow);
|
| __ ldr(elements, FieldMemOperand(receiver, JSObject::kElementsOffset));
|
| __ jmp(&fast_double_without_map_check);
|
| @@ -1398,7 +1398,7 @@ static void KeyedStoreGenerateGenericHelper(
|
| r4,
|
| slow);
|
| ASSERT(receiver_map.is(r3)); // Transition code expects map in r3
|
| - mode = AllocationSiteInfo::GetMode(FAST_SMI_ELEMENTS, FAST_ELEMENTS);
|
| + mode = AllocationSite::GetMode(FAST_SMI_ELEMENTS, FAST_ELEMENTS);
|
| ElementsTransitionGenerator::GenerateMapChangeElementsTransition(masm, mode,
|
| slow);
|
| __ ldr(elements, FieldMemOperand(receiver, JSObject::kElementsOffset));
|
| @@ -1414,7 +1414,7 @@ static void KeyedStoreGenerateGenericHelper(
|
| r4,
|
| slow);
|
| ASSERT(receiver_map.is(r3)); // Transition code expects map in r3
|
| - mode = AllocationSiteInfo::GetMode(FAST_DOUBLE_ELEMENTS, FAST_ELEMENTS);
|
| + mode = AllocationSite::GetMode(FAST_DOUBLE_ELEMENTS, FAST_ELEMENTS);
|
| ElementsTransitionGenerator::GenerateDoubleToObject(masm, mode, slow);
|
| __ ldr(elements, FieldMemOperand(receiver, JSObject::kElementsOffset));
|
| __ jmp(&finish_object_store);
|
|
|