Index: src/mips/code-stubs-mips.cc |
diff --git a/src/mips/code-stubs-mips.cc b/src/mips/code-stubs-mips.cc |
index 65c398dc65267c7ad5d27376c4869eff1c84098e..5ce502cab3f3a351f483777099431ba9ea8dd278 100644 |
--- a/src/mips/code-stubs-mips.cc |
+++ b/src/mips/code-stubs-mips.cc |
@@ -2746,10 +2746,9 @@ static void EmitLoadTypeFeedbackVector(MacroAssembler* masm, Register vector) { |
void CallIC_ArrayStub::Generate(MacroAssembler* masm) { |
// a1 - function |
// a3 - slot id |
+ // a2 - vector |
Label miss; |
- EmitLoadTypeFeedbackVector(masm, a2); |
- |
__ LoadGlobalFunction(Context::ARRAY_FUNCTION_INDEX, at); |
__ Branch(&miss, ne, a1, Operand(at)); |
@@ -2784,6 +2783,7 @@ void CallIC_ArrayStub::Generate(MacroAssembler* masm) { |
void CallICStub::Generate(MacroAssembler* masm) { |
// a1 - function |
// a3 - slot id (Smi) |
+ // a2 - vector |
const int with_types_offset = |
FixedArray::OffsetOfElementAt(TypeFeedbackVector::kWithTypesIndex); |
const int generic_offset = |
@@ -2794,8 +2794,6 @@ void CallICStub::Generate(MacroAssembler* masm) { |
int argc = arg_count(); |
ParameterCount actual(argc); |
- EmitLoadTypeFeedbackVector(masm, a2); |
- |
// The checks. First, does r1 match the recorded monomorphic target? |
__ sll(t0, a3, kPointerSizeLog2 - kSmiTagSize); |
__ Addu(t0, a2, Operand(t0)); |
@@ -4479,6 +4477,20 @@ void KeyedLoadICTrampolineStub::Generate(MacroAssembler* masm) { |
} |
+void CallICTrampolineStub::Generate(MacroAssembler* masm) { |
+ EmitLoadTypeFeedbackVector(masm, a2); |
+ CallICStub stub(isolate(), state()); |
+ __ Jump(stub.GetCode(), RelocInfo::CODE_TARGET); |
+} |
+ |
+ |
+void CallIC_ArrayTrampolineStub::Generate(MacroAssembler* masm) { |
+ EmitLoadTypeFeedbackVector(masm, a2); |
+ CallIC_ArrayStub stub(isolate(), state()); |
+ __ Jump(stub.GetCode(), RelocInfo::CODE_TARGET); |
+} |
+ |
+ |
void ProfileEntryHookStub::MaybeCallEntryHook(MacroAssembler* masm) { |
if (masm->isolate()->function_entry_hook() != NULL) { |
ProfileEntryHookStub stub(masm->isolate()); |