Index: src/arm/code-stubs-arm.cc |
diff --git a/src/arm/code-stubs-arm.cc b/src/arm/code-stubs-arm.cc |
index 32b58d4cea924014c7b812986f07871ef62be3c9..c238e6120f9afeb1d2c8164af66a4d41b1e2ea7d 100644 |
--- a/src/arm/code-stubs-arm.cc |
+++ b/src/arm/code-stubs-arm.cc |
@@ -1786,6 +1786,7 @@ static void GenerateRecordCallTarget(MacroAssembler* masm) { |
// r2 : feedback vector |
// r3 : 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()); |
@@ -1805,7 +1806,7 @@ static void GenerateRecordCallTarget(MacroAssembler* masm) { |
Register weak_value = r9; |
__ ldr(weak_value, FieldMemOperand(r5, WeakCell::kValueOffset)); |
__ cmp(r1, weak_value); |
- __ b(eq, &done); |
+ __ b(eq, &done_increment_count); |
__ CompareRoot(r5, Heap::kmegamorphic_symbolRootIndex); |
__ b(eq, &done); |
__ ldr(feedback_map, FieldMemOperand(r5, HeapObject::kMapOffset)); |
@@ -1828,7 +1829,7 @@ static void GenerateRecordCallTarget(MacroAssembler* masm) { |
__ LoadNativeContextSlot(Context::ARRAY_FUNCTION_INDEX, r5); |
__ cmp(r1, r5); |
__ b(ne, &megamorphic); |
- __ jmp(&done); |
+ __ jmp(&done_increment_count); |
__ bind(&miss); |
@@ -1857,11 +1858,28 @@ static void GenerateRecordCallTarget(MacroAssembler* masm) { |
// slot. |
CreateAllocationSiteStub create_stub(masm->isolate()); |
CallStubInRecordCallTarget(masm, &create_stub); |
- __ b(&done); |
+ __ b(&done_initialize_count); |
__ bind(¬_array_function); |
CreateWeakCellStub weak_cell_stub(masm->isolate()); |
CallStubInRecordCallTarget(masm, &weak_cell_stub); |
+ |
+ __ bind(&done_initialize_count); |
+ // Initialize the call counter. |
+ __ Move(r5, Operand(Smi::FromInt(1))); |
+ __ add(r4, r2, Operand::PointerOffsetFromSmiKey(r3)); |
+ __ str(r5, FieldMemOperand(r4, FixedArray::kHeaderSize + kPointerSize)); |
+ __ b(&done); |
+ |
+ __ bind(&done_increment_count); |
+ |
+ // Increment the call count for monomorphic function calls. |
+ __ add(r5, r2, Operand::PointerOffsetFromSmiKey(r3)); |
+ __ add(r5, r5, Operand(FixedArray::kHeaderSize + kPointerSize)); |
+ __ ldr(r4, FieldMemOperand(r5, 0)); |
+ __ add(r4, r4, Operand(Smi::FromInt(1))); |
+ __ str(r4, FieldMemOperand(r5, 0)); |
+ |
__ bind(&done); |
} |