Index: src/x64/ic-x64.cc |
diff --git a/src/x64/ic-x64.cc b/src/x64/ic-x64.cc |
index 6e238c76ecebaf7e5800e54153d57b4587dbd434..69bdc0e1094a47bfd2cd2357d7a769785aeadd47 100644 |
--- a/src/x64/ic-x64.cc |
+++ b/src/x64/ic-x64.cc |
@@ -905,7 +905,7 @@ void CallICBase::GenerateNormal(MacroAssembler* masm, int argc) { |
Label miss; |
// Get the receiver of the function from the stack. |
- __ movq(rdx, Operand(rsp, (argc + 1) * kPointerSize)); |
+ __ movq(rdx, StackOperandForReceiver(argc)); |
GenerateNameDictionaryReceiverCheck(masm, rdx, rax, rbx, &miss); |
@@ -940,8 +940,7 @@ void CallICBase::GenerateMiss(MacroAssembler* masm, |
__ IncrementCounter(counters->keyed_call_miss(), 1); |
} |
- // Get the receiver of the function from the stack; 1 ~ return address. |
- __ movq(rdx, Operand(rsp, (argc + 1) * kPointerSize)); |
+ __ movq(rdx, StackOperandForReceiver(argc)); |
// Enter an internal frame. |
{ |
@@ -965,7 +964,7 @@ void CallICBase::GenerateMiss(MacroAssembler* masm, |
// This can happen only for regular CallIC but not KeyedCallIC. |
if (id == IC::kCallIC_Miss) { |
Label invoke, global; |
- __ movq(rdx, Operand(rsp, (argc + 1) * kPointerSize)); // receiver |
+ __ movq(rdx, StackOperandForReceiver(argc)); |
__ JumpIfSmi(rdx, &invoke); |
__ CmpObjectType(rdx, JS_GLOBAL_OBJECT_TYPE, rcx); |
__ j(equal, &global); |
@@ -975,7 +974,7 @@ void CallICBase::GenerateMiss(MacroAssembler* masm, |
// Patch the receiver on the stack. |
__ bind(&global); |
__ movq(rdx, FieldOperand(rdx, GlobalObject::kGlobalReceiverOffset)); |
- __ movq(Operand(rsp, (argc + 1) * kPointerSize), rdx); |
+ __ movq(StackOperandForReceiver(argc), rdx); |
__ bind(&invoke); |
} |
@@ -1005,8 +1004,7 @@ void CallIC::GenerateMegamorphic(MacroAssembler* masm, |
// rsp[(argc + 1) * 8] : argument 0 = receiver |
// ----------------------------------- |
- // Get the receiver of the function from the stack; 1 ~ return address. |
- __ movq(rdx, Operand(rsp, (argc + 1) * kPointerSize)); |
+ __ movq(rdx, StackOperandForReceiver(argc)); |
GenerateMonomorphicCacheProbe(masm, argc, Code::CALL_IC, extra_ic_state); |
GenerateMiss(masm, argc, extra_ic_state); |
} |
@@ -1023,8 +1021,7 @@ void KeyedCallIC::GenerateMegamorphic(MacroAssembler* masm, int argc) { |
// rsp[(argc + 1) * 8] : argument 0 = receiver |
// ----------------------------------- |
- // Get the receiver of the function from the stack; 1 ~ return address. |
- __ movq(rdx, Operand(rsp, (argc + 1) * kPointerSize)); |
+ __ movq(rdx, StackOperandForReceiver(argc)); |
Label do_call, slow_call, slow_load; |
Label check_number_dictionary, check_name, lookup_monomorphic_cache; |
@@ -1302,7 +1299,7 @@ void KeyedCallIC::GenerateNonStrictArguments(MacroAssembler* masm, |
// rsp[(argc + 1) * 8] : argument 0 = receiver |
// ----------------------------------- |
Label slow, notin; |
- __ movq(rdx, Operand(rsp, (argc + 1) * kPointerSize)); |
+ __ movq(rdx, StackOperandForReceiver(argc)); |
Operand mapped_location = GenerateMappedArgumentsLookup( |
masm, rdx, rcx, rbx, rax, r8, ¬in, &slow); |
__ movq(rdi, mapped_location); |