| 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 306c347f8a16cff03d2ffad3cffa470e7dd6f1e1..f6d630fa9a823ea7158a84bdd6534433eabc0850 100644
|
| --- a/src/compiler/arm/code-generator-arm.cc
|
| +++ b/src/compiler/arm/code-generator-arm.cc
|
| @@ -952,7 +952,7 @@ void CodeGenerator::AssemblePrologue() {
|
| __ Prologue(info->IsCodePreAgingActive());
|
| frame()->SetRegisterSaveAreaSize(
|
| StandardFrameConstants::kFixedFrameSizeFromFp);
|
| - } else if (stack_slots > 0) {
|
| + } else if (needs_frame_) {
|
| __ StubPrologue();
|
| frame()->SetRegisterSaveAreaSize(
|
| StandardFrameConstants::kFixedFrameSizeFromFp);
|
| @@ -997,7 +997,7 @@ void CodeGenerator::AssembleReturn() {
|
| }
|
| __ LeaveFrame(StackFrame::MANUAL);
|
| __ Ret();
|
| - } else if (descriptor->IsJSFunctionCall() || stack_slots > 0) {
|
| + } else if (descriptor->IsJSFunctionCall() || needs_frame_) {
|
| __ LeaveFrame(StackFrame::MANUAL);
|
| int pop_count = descriptor->IsJSFunctionCall()
|
| ? static_cast<int>(descriptor->JSParameterCount())
|
|
|