Index: src/ia32/code-stubs-ia32.cc |
diff --git a/src/ia32/code-stubs-ia32.cc b/src/ia32/code-stubs-ia32.cc |
index 47cc8f7cfaad429c8dc0d44f29a22f0ab40afdd7..8da7a27b1570a49b7cb6ec1194115092078c8292 100644 |
--- a/src/ia32/code-stubs-ia32.cc |
+++ b/src/ia32/code-stubs-ia32.cc |
@@ -2121,7 +2121,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); |
@@ -2155,9 +2155,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; |
@@ -2195,7 +2196,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); |
@@ -2239,7 +2244,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. |