| Index: src/arm/builtins-arm.cc
|
| diff --git a/src/arm/builtins-arm.cc b/src/arm/builtins-arm.cc
|
| index 7898086c0745aac983f70a6b7ccf6fc5cf93bcf5..a197ac8bd34fefaaeb3b3df94685a43676a4ca20 100644
|
| --- a/src/arm/builtins-arm.cc
|
| +++ b/src/arm/builtins-arm.cc
|
| @@ -1354,8 +1354,14 @@ static void LeaveArgumentsAdaptorFrame(MacroAssembler* masm) {
|
| // then tear down the parameters.
|
| __ ldr(r1, MemOperand(fp, -(StandardFrameConstants::kFixedFrameSizeFromFp +
|
| kPointerSize)));
|
| - __ mov(sp, fp);
|
| - __ ldm(ia_w, sp, fp.bit() | lr.bit());
|
| +
|
| + if (FLAG_enable_ool_constant_pool) {
|
| + __ add(sp, fp, Operand(StandardFrameConstants::kConstantPoolOffset));
|
| + __ ldm(ia_w, sp, pp.bit() | fp.bit() | lr.bit());
|
| + } else {
|
| + __ mov(sp, fp);;
|
| + __ ldm(ia_w, sp, fp.bit() | lr.bit());
|
| + }
|
| __ add(sp, sp, Operand::PointerOffsetFromSmiKey(r1));
|
| __ add(sp, sp, Operand(kPointerSize)); // adjust for receiver
|
| }
|
|
|