| Index: src/x64/code-stubs-x64.cc
|
| diff --git a/src/x64/code-stubs-x64.cc b/src/x64/code-stubs-x64.cc
|
| index 66dfe1f8e05c111a08887eabe5da20fb7c9526fe..1696bb173fc4ef92de144ef6cfb219b348b93c84 100644
|
| --- a/src/x64/code-stubs-x64.cc
|
| +++ b/src/x64/code-stubs-x64.cc
|
| @@ -2059,11 +2059,11 @@ static void EmitLoadTypeFeedbackVector(MacroAssembler* masm, Register vector) {
|
| void CallIC_ArrayStub::Generate(MacroAssembler* masm) {
|
| // rdi - function
|
| // rdx - slot id (as integer)
|
| + // rbx - vector
|
| Label miss;
|
| int argc = arg_count();
|
| ParameterCount actual(argc);
|
|
|
| - EmitLoadTypeFeedbackVector(masm, rbx);
|
| __ SmiToInteger32(rdx, rdx);
|
|
|
| __ LoadGlobalFunction(Context::ARRAY_FUNCTION_INDEX, rcx);
|
| @@ -2100,6 +2100,7 @@ void CallIC_ArrayStub::Generate(MacroAssembler* masm) {
|
| void CallICStub::Generate(MacroAssembler* masm) {
|
| // rdi - function
|
| // rdx - slot id
|
| + // rbx - vector
|
| Isolate* isolate = masm->isolate();
|
| const int with_types_offset =
|
| FixedArray::OffsetOfElementAt(TypeFeedbackVector::kWithTypesIndex);
|
| @@ -2112,8 +2113,6 @@ void CallICStub::Generate(MacroAssembler* masm) {
|
| StackArgumentsAccessor args(rsp, argc);
|
| ParameterCount actual(argc);
|
|
|
| - EmitLoadTypeFeedbackVector(masm, rbx);
|
| -
|
| // The checks. First, does rdi match the recorded monomorphic target?
|
| __ SmiToInteger32(rdx, rdx);
|
| __ cmpp(rdi, FieldOperand(rbx, rdx, times_pointer_size,
|
| @@ -4266,6 +4265,20 @@ void KeyedLoadICTrampolineStub::Generate(MacroAssembler* masm) {
|
| }
|
|
|
|
|
| +void CallICTrampolineStub::Generate(MacroAssembler* masm) {
|
| + EmitLoadTypeFeedbackVector(masm, rbx);
|
| + CallICStub stub(isolate(), state());
|
| + __ jmp(stub.GetCode(), RelocInfo::CODE_TARGET);
|
| +}
|
| +
|
| +
|
| +void CallIC_ArrayTrampolineStub::Generate(MacroAssembler* masm) {
|
| + EmitLoadTypeFeedbackVector(masm, rbx);
|
| + CallIC_ArrayStub stub(isolate(), state());
|
| + __ jmp(stub.GetCode(), RelocInfo::CODE_TARGET);
|
| +}
|
| +
|
| +
|
| void ProfileEntryHookStub::MaybeCallEntryHook(MacroAssembler* masm) {
|
| if (masm->isolate()->function_entry_hook() != NULL) {
|
| ProfileEntryHookStub stub(masm->isolate());
|
|
|