Index: src/ppc/code-stubs-ppc.cc |
diff --git a/src/ppc/code-stubs-ppc.cc b/src/ppc/code-stubs-ppc.cc |
index b6e685836f07ba5e618c3dc12577f13b23a87864..284a0bee81fc19dae342455c8633e66389fd9d68 100644 |
--- a/src/ppc/code-stubs-ppc.cc |
+++ b/src/ppc/code-stubs-ppc.cc |
@@ -2437,7 +2437,6 @@ static void GenerateRecordCallTarget(MacroAssembler* masm) { |
// r5 : feedback vector |
// r6 : slot in feedback vector (Smi) |
Label initialize, done, miss, megamorphic, not_array_function; |
- Label done_increment_count; |
DCHECK_EQ(*TypeFeedbackVector::MegamorphicSentinel(masm->isolate()), |
masm->isolate()->heap()->megamorphic_symbol()); |
@@ -2458,7 +2457,7 @@ static void GenerateRecordCallTarget(MacroAssembler* masm) { |
Register weak_value = r10; |
__ LoadP(weak_value, FieldMemOperand(r8, WeakCell::kValueOffset)); |
__ cmp(r4, weak_value); |
- __ beq(&done_increment_count); |
+ __ beq(&done); |
__ CompareRoot(r8, Heap::kmegamorphic_symbolRootIndex); |
__ beq(&done); |
__ LoadP(feedback_map, FieldMemOperand(r8, HeapObject::kMapOffset)); |
@@ -2481,7 +2480,7 @@ static void GenerateRecordCallTarget(MacroAssembler* masm) { |
__ LoadNativeContextSlot(Context::ARRAY_FUNCTION_INDEX, r8); |
__ cmp(r4, r8); |
__ bne(&megamorphic); |
- __ b(&done_increment_count); |
+ __ b(&done); |
__ bind(&miss); |
@@ -2501,13 +2500,6 @@ static void GenerateRecordCallTarget(MacroAssembler* masm) { |
// An uninitialized cache is patched with the function |
__ bind(&initialize); |
- // Initialize the call counter. |
- __ LoadSmiLiteral(r8, Smi::FromInt(CallICNexus::kCallCountIncrement)); |
- __ SmiToPtrArrayOffset(r7, r6); |
- __ add(r7, r5, r7); |
- __ StoreP(r8, FieldMemOperand(r7, FixedArray::kHeaderSize + kPointerSize), |
- r0); |
- |
// Make sure the function is the Array() function. |
__ LoadNativeContextSlot(Context::ARRAY_FUNCTION_INDEX, r8); |
__ cmp(r4, r8); |
@@ -2521,23 +2513,14 @@ static void GenerateRecordCallTarget(MacroAssembler* masm) { |
__ b(&done); |
__ bind(¬_array_function); |
+ |
CreateWeakCellStub weak_cell_stub(masm->isolate()); |
CallStubInRecordCallTarget(masm, &weak_cell_stub); |
- __ b(&done); |
- |
- __ bind(&done_increment_count); |
- __ SmiToPtrArrayOffset(r7, r6); |
- __ add(r7, r5, r7); |
- __ LoadP(r8, FieldMemOperand(r7, FixedArray::kHeaderSize + kPointerSize)); |
- __ AddSmiLiteral(r8, r8, Smi::FromInt(CallICNexus::kCallCountIncrement), r0); |
- __ StoreP(r8, FieldMemOperand(r7, FixedArray::kHeaderSize + kPointerSize), |
- r0); |
- |
__ bind(&done); |
} |
-void ConstructICStub::Generate(MacroAssembler* masm) { |
+void CallConstructStub::Generate(MacroAssembler* masm) { |
// r3 : number of arguments |
// r4 : the function to call |
// r5 : feedback vector |