diff options
| author | Jakob Stoklund Olesen <stoklund@2pi.dk> | 2011-01-13 21:28:52 +0000 |
|---|---|---|
| committer | Jakob Stoklund Olesen <stoklund@2pi.dk> | 2011-01-13 21:28:52 +0000 |
| commit | 4bc5e389600f8c6f03e7b37e105d8ea9a02cb583 (patch) | |
| tree | c8dd6b12f7e5d8191f28dbffcf3c71856209ee8f /llvm/lib/Target/ARM/ARMFrameLowering.cpp | |
| parent | e1175b7c67ad577e2023e2e3c7ce18e4ec71d855 (diff) | |
| download | bcm5719-llvm-4bc5e389600f8c6f03e7b37e105d8ea9a02cb583.tar.gz bcm5719-llvm-4bc5e389600f8c6f03e7b37e105d8ea9a02cb583.zip | |
Teach frame lowering to ignore debug values after the terminators.
llvm-svn: 123399
Diffstat (limited to 'llvm/lib/Target/ARM/ARMFrameLowering.cpp')
| -rw-r--r-- | llvm/lib/Target/ARM/ARMFrameLowering.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/lib/Target/ARM/ARMFrameLowering.cpp b/llvm/lib/Target/ARM/ARMFrameLowering.cpp index 4a64867d3a2..b8cbf5d2db3 100644 --- a/llvm/lib/Target/ARM/ARMFrameLowering.cpp +++ b/llvm/lib/Target/ARM/ARMFrameLowering.cpp @@ -297,7 +297,7 @@ void ARMFrameLowering::emitPrologue(MachineFunction &MF) const { void ARMFrameLowering::emitEpilogue(MachineFunction &MF, MachineBasicBlock &MBB) const { - MachineBasicBlock::iterator MBBI = prior(MBB.end()); + MachineBasicBlock::iterator MBBI = MBB.getLastNonDebugInstr(); assert(MBBI->getDesc().isReturn() && "Can only insert epilog into returning blocks"); unsigned RetOpcode = MBBI->getOpcode(); @@ -378,7 +378,7 @@ void ARMFrameLowering::emitEpilogue(MachineFunction &MF, if (RetOpcode == ARM::TCRETURNdi || RetOpcode == ARM::TCRETURNdiND || RetOpcode == ARM::TCRETURNri || RetOpcode == ARM::TCRETURNriND) { // Tail call return: adjust the stack pointer and jump to callee. - MBBI = prior(MBB.end()); + MBBI = MBB.getLastNonDebugInstr(); MachineOperand &JumpTarget = MBBI->getOperand(0); // Jump to label or value in register. |
