| Index: src/arm/macro-assembler-arm.cc
|
| diff --git a/src/arm/macro-assembler-arm.cc b/src/arm/macro-assembler-arm.cc
|
| index 5e38785ed5644ca5dd6548beda3b93915891f27d..4fa9e0122006269bbcc0b303f8cde9f1871d36c2 100644
|
| --- a/src/arm/macro-assembler-arm.cc
|
| +++ b/src/arm/macro-assembler-arm.cc
|
| @@ -3747,26 +3747,26 @@ void MacroAssembler::CheckEnumCache(Register null_value, Label* call_runtime) {
|
| }
|
|
|
|
|
| -void MacroAssembler::TestJSArrayForAllocationSiteInfo(
|
| +void MacroAssembler::TestJSArrayForAllocationMemento(
|
| Register receiver_reg,
|
| Register scratch_reg) {
|
| - Label no_info_available;
|
| + Label no_memento_available;
|
| ExternalReference new_space_start =
|
| ExternalReference::new_space_start(isolate());
|
| ExternalReference new_space_allocation_top =
|
| ExternalReference::new_space_allocation_top_address(isolate());
|
| add(scratch_reg, receiver_reg,
|
| - Operand(JSArray::kSize + AllocationSiteInfo::kSize - kHeapObjectTag));
|
| + Operand(JSArray::kSize + AllocationMemento::kSize - kHeapObjectTag));
|
| cmp(scratch_reg, Operand(new_space_start));
|
| - b(lt, &no_info_available);
|
| + b(lt, &no_memento_available);
|
| mov(ip, Operand(new_space_allocation_top));
|
| ldr(ip, MemOperand(ip));
|
| cmp(scratch_reg, ip);
|
| - b(gt, &no_info_available);
|
| - ldr(scratch_reg, MemOperand(scratch_reg, -AllocationSiteInfo::kSize));
|
| + b(gt, &no_memento_available);
|
| + ldr(scratch_reg, MemOperand(scratch_reg, -AllocationMemento::kSize));
|
| cmp(scratch_reg,
|
| - Operand(Handle<Map>(isolate()->heap()->allocation_site_info_map())));
|
| - bind(&no_info_available);
|
| + Operand(Handle<Map>(isolate()->heap()->allocation_memento_map())));
|
| + bind(&no_memento_available);
|
| }
|
|
|
|
|
|
|