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 b9cc354b2321cd70d74670396661ce486ee8d923..2b605460787f8a2846b6bd8af58abc3c6e7ee69d 100644 |
--- a/src/compiler/arm/code-generator-arm.cc |
+++ b/src/compiler/arm/code-generator-arm.cc |
@@ -304,10 +304,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); |
} |
} |
@@ -1053,8 +1049,12 @@ void CodeGenerator::AssembleReturn() { |
__ LeaveFrame(StackFrame::MANUAL); |
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 { |