| Index: src/arm/code-stubs-arm.cc
|
| diff --git a/src/arm/code-stubs-arm.cc b/src/arm/code-stubs-arm.cc
|
| index f6b9f5a6bd73e32d0391157c7e814c9d34e2e3da..2e585ba53ab94f692a237556918eb67d4ee1b243 100644
|
| --- a/src/arm/code-stubs-arm.cc
|
| +++ b/src/arm/code-stubs-arm.cc
|
| @@ -2604,12 +2604,11 @@ static void EmitLoadTypeFeedbackVector(MacroAssembler* masm, Register vector) {
|
| void CallIC_ArrayStub::Generate(MacroAssembler* masm) {
|
| // r1 - function
|
| // r3 - slot id
|
| + // r2 - vector
|
| Label miss;
|
| int argc = arg_count();
|
| ParameterCount actual(argc);
|
|
|
| - EmitLoadTypeFeedbackVector(masm, r2);
|
| -
|
| __ LoadGlobalFunction(Context::ARRAY_FUNCTION_INDEX, r4);
|
| __ cmp(r1, r4);
|
| __ b(ne, &miss);
|
| @@ -2644,6 +2643,7 @@ void CallIC_ArrayStub::Generate(MacroAssembler* masm) {
|
| void CallICStub::Generate(MacroAssembler* masm) {
|
| // r1 - function
|
| // r3 - slot id (Smi)
|
| + // r2 - vector
|
| const int with_types_offset =
|
| FixedArray::OffsetOfElementAt(TypeFeedbackVector::kWithTypesIndex);
|
| const int generic_offset =
|
| @@ -2654,8 +2654,6 @@ void CallICStub::Generate(MacroAssembler* masm) {
|
| int argc = arg_count();
|
| ParameterCount actual(argc);
|
|
|
| - EmitLoadTypeFeedbackVector(masm, r2);
|
| -
|
| // The checks. First, does r1 match the recorded monomorphic target?
|
| __ add(r4, r2, Operand::PointerOffsetFromSmiKey(r3));
|
| __ ldr(r4, FieldMemOperand(r4, FixedArray::kHeaderSize));
|
| @@ -4252,6 +4250,20 @@ void KeyedLoadICTrampolineStub::Generate(MacroAssembler* masm) {
|
| }
|
|
|
|
|
| +void CallICTrampolineStub::Generate(MacroAssembler* masm) {
|
| + EmitLoadTypeFeedbackVector(masm, r2);
|
| + CallICStub stub(isolate(), state());
|
| + __ Jump(stub.GetCode(), RelocInfo::CODE_TARGET);
|
| +}
|
| +
|
| +
|
| +void CallIC_ArrayTrampolineStub::Generate(MacroAssembler* masm) {
|
| + EmitLoadTypeFeedbackVector(masm, r2);
|
| + 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());
|
|
|