| Index: src/mips64/code-stubs-mips64.cc
|
| diff --git a/src/mips64/code-stubs-mips64.cc b/src/mips64/code-stubs-mips64.cc
|
| index af1fc0c9746aafae857666da3181b946df85e99d..377b463c9f7cb20d267144c504f477094ac9692c 100644
|
| --- a/src/mips64/code-stubs-mips64.cc
|
| +++ b/src/mips64/code-stubs-mips64.cc
|
| @@ -1783,7 +1783,6 @@ static void GenerateRecordCallTarget(MacroAssembler* masm) {
|
| // a2 : feedback vector
|
| // a3 : slot in feedback vector (Smi)
|
| Label initialize, done, miss, megamorphic, not_array_function;
|
| - Label done_initialize_count, done_increment_count;
|
|
|
| DCHECK_EQ(*TypeFeedbackVector::MegamorphicSentinel(masm->isolate()),
|
| masm->isolate()->heap()->megamorphic_symbol());
|
| @@ -1803,7 +1802,7 @@ static void GenerateRecordCallTarget(MacroAssembler* masm) {
|
| Register feedback_map = a6;
|
| Register weak_value = t0;
|
| __ ld(weak_value, FieldMemOperand(a5, WeakCell::kValueOffset));
|
| - __ Branch(&done_increment_count, eq, a1, Operand(weak_value));
|
| + __ Branch(&done, eq, a1, Operand(weak_value));
|
| __ LoadRoot(at, Heap::kmegamorphic_symbolRootIndex);
|
| __ Branch(&done, eq, a5, Operand(at));
|
| __ ld(feedback_map, FieldMemOperand(a5, HeapObject::kMapOffset));
|
| @@ -1825,7 +1824,7 @@ static void GenerateRecordCallTarget(MacroAssembler* masm) {
|
| // Make sure the function is the Array() function
|
| __ LoadNativeContextSlot(Context::ARRAY_FUNCTION_INDEX, a5);
|
| __ Branch(&megamorphic, ne, a1, Operand(a5));
|
| - __ jmp(&done_increment_count);
|
| + __ jmp(&done);
|
|
|
| __ bind(&miss);
|
|
|
| @@ -1853,32 +1852,21 @@ static void GenerateRecordCallTarget(MacroAssembler* masm) {
|
| // slot.
|
| CreateAllocationSiteStub create_stub(masm->isolate());
|
| CallStubInRecordCallTarget(masm, &create_stub);
|
| - __ Branch(&done_initialize_count);
|
| + __ Branch(&done);
|
|
|
| __ bind(¬_array_function);
|
|
|
| CreateWeakCellStub weak_cell_stub(masm->isolate());
|
| CallStubInRecordCallTarget(masm, &weak_cell_stub);
|
|
|
| - __ bind(&done_initialize_count);
|
| - // Initialize the call counter.
|
| -
|
| - __ SmiScale(a4, a3, kPointerSizeLog2);
|
| - __ Daddu(a4, a2, Operand(a4));
|
| - __ li(a5, Operand(Smi::FromInt(1)));
|
| - __ Branch(USE_DELAY_SLOT, &done);
|
| - __ sd(a5, FieldMemOperand(a4, FixedArray::kHeaderSize + kPointerSize));
|
| -
|
| - __ bind(&done_increment_count);
|
| + __ bind(&done);
|
|
|
| - // Increment the call count for monomorphic function calls.
|
| + // Increment the call count for all function calls.
|
| __ SmiScale(a4, a3, kPointerSizeLog2);
|
| __ Daddu(a5, a2, Operand(a4));
|
| __ ld(a4, FieldMemOperand(a5, FixedArray::kHeaderSize + kPointerSize));
|
| __ Daddu(a4, a4, Operand(Smi::FromInt(1)));
|
| __ sd(a4, FieldMemOperand(a5, FixedArray::kHeaderSize + kPointerSize));
|
| -
|
| - __ bind(&done);
|
| }
|
|
|
|
|
|
|