Missed the case where alloca is used but the stack size (not including callee-saved...

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@39974 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Target/X86/X86RegisterInfo.cpp b/lib/Target/X86/X86RegisterInfo.cpp
index bbe30b41cc1897bdb82e0f7c608d9c8724cb22e7..fce7172ae3fbf41f4b8ee088f8e2fea44f246531 100644 (file)
--- a/lib/Target/X86/X86RegisterInfo.cpp
+++ b/lib/Target/X86/X86RegisterInfo.cpp
@@ -1340,25 +1340,25 @@ void X86RegisterInfo::emitEpilogue(MachineFunction &MF,
       addReg(DestAddr.getReg());
   }
 
-  if (NumBytes) {    // adjust stack pointer back: ESP += numbytes
-    // Skip the callee-saved pop instructions.
-    while (MBBI != MBB.begin()) {
-      MachineBasicBlock::iterator PI = prior(MBBI);      
-      if (PI->getOpcode() != X86::POP32r && PI->getOpcode() != X86::POP64r)
-        break;
-      --MBBI;
-    }
+  // Skip the callee-saved pop instructions.
+  while (MBBI != MBB.begin()) {
+    MachineBasicBlock::iterator PI = prior(MBBI);      
+    if (PI->getOpcode() != X86::POP32r && PI->getOpcode() != X86::POP64r)
+      break;
+    --MBBI;
+  }
 
-    // If dynamic alloca is used, then reset esp to point to the last
-    // callee-saved slot before popping them off!
-    if (MFI->hasVarSizedObjects()) {
-      unsigned Opc = Is64Bit ? X86::LEA64r : X86::LEA32r;
-      MachineInstr *MI = addRegOffset(BuildMI(TII.get(Opc), StackPtr),
-                                      FramePtr, -CSSize);
-      MBB.insert(MBBI, MI);
-      return;
-    }
+  // If dynamic alloca is used, then reset esp to point to the last
+  // callee-saved slot before popping them off!
+  if (MFI->hasVarSizedObjects()) {
+    unsigned Opc = Is64Bit ? X86::LEA64r : X86::LEA32r;
+    MachineInstr *MI = addRegOffset(BuildMI(TII.get(Opc), StackPtr),
+                                    FramePtr, -CSSize);
+    MBB.insert(MBBI, MI);
+    return;
+  }
 
+  if (NumBytes) {    // adjust stack pointer back: ESP += numbytes
     // If there is an ADD32ri or SUB32ri of ESP immediately before this
     // instruction, merge the two instructions.
     if (MBBI != MBB.begin()) {