| Index: src/ia32/macro-assembler-ia32.cc
|
| diff --git a/src/ia32/macro-assembler-ia32.cc b/src/ia32/macro-assembler-ia32.cc
|
| index 989b83eadf9f64a0d4813c52ebde07a6f6801c04..c7feb0735a7d92004d35a4c158d2a534c6022201 100644
|
| --- a/src/ia32/macro-assembler-ia32.cc
|
| +++ b/src/ia32/macro-assembler-ia32.cc
|
| @@ -3163,10 +3163,10 @@ void MacroAssembler::CheckEnumCache(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());
|
| @@ -3174,14 +3174,14 @@ void MacroAssembler::TestJSArrayForAllocationSiteInfo(
|
| ExternalReference::new_space_allocation_top_address(isolate());
|
|
|
| lea(scratch_reg, Operand(receiver_reg,
|
| - JSArray::kSize + AllocationSiteInfo::kSize - kHeapObjectTag));
|
| + JSArray::kSize + AllocationMemento::kSize - kHeapObjectTag));
|
| cmp(scratch_reg, Immediate(new_space_start));
|
| - j(less, &no_info_available);
|
| + j(less, &no_memento_available);
|
| cmp(scratch_reg, Operand::StaticVariable(new_space_allocation_top));
|
| - j(greater, &no_info_available);
|
| - cmp(MemOperand(scratch_reg, -AllocationSiteInfo::kSize),
|
| - Immediate(Handle<Map>(isolate()->heap()->allocation_site_info_map())));
|
| - bind(&no_info_available);
|
| + j(greater, &no_memento_available);
|
| + cmp(MemOperand(scratch_reg, -AllocationMemento::kSize),
|
| + Immediate(Handle<Map>(isolate()->heap()->allocation_memento_map())));
|
| + bind(&no_memento_available);
|
| }
|
|
|
|
|
|
|