Index: src/arm/code-stubs-arm.cc |
diff --git a/src/arm/code-stubs-arm.cc b/src/arm/code-stubs-arm.cc |
index c7aa36e48e746c003ba3cd1391833d2319293fc9..a8a4b5f5ac5f24bf4e3f0b4d70c2cd2f2acd745a 100644 |
--- a/src/arm/code-stubs-arm.cc |
+++ b/src/arm/code-stubs-arm.cc |
@@ -974,21 +974,14 @@ |
// fp: frame pointer (restored after C call) |
// sp: stack pointer (restored as callee's sp after C call) |
// cp: current context (C callee-saved) |
- // |
- // If argv_in_register(): |
- // r2: pointer to the first argument |
+ |
ProfileEntryHookStub::MaybeCallEntryHook(masm); |
__ mov(r5, Operand(r1)); |
- if (!argv_in_register()) { |
- // Compute the argv pointer in a callee-saved register. |
- __ add(r1, sp, Operand(r0, LSL, kPointerSizeLog2)); |
- __ sub(r1, r1, Operand(kPointerSize)); |
- } else { |
- // Move argv into the correct register. |
- __ mov(r1, Operand(r2)); |
- } |
+ // Compute the argv pointer in a callee-saved register. |
+ __ add(r1, sp, Operand(r0, LSL, kPointerSizeLog2)); |
+ __ sub(r1, r1, Operand(kPointerSize)); |
// Enter the exit frame that transitions from JavaScript to C++. |
FrameScope scope(masm, StackFrame::MANUAL); |
@@ -1064,12 +1057,8 @@ |
// r0:r1: result |
// sp: stack pointer |
// fp: frame pointer |
- Register argc; |
- if (!argv_in_register()) { |
- // Callee-saved register r4 still holds argc. |
- argc = r4; |
- } |
- __ LeaveExitFrame(save_doubles(), argc, true); |
+ // Callee-saved register r4 still holds argc. |
+ __ LeaveExitFrame(save_doubles(), r4, true); |
__ mov(pc, lr); |
// Handling of exception. |