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 | 657a42daf14aa4cea6ff284509b784dc764cd778 (patch) | |
| tree | 5cbd69ab54f7d69d553168ee399532ff1a6b670d /llvm/lib/Target/X86 | |
| parent | d40ce7a43d3d55734342c79736aa88a8bd3aaa47 (diff) | |
| download | bcm5719-llvm-657a42daf14aa4cea6ff284509b784dc764cd778.tar.gz bcm5719-llvm-657a42daf14aa4cea6ff284509b784dc764cd778.zip | |
Make the location a parameter since we may not want the next one
in the block.
llvm-svn: 165050
Diffstat (limited to 'llvm/lib/Target/X86')
| -rw-r--r-- | llvm/lib/Target/X86/X86FrameLowering.cpp | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/llvm/lib/Target/X86/X86FrameLowering.cpp b/llvm/lib/Target/X86/X86FrameLowering.cpp index ce53c5a4ef7..34a1b1fa71c 100644 --- a/llvm/lib/Target/X86/X86FrameLowering.cpp +++ b/llvm/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)); } } |
