diff options
| author | Eric Christopher <echristo@apple.com> | 2012-10-02 21:16:53 +0000 |
|---|---|---|
| committer | Eric Christopher <echristo@apple.com> | 2012-10-02 21:16:53 +0000 |
| commit | 2d4d0f0ee8cb4f071e03a5329a637522e12cde06 (patch) | |
| tree | 87169018891eec3203f2379b94e9d0dd9495d4a4 /lib/Target/X86/X86FrameLowering.cpp | |
| parent | 96bd4418b2320dec7cf9573c4f1da0a0ef31465e (diff) | |
Make the location a parameter since we may not want the next one
in the block.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@165050 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target/X86/X86FrameLowering.cpp')
| -rw-r--r-- | lib/Target/X86/X86FrameLowering.cpp | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/lib/Target/X86/X86FrameLowering.cpp b/lib/Target/X86/X86FrameLowering.cpp index ce53c5a4ef..34a1b1fa71 100644 --- a/lib/Target/X86/X86FrameLowering.cpp +++ b/lib/Target/X86/X86FrameLowering.cpp @@ -146,7 +146,8 @@ static void emitSPUpdate(MachineBasicBlock &MBB, MachineBasicBlock::iterator &MBBI, unsigned StackPtr, int64_t NumBytes, bool Is64Bit, bool UseLEA, - const TargetInstrInfo &TII, const TargetRegisterInfo &TRI) { + const TargetInstrInfo &TII, const TargetRegisterInfo &TRI, + DebugLoc DL) { bool isSub = NumBytes < 0; uint64_t Offset = isSub ? -NumBytes : NumBytes; unsigned Opc; @@ -158,7 +159,6 @@ void emitSPUpdate(MachineBasicBlock &MBB, MachineBasicBlock::iterator &MBBI, : getADDriOpcode(Is64Bit, Offset); uint64_t Chunk = (1LL << 31) - 1; - DebugLoc DL = MBB.findDebugLoc(MBBI); while (Offset) { uint64_t ThisVal = (Offset > Chunk) ? Chunk : Offset; @@ -912,7 +912,7 @@ void X86FrameLowering::emitPrologue(MachineFunction &MF) const { // FIXME: %rax preserves the offset and should be available. if (isSPUpdateNeeded) emitSPUpdate(MBB, MBBI, StackPtr, -(int64_t)NumBytes, Is64Bit, - UseLEA, TII, *RegInfo); + UseLEA, TII, *RegInfo, MBB.findDebugLoc(MBBI)); if (isEAXAlive) { // Restore EAX @@ -924,7 +924,7 @@ void X86FrameLowering::emitPrologue(MachineFunction &MF) const { } } else if (NumBytes) emitSPUpdate(MBB, MBBI, StackPtr, -(int64_t)NumBytes, Is64Bit, - UseLEA, TII, *RegInfo); + UseLEA, TII, *RegInfo, MBB.findDebugLoc(MBBI)); // If we need a base pointer, set it up here. It's whatever the value // of the stack pointer is at this point. Any variable size objects @@ -1075,7 +1075,8 @@ void X86FrameLowering::emitEpilogue(MachineFunction &MF, } } else if (NumBytes) { // Adjust stack pointer back: ESP += numbytes. - emitSPUpdate(MBB, MBBI, StackPtr, NumBytes, Is64Bit, UseLEA, TII, *RegInfo); + emitSPUpdate(MBB, MBBI, StackPtr, NumBytes, Is64Bit, UseLEA, TII, + *RegInfo, MBB.findDebugLoc(MBBI)); } // We're returning from function via eh_return. @@ -1110,7 +1111,8 @@ void X86FrameLowering::emitEpilogue(MachineFunction &MF, if (Offset) { // Check for possible merge with preceding ADD instruction. Offset += mergeSPUpdates(MBB, MBBI, StackPtr, true); - emitSPUpdate(MBB, MBBI, StackPtr, Offset, Is64Bit, UseLEA, TII, *RegInfo); + emitSPUpdate(MBB, MBBI, StackPtr, Offset, Is64Bit, UseLEA, TII, + *RegInfo, MBB.findDebugLoc(MBBI)); } // Jump to label or value in register. @@ -1153,7 +1155,8 @@ void X86FrameLowering::emitEpilogue(MachineFunction &MF, // Check for possible merge with preceding ADD instruction. delta += mergeSPUpdates(MBB, MBBI, StackPtr, true); - emitSPUpdate(MBB, MBBI, StackPtr, delta, Is64Bit, UseLEA, TII, *RegInfo); + emitSPUpdate(MBB, MBBI, StackPtr, delta, Is64Bit, UseLEA, TII, + *RegInfo, MBB.findDebugLoc(MBBI)); } } |