| Index: src/mips64/code-stubs-mips64.cc
|
| diff --git a/src/mips64/code-stubs-mips64.cc b/src/mips64/code-stubs-mips64.cc
|
| index 627d65b4314fc37fbcb4a241835f784797f5d668..4419409707006e52b6cf7bf141a9d2ab9599c74a 100644
|
| --- a/src/mips64/code-stubs-mips64.cc
|
| +++ b/src/mips64/code-stubs-mips64.cc
|
| @@ -2821,10 +2821,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));
|
|
|
| @@ -2859,6 +2858,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 =
|
| @@ -2869,8 +2869,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?
|
| __ dsrl(a4, a3, 32 - kPointerSizeLog2);
|
| __ Daddu(a4, a2, Operand(a4));
|
| @@ -4519,6 +4517,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());
|
|
|