[llvm-branch-commits] [llvm-branch] r80961 - /llvm/branches/Apple/Bender-SWB/lib/Target/X86/X86RegisterInfo.cpp

[Bill Wendling]

Author: void
Date: Thu Sep  3 17:22:12 2009
New Revision: 80961

URL: http://llvm.org/viewvc/llvm-project?rev=80961&view=rev
Log:
$ svn merge -c 80960 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r80960 into '.':
U    lib/Target/X86/X86RegisterInfo.cpp


Modified:
    llvm/branches/Apple/Bender-SWB/lib/Target/X86/X86RegisterInfo.cpp

Modified: llvm/branches/Apple/Bender-SWB/lib/Target/X86/X86RegisterInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Bender-SWB/lib/Target/X86/X86RegisterInfo.cpp?rev=80961&r1=80960&r2=80961&view=diff

==============================================================================
--- llvm/branches/Apple/Bender-SWB/lib/Target/X86/X86RegisterInfo.cpp (original)
+++ llvm/branches/Apple/Bender-SWB/lib/Target/X86/X86RegisterInfo.cpp Thu Sep  3 17:22:12 2009
@@ -954,12 +954,12 @@
     }
   }
 
-  if (NumBytes && needsFrameMoves) {
+  if ((NumBytes || PushedRegs) && needsFrameMoves) {
     // Mark end of stack pointer adjustment.
     unsigned LabelId = MMI->NextLabelID();
     BuildMI(MBB, MBBI, DL, TII.get(X86::DBG_LABEL)).addImm(LabelId);
 
-    if (!HasFP) {
+    if (!HasFP && NumBytes) {
       // Define the current CFA rule to use the provided offset.
       if (StackSize) {
         MachineLocation SPDst(MachineLocation::VirtualFP);