Index: src/mips/code-stubs-mips.cc |
diff --git a/src/mips/code-stubs-mips.cc b/src/mips/code-stubs-mips.cc |
index 72eebe7151057d04117bd7e1b86d61510fd8ddc7..e72b1450a6fd72397a8f6efed47ba5a5be7fb7b3 100644 |
--- a/src/mips/code-stubs-mips.cc |
+++ b/src/mips/code-stubs-mips.cc |
@@ -2585,7 +2585,7 @@ void CallICStub::Generate(MacroAssembler* masm) { |
FixedArray::OffsetOfElementAt(TypeFeedbackVector::kWithTypesIndex); |
const int generic_offset = |
FixedArray::OffsetOfElementAt(TypeFeedbackVector::kGenericCountIndex); |
- Label extra_checks_or_miss, call; |
+ Label extra_checks_or_miss, call, call_function; |
int argc = arg_count(); |
ParameterCount actual(argc); |
@@ -2622,9 +2622,11 @@ void CallICStub::Generate(MacroAssembler* masm) { |
__ Addu(a3, a3, Operand(Smi::FromInt(CallICNexus::kCallCountIncrement))); |
__ sw(a3, FieldMemOperand(at, FixedArray::kHeaderSize + kPointerSize)); |
- __ bind(&call); |
- __ li(a0, Operand(argc)); |
- __ Jump(masm->isolate()->builtins()->Call(), RelocInfo::CODE_TARGET); |
+ __ bind(&call_function); |
+ __ Jump(masm->isolate()->builtins()->CallFunction(convert_mode()), |
+ RelocInfo::CODE_TARGET, al, zero_reg, Operand(zero_reg), |
+ USE_DELAY_SLOT); |
+ __ li(a0, Operand(argc)); // In delay slot. |
__ bind(&extra_checks_or_miss); |
Label uninitialized, miss, not_allocation_site; |
@@ -2665,8 +2667,13 @@ void CallICStub::Generate(MacroAssembler* masm) { |
__ sw(t0, FieldMemOperand(a2, with_types_offset)); |
__ lw(t0, FieldMemOperand(a2, generic_offset)); |
__ Addu(t0, t0, Operand(Smi::FromInt(1))); |
- __ Branch(USE_DELAY_SLOT, &call); |
- __ sw(t0, FieldMemOperand(a2, generic_offset)); // In delay slot. |
+ __ sw(t0, FieldMemOperand(a2, generic_offset)); |
+ |
+ __ bind(&call); |
+ __ Jump(masm->isolate()->builtins()->Call(convert_mode()), |
+ RelocInfo::CODE_TARGET, al, zero_reg, Operand(zero_reg), |
+ USE_DELAY_SLOT); |
+ __ li(a0, Operand(argc)); // In delay slot. |
__ bind(&uninitialized); |
@@ -2712,7 +2719,7 @@ void CallICStub::Generate(MacroAssembler* masm) { |
__ Pop(a1); |
} |
- __ Branch(&call); |
+ __ Branch(&call_function); |
// We are here because tracing is on or we encountered a MISS case we can't |
// handle here. |