[llvm-commits] [llvm] r145976 - /llvm/trunk/lib/Target/X86/X86FrameLowering.cpp

[Bill Wendling]

Author: void
Date: Tue Dec  6 16:14:27 2011
New Revision: 145976

URL: http://llvm.org/viewvc/llvm-project?rev=145976&view=rev
Log:
Explicitly check for the different SUB instructions.

Modified:
    llvm/trunk/lib/Target/X86/X86FrameLowering.cpp

Modified: llvm/trunk/lib/Target/X86/X86FrameLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86FrameLowering.cpp?rev=145976&r1=145975&r2=145976&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/X86FrameLowering.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86FrameLowering.cpp Tue Dec  6 16:14:27 2011
@@ -475,9 +475,6 @@
   unsigned FramePtr = RegInfo->getFrameRegister(MF);
   unsigned StackPtr = RegInfo->getStackRegister();
 
-  X86MachineFunctionInfo *X86FI = MF.getInfo<X86MachineFunctionInfo>();
-  int TailCallReturnAddrDelta = X86FI->getTCReturnAddrDelta();
-
   bool Is64Bit = STI.is64Bit();
   bool HasFP = hasFP(MF);
 
@@ -490,7 +487,6 @@
   unsigned PushInstrSize = 1;
   unsigned MoveInstr = (Is64Bit ? X86::MOV64rr : X86::MOV32rr);
   unsigned MoveInstrSize = (Is64Bit ? 3 : 2);
-  unsigned SubtractInstr = getSUBriOpcode(Is64Bit, -TailCallReturnAddrDelta);
   unsigned SubtractInstrIdx = (Is64Bit ? 3 : 2);
 
   unsigned StackDivide = (Is64Bit ? 8 : 4);
@@ -529,7 +525,8 @@
       memset(SavedRegs, 0, sizeof(SavedRegs));
       SavedRegIdx = CU_NUM_SAVED_REGS;
       InstrOffset += MoveInstrSize;
-    } else if (Opc == SubtractInstr) {
+    } else if (Opc == X86::SUB64ri32 || Opc == X86::SUB64ri8 ||
+               Opc == X86::SUB32ri || Opc == X86::SUB32ri8) {
       if (StackSize)
         // We already have a stack size.
         return 0;