arm

src/arm/macro-assembler-arm.cc

Index: src/arm/macro-assembler-arm.cc
diff --git a/src/arm/macro-assembler-arm.cc b/src/arm/macro-assembler-arm.cc
index 0aa886bac724a3236d86382c0f7f04558c355f1d..aa7c5ee6617caefd7f2a9e74bd557e064c3d1017 100644
--- a/src/arm/macro-assembler-arm.cc
+++ b/src/arm/macro-assembler-arm.cc
@@ -2363,10 +2363,8 @@ static int AddressOffset(ExternalReference ref0, ExternalReference ref1) {
 
 
 void MacroAssembler::CallApiFunctionAndReturn(
-    Register function_address,
-    ExternalReference thunk_ref,
-    int stack_space,
-    MemOperand return_value_operand,
+    Register function_address, ExternalReference thunk_ref, int stack_space,
+    MemOperand* stack_space_operand, MemOperand return_value_operand,
     MemOperand* context_restore_operand) {
   ExternalReference next_address =
       ExternalReference::handle_scope_next_address(isolate());
@@ -2464,7 +2462,11 @@ void MacroAssembler::CallApiFunctionAndReturn(
     ldr(cp, *context_restore_operand);
   }
   // LeaveExitFrame expects unwind space to be in a register.
-  mov(r4, Operand(stack_space));
+  if (stack_space_operand != NULL) {
+    ldr(r4, *stack_space_operand);
+  } else {
+    mov(r4, Operand(stack_space));
+  }
   LeaveExitFrame(false, r4, !restore_context);
   mov(pc, lr);