Index: src/x64/code-stubs-x64.cc |
diff --git a/src/x64/code-stubs-x64.cc b/src/x64/code-stubs-x64.cc |
index 3d955f5f3a9f950dea6295f7448d401c1a452abe..db9cc7c8fdca5ccfe0c89df70ed7546ea39d4a3a 100644 |
--- a/src/x64/code-stubs-x64.cc |
+++ b/src/x64/code-stubs-x64.cc |
@@ -1959,7 +1959,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(); |
StackArgumentsAccessor args(rsp, argc); |
ParameterCount actual(argc); |
@@ -1995,9 +1995,10 @@ void CallICStub::Generate(MacroAssembler* masm) { |
FixedArray::kHeaderSize + kPointerSize), |
Smi::FromInt(CallICNexus::kCallCountIncrement)); |
- __ bind(&call); |
+ __ bind(&call_function); |
__ Set(rax, argc); |
- __ Jump(masm->isolate()->builtins()->Call(), RelocInfo::CODE_TARGET); |
+ __ Jump(masm->isolate()->builtins()->CallFunction(convert_mode()), |
+ RelocInfo::CODE_TARGET); |
__ bind(&extra_checks_or_miss); |
Label uninitialized, miss, not_allocation_site; |
@@ -2034,7 +2035,11 @@ void CallICStub::Generate(MacroAssembler* masm) { |
// We have to update statistics for runtime profiling. |
__ SmiAddConstant(FieldOperand(rbx, with_types_offset), Smi::FromInt(-1)); |
__ SmiAddConstant(FieldOperand(rbx, generic_offset), Smi::FromInt(1)); |
- __ jmp(&call); |
+ |
+ __ bind(&call); |
+ __ Set(rax, argc); |
+ __ Jump(masm->isolate()->builtins()->Call(convert_mode()), |
+ RelocInfo::CODE_TARGET); |
__ bind(&uninitialized); |
@@ -2080,7 +2085,7 @@ void CallICStub::Generate(MacroAssembler* masm) { |
__ Pop(rdi); |
} |
- __ jmp(&call); |
+ __ jmp(&call_function); |
// We are here because tracing is on or we encountered a MISS case we can't |
// handle here. |