Index: src/compiler/mips64/code-generator-mips64.cc |
diff --git a/src/compiler/mips64/code-generator-mips64.cc b/src/compiler/mips64/code-generator-mips64.cc |
index 534ebfb09e5da459388d612f33a4008f2bb62b74..b3f8088e55f1403308399881dce3a64723a8c4c0 100644 |
--- a/src/compiler/mips64/code-generator-mips64.cc |
+++ b/src/compiler/mips64/code-generator-mips64.cc |
@@ -399,10 +399,6 @@ void CodeGenerator::AssembleDeconstructActivationRecord() { |
int stack_slots = frame()->GetSpillSlotCount(); |
if (descriptor->IsJSFunctionCall() || stack_slots > 0) { |
__ LeaveFrame(StackFrame::MANUAL); |
- int pop_count = descriptor->IsJSFunctionCall() |
- ? static_cast<int>(descriptor->JSParameterCount()) |
- : 0; |
- __ Drop(pop_count); |
} |
} |
@@ -1230,8 +1226,14 @@ void CodeGenerator::AssembleReturn() { |
__ Pop(ra, fp); |
int pop_count = descriptor->IsJSFunctionCall() |
? static_cast<int>(descriptor->JSParameterCount()) |
- : 0; |
- __ DropAndRet(pop_count); |
+ : (info()->IsStub() |
+ ? info()->code_stub()->GetStackParameterCount() |
+ : 0); |
+ if (pop_count != 0) { |
+ __ DropAndRet(pop_count); |
+ } else { |
+ __ Ret(); |
+ } |
} |
} else { |
__ Ret(); |