| Index: src/ia32/code-stubs-ia32.cc
|
| diff --git a/src/ia32/code-stubs-ia32.cc b/src/ia32/code-stubs-ia32.cc
|
| index 95c6287d1de98dbcc12eac776f9a531f51f76a5f..a45d3ed8681ffff55817e9f4b450579fa09593ef 100644
|
| --- a/src/ia32/code-stubs-ia32.cc
|
| +++ b/src/ia32/code-stubs-ia32.cc
|
| @@ -1937,6 +1937,7 @@ static void GenerateRecordCallTarget(MacroAssembler* masm) {
|
| // edi : the function to call
|
| Isolate* isolate = masm->isolate();
|
| Label initialize, done, miss, megamorphic, not_array_function;
|
| + Label done_increment_count;
|
|
|
| // Load the cache state into ecx.
|
| __ mov(ecx, FieldOperand(ebx, edx, times_half_pointer_size,
|
| @@ -1949,7 +1950,7 @@ static void GenerateRecordCallTarget(MacroAssembler* masm) {
|
| // type-feedback-vector.h).
|
| Label check_allocation_site;
|
| __ cmp(edi, FieldOperand(ecx, WeakCell::kValueOffset));
|
| - __ j(equal, &done, Label::kFar);
|
| + __ j(equal, &done_increment_count, Label::kFar);
|
| __ CompareRoot(ecx, Heap::kmegamorphic_symbolRootIndex);
|
| __ j(equal, &done, Label::kFar);
|
| __ CompareRoot(FieldOperand(ecx, HeapObject::kMapOffset),
|
| @@ -1972,7 +1973,7 @@ static void GenerateRecordCallTarget(MacroAssembler* masm) {
|
| __ LoadGlobalFunction(Context::ARRAY_FUNCTION_INDEX, ecx);
|
| __ cmp(edi, ecx);
|
| __ j(not_equal, &megamorphic);
|
| - __ jmp(&done, Label::kFar);
|
| + __ jmp(&done_increment_count, Label::kFar);
|
|
|
| __ bind(&miss);
|
|
|
| @@ -1991,6 +1992,12 @@ static void GenerateRecordCallTarget(MacroAssembler* masm) {
|
| // An uninitialized cache is patched with the function or sentinel to
|
| // indicate the ElementsKind if function is the Array constructor.
|
| __ bind(&initialize);
|
| +
|
| + // Initialize the call counter.
|
| + __ mov(FieldOperand(ebx, edx, times_half_pointer_size,
|
| + FixedArray::kHeaderSize + kPointerSize),
|
| + Immediate(Smi::FromInt(ConstructICNexus::kCallCountIncrement)));
|
| +
|
| // Make sure the function is the Array() function
|
| __ LoadGlobalFunction(Context::ARRAY_FUNCTION_INDEX, ecx);
|
| __ cmp(edi, ecx);
|
| @@ -2006,11 +2013,18 @@ static void GenerateRecordCallTarget(MacroAssembler* masm) {
|
| __ bind(¬_array_function);
|
| CreateWeakCellStub weak_cell_stub(isolate);
|
| CallStubInRecordCallTarget(masm, &weak_cell_stub);
|
| + __ jmp(&done);
|
| +
|
| + __ bind(&done_increment_count);
|
| + __ add(FieldOperand(ebx, edx, times_half_pointer_size,
|
| + FixedArray::kHeaderSize + kPointerSize),
|
| + Immediate(Smi::FromInt(ConstructICNexus::kCallCountIncrement)));
|
| +
|
| __ bind(&done);
|
| }
|
|
|
|
|
| -void CallConstructStub::Generate(MacroAssembler* masm) {
|
| +void ConstructICStub::Generate(MacroAssembler* masm) {
|
| // eax : number of arguments
|
| // ebx : feedback vector
|
| // edx : slot in feedback vector (Smi, for RecordCallTarget)
|
|
|