| Index: src/compiler/arm/code-generator-arm.cc
|
| diff --git a/src/compiler/arm/code-generator-arm.cc b/src/compiler/arm/code-generator-arm.cc
|
| index e2ddf462aae04c8b31b52f98f42e1143fdeaa5e3..52f0765e04306087edd13639bc8960e9f8320d01 100644
|
| --- a/src/compiler/arm/code-generator-arm.cc
|
| +++ b/src/compiler/arm/code-generator-arm.cc
|
| @@ -777,6 +777,7 @@ void CodeGenerator::AssembleDeoptimizerCall(int deoptimization_id) {
|
|
|
| void CodeGenerator::AssemblePrologue() {
|
| CallDescriptor* descriptor = linkage()->GetIncomingDescriptor();
|
| + int stack_slots = frame()->GetSpillSlotCount();
|
| if (descriptor->kind() == CallDescriptor::kCallAddress) {
|
| bool saved_pp;
|
| if (FLAG_enable_ool_constant_pool) {
|
| @@ -805,12 +806,11 @@ void CodeGenerator::AssemblePrologue() {
|
| __ Prologue(info->IsCodePreAgingActive());
|
| frame()->SetRegisterSaveAreaSize(
|
| StandardFrameConstants::kFixedFrameSizeFromFp);
|
| - } else {
|
| + } else if (stack_slots > 0) {
|
| __ StubPrologue();
|
| frame()->SetRegisterSaveAreaSize(
|
| StandardFrameConstants::kFixedFrameSizeFromFp);
|
| }
|
| - int stack_slots = frame()->GetSpillSlotCount();
|
|
|
| if (info()->is_osr()) {
|
| // TurboFan OSR-compiled functions cannot be entered directly.
|
| @@ -834,10 +834,10 @@ void CodeGenerator::AssemblePrologue() {
|
|
|
| void CodeGenerator::AssembleReturn() {
|
| CallDescriptor* descriptor = linkage()->GetIncomingDescriptor();
|
| + int stack_slots = frame()->GetSpillSlotCount();
|
| if (descriptor->kind() == CallDescriptor::kCallAddress) {
|
| if (frame()->GetRegisterSaveAreaSize() > 0) {
|
| // Remove this frame's spill slots first.
|
| - int stack_slots = frame()->GetSpillSlotCount();
|
| if (stack_slots > 0) {
|
| __ add(sp, sp, Operand(stack_slots * kPointerSize));
|
| }
|
| @@ -849,13 +849,15 @@ void CodeGenerator::AssembleReturn() {
|
| }
|
| __ LeaveFrame(StackFrame::MANUAL);
|
| __ Ret();
|
| - } else {
|
| + } else if (descriptor->IsJSFunctionCall() || stack_slots > 0) {
|
| __ LeaveFrame(StackFrame::MANUAL);
|
| int pop_count = descriptor->IsJSFunctionCall()
|
| ? static_cast<int>(descriptor->JSParameterCount())
|
| : 0;
|
| __ Drop(pop_count);
|
| __ Ret();
|
| + } else {
|
| + __ Ret();
|
| }
|
| }
|
|
|
|
|