| Index: src/x87/code-stubs-x87.cc
|
| diff --git a/src/x87/code-stubs-x87.cc b/src/x87/code-stubs-x87.cc
|
| index 077abbb1e6206edd49853497c25a39a290554b09..76bffabf11d339127460d46d51826d0818728823 100644
|
| --- a/src/x87/code-stubs-x87.cc
|
| +++ b/src/x87/code-stubs-x87.cc
|
| @@ -1828,7 +1828,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();
|
| ParameterCount actual(argc);
|
|
|
| @@ -1862,9 +1862,10 @@ void CallICStub::Generate(MacroAssembler* masm) {
|
| FixedArray::kHeaderSize + kPointerSize),
|
| Immediate(Smi::FromInt(CallICNexus::kCallCountIncrement)));
|
|
|
| - __ bind(&call);
|
| + __ bind(&call_function);
|
| __ Set(eax, 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;
|
| @@ -1902,7 +1903,11 @@ void CallICStub::Generate(MacroAssembler* masm) {
|
| // We have to update statistics for runtime profiling.
|
| __ sub(FieldOperand(ebx, with_types_offset), Immediate(Smi::FromInt(1)));
|
| __ add(FieldOperand(ebx, generic_offset), Immediate(Smi::FromInt(1)));
|
| - __ jmp(&call);
|
| +
|
| + __ bind(&call);
|
| + __ Set(eax, argc);
|
| + __ Jump(masm->isolate()->builtins()->Call(convert_mode()),
|
| + RelocInfo::CODE_TARGET);
|
|
|
| __ bind(&uninitialized);
|
|
|
| @@ -1946,7 +1951,7 @@ void CallICStub::Generate(MacroAssembler* masm) {
|
| __ pop(edi);
|
| }
|
|
|
| - __ jmp(&call);
|
| + __ jmp(&call_function);
|
|
|
| // We are here because tracing is on or we encountered a MISS case we can't
|
| // handle here.
|
|
|