[llvm-branch-commits] [llvm-branch] r85602 - in /llvm/branches/Apple/Leela: lib/Target/ARM/ARMISelLowering.cpp test/CodeGen/ARM/2009-10-30.ll

[Bill Wendling]

Author: void
Date: Fri Oct 30 13:23:51 2009
New Revision: 85602

URL: http://llvm.org/viewvc/llvm-project?rev=85602&view=rev
Log:
$ svn merge -c 85590 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r85590 into '.':
A    test/CodeGen/ARM/2009-10-30.ll
U    lib/Target/ARM/ARMISelLowering.cpp


Added:
    llvm/branches/Apple/Leela/test/CodeGen/ARM/2009-10-30.ll
      - copied unchanged from r85590, llvm/trunk/test/CodeGen/ARM/2009-10-30.ll
Modified:
    llvm/branches/Apple/Leela/lib/Target/ARM/ARMISelLowering.cpp

Modified: llvm/branches/Apple/Leela/lib/Target/ARM/ARMISelLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Leela/lib/Target/ARM/ARMISelLowering.cpp?rev=85602&r1=85601&r2=85602&view=diff

==============================================================================
--- llvm/branches/Apple/Leela/lib/Target/ARM/ARMISelLowering.cpp (original)
+++ llvm/branches/Apple/Leela/lib/Target/ARM/ARMISelLowering.cpp Fri Oct 30 13:23:51 2009
@@ -1617,13 +1617,12 @@
     unsigned Align = MF.getTarget().getFrameInfo()->getStackAlignment();
     unsigned VARegSize = (4 - NumGPRs) * 4;
     unsigned VARegSaveSize = (VARegSize + Align - 1) & ~(Align - 1);
-    unsigned ArgOffset = 0;
+    unsigned ArgOffset = CCInfo.getNextStackOffset();
     if (VARegSaveSize) {
       // If this function is vararg, store any remaining integer argument regs
       // to their spots on the stack so that they may be loaded by deferencing
       // the result of va_next.
       AFI->setVarArgsRegSaveSize(VARegSaveSize);
-      ArgOffset = CCInfo.getNextStackOffset();
       VarArgsFrameIndex = MFI->CreateFixedObject(VARegSaveSize, ArgOffset +
                                                  VARegSaveSize - VARegSize);
       SDValue FIN = DAG.getFrameIndex(VarArgsFrameIndex, getPointerTy());