Unify the stack layout for construct frames

src/arm/builtins-arm.cc

Index: src/arm/builtins-arm.cc
diff --git a/src/arm/builtins-arm.cc b/src/arm/builtins-arm.cc
index 89056df63018cc1d87223628fdd8bbb3f94dde0d..e766cc8d56cf5756438bb2beba45a3bf616ca4b4 100644
--- a/src/arm/builtins-arm.cc
+++ b/src/arm/builtins-arm.cc
@@ -624,16 +624,16 @@ static void Generate_JSConstructStubHelper(MacroAssembler* masm,
       __ bind(&count_incremented);
     }
 
+    __ pop(r1);  // Constructor function.

[Dmitry Lomov (no reviews), 2015/06/24 15:49:47]

Use __ Drop(1)

[arv (Not doing code reviews), 2015/06/24 15:54:10]

That is not an option here because we need to have the constructor function in
r1. It is used on line 672

[Dmitry Lomov (no reviews), 2015/06/24 15:58:32]

Ah silly me. Thanks

+
     __ push(r4);
     __ push(r4);
 
-    // Reload the number of arguments and the constructor from the stack.
+    // Reload the number of arguments from the stack.
     // sp[0]: receiver
     // sp[1]: receiver
-    // sp[2]: constructor function
-    // sp[3]: number of arguments (smi-tagged)
-    __ ldr(r1, MemOperand(sp, 2 * kPointerSize));
-    __ ldr(r3, MemOperand(sp, 3 * kPointerSize));
+    // sp[2]: number of arguments (smi-tagged)
+    __ ldr(r3, MemOperand(sp, 2 * kPointerSize));
 
     // Set up pointer to last argument.
     __ add(r2, fp, Operand(StandardFrameConstants::kCallerSPOffset));
@@ -711,9 +711,8 @@ static void Generate_JSConstructStubHelper(MacroAssembler* masm,
     __ bind(&exit);
     // r0: result
     // sp[0]: receiver (newly allocated object)
-    // sp[1]: constructor function
-    // sp[2]: number of arguments (smi-tagged)
-    __ ldr(r1, MemOperand(sp, 2 * kPointerSize));
+    // sp[1]: number of arguments (smi-tagged)
+    __ ldr(r1, MemOperand(sp, kPointerSize));
 
     // Leave construct frame.
   }