| Index: src/compiler/arm64/code-generator-arm64.cc
|
| diff --git a/src/compiler/arm64/code-generator-arm64.cc b/src/compiler/arm64/code-generator-arm64.cc
|
| index fa5743ab8e4d38865959b139b880d58c9801bf08..2b0a380c311f815db8b8cf439b9965c03f9b162b 100644
|
| --- a/src/compiler/arm64/code-generator-arm64.cc
|
| +++ b/src/compiler/arm64/code-generator-arm64.cc
|
| @@ -351,10 +351,6 @@ void CodeGenerator::AssembleDeconstructActivationRecord() {
|
| if (descriptor->IsJSFunctionCall() || stack_slots > 0) {
|
| __ Mov(jssp, fp);
|
| __ Pop(fp, lr);
|
| - int pop_count = descriptor->IsJSFunctionCall()
|
| - ? static_cast<int>(descriptor->JSParameterCount())
|
| - : 0;
|
| - __ Drop(pop_count);
|
| }
|
| }
|
|
|
| @@ -1184,8 +1180,12 @@ void CodeGenerator::AssembleReturn() {
|
| __ Pop(fp, lr);
|
| int pop_count = descriptor->IsJSFunctionCall()
|
| ? static_cast<int>(descriptor->JSParameterCount())
|
| - : 0;
|
| - __ Drop(pop_count);
|
| + : (info()->IsStub()
|
| + ? info()->code_stub()->GetStackParameterCount()
|
| + : 0);
|
| + if (pop_count != 0) {
|
| + __ Drop(pop_count);
|
| + }
|
| __ Ret();
|
| }
|
| } else {
|
|
|