Index: src/arm/builtins-arm.cc |
diff --git a/src/arm/builtins-arm.cc b/src/arm/builtins-arm.cc |
index a6bfdb128d4b750d3b4245176e7ce1761eebbc12..b11765e92fca76becabb827e6cfbc7716cc22d5b 100644 |
--- a/src/arm/builtins-arm.cc |
+++ b/src/arm/builtins-arm.cc |
@@ -1953,6 +1953,7 @@ void PrepareForTailCall(MacroAssembler* masm, Register args_reg, |
} |
// Check if next frame is an arguments adaptor frame. |
+ Register caller_args_count_reg = scratch1; |
Label no_arguments_adaptor, formal_parameter_count_loaded; |
__ ldr(scratch2, MemOperand(fp, StandardFrameConstants::kCallerFPOffset)); |
__ ldr(scratch3, |
@@ -1960,11 +1961,11 @@ void PrepareForTailCall(MacroAssembler* masm, Register args_reg, |
__ cmp(scratch3, Operand(Smi::FromInt(StackFrame::ARGUMENTS_ADAPTOR))); |
__ b(ne, &no_arguments_adaptor); |
- // Drop arguments adaptor frame and load arguments count. |
+ // Drop current frame and load arguments count from arguments adaptor frame. |
__ mov(fp, scratch2); |
- __ ldr(scratch1, |
+ __ ldr(caller_args_count_reg, |
MemOperand(fp, ArgumentsAdaptorFrameConstants::kLengthOffset)); |
- __ SmiUntag(scratch1); |
+ __ SmiUntag(caller_args_count_reg); |
__ b(&formal_parameter_count_loaded); |
__ bind(&no_arguments_adaptor); |
@@ -1972,54 +1973,16 @@ void PrepareForTailCall(MacroAssembler* masm, Register args_reg, |
__ ldr(scratch1, MemOperand(fp, JavaScriptFrameConstants::kFunctionOffset)); |
__ ldr(scratch1, |
FieldMemOperand(scratch1, JSFunction::kSharedFunctionInfoOffset)); |
- __ ldr(scratch1, |
+ __ ldr(caller_args_count_reg, |
FieldMemOperand(scratch1, |
SharedFunctionInfo::kFormalParameterCountOffset)); |
- __ SmiUntag(scratch1); |
+ __ SmiUntag(caller_args_count_reg); |
__ bind(&formal_parameter_count_loaded); |
- // Calculate the end of destination area where we will put the arguments |
- // after we drop current frame. We add kPointerSize to count the receiver |
- // argument which is not included into formal parameters count. |
- Register dst_reg = scratch2; |
- __ add(dst_reg, fp, Operand(scratch1, LSL, kPointerSizeLog2)); |
- __ add(dst_reg, dst_reg, |
- Operand(StandardFrameConstants::kCallerSPOffset + kPointerSize)); |
- |
- Register src_reg = scratch1; |
- __ add(src_reg, sp, Operand(args_reg, LSL, kPointerSizeLog2)); |
- // Count receiver argument as well (not included in args_reg). |
- __ add(src_reg, src_reg, Operand(kPointerSize)); |
- |
- if (FLAG_debug_code) { |
- __ cmp(src_reg, dst_reg); |
- __ Check(lo, kStackAccessBelowStackPointer); |
- } |
- |
- // Restore caller's frame pointer and return address now as they will be |
- // overwritten by the copying loop. |
- __ ldr(lr, MemOperand(fp, StandardFrameConstants::kCallerPCOffset)); |
- __ ldr(fp, MemOperand(fp, StandardFrameConstants::kCallerFPOffset)); |
- |
- // Now copy callee arguments to the caller frame going backwards to avoid |
- // callee arguments corruption (source and destination areas could overlap). |
- |
- // Both src_reg and dst_reg are pointing to the word after the one to copy, |
- // so they must be pre-decremented in the loop. |
- Register tmp_reg = scratch3; |
- Label loop, entry; |
- __ b(&entry); |
- __ bind(&loop); |
- __ ldr(tmp_reg, MemOperand(src_reg, -kPointerSize, PreIndex)); |
- __ str(tmp_reg, MemOperand(dst_reg, -kPointerSize, PreIndex)); |
- __ bind(&entry); |
- __ cmp(sp, src_reg); |
- __ b(ne, &loop); |
- |
- // Leave current frame. |
- __ mov(sp, dst_reg); |
- |
+ ParameterCount callee_args_count(args_reg); |
+ __ PrepareForTailCall(callee_args_count, caller_args_count_reg, scratch2, |
+ scratch3); |
__ bind(&done); |
} |
} // namespace |