diff options
| author | Florian Hahn <florian.hahn@arm.com> | 2016-12-23 12:26:11 +0000 |
|---|---|---|
| committer | Florian Hahn <florian.hahn@arm.com> | 2016-12-23 12:26:11 +0000 |
| commit | 898127fe36cdc156c3354ff9512cc4dd92c61c80 (patch) | |
| tree | 6581bb15f708ea78d2afe0f711efdc351ea1b35d /llvm/lib/Target/X86/X86FrameLowering.cpp | |
| parent | 1ec383c74a1cfc19f413a1a7ce7485fbb3881cc7 (diff) | |
| download | bcm5719-llvm-898127fe36cdc156c3354ff9512cc4dd92c61c80.tar.gz bcm5719-llvm-898127fe36cdc156c3354ff9512cc4dd92c61c80.zip | |
Revert r290423 because it broke the sanitizer-x86_64-linux-autoconf buildbot.
llvm-svn: 290425
Diffstat (limited to 'llvm/lib/Target/X86/X86FrameLowering.cpp')
| -rw-r--r-- | llvm/lib/Target/X86/X86FrameLowering.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/llvm/lib/Target/X86/X86FrameLowering.cpp b/llvm/lib/Target/X86/X86FrameLowering.cpp index 87355d46f9b..1deefe1231c 100644 --- a/llvm/lib/Target/X86/X86FrameLowering.cpp +++ b/llvm/lib/Target/X86/X86FrameLowering.cpp @@ -373,10 +373,6 @@ int X86FrameLowering::mergeSPUpdates(MachineBasicBlock &MBB, MachineBasicBlock::iterator PI = doMergeWithPrevious ? std::prev(MBBI) : MBBI; MachineBasicBlock::iterator NI = doMergeWithPrevious ? nullptr : std::next(MBBI); - PI = skipDebugInstructionsBackward(PI, MBB.begin()); - if (NI != nullptr) - NI = skipDebugInstructionsForward(NI, MBB.end()); - unsigned Opc = PI->getOpcode(); int Offset = 0; @@ -2590,7 +2586,6 @@ eliminateCallFramePseudoInstr(MachineFunction &MF, MachineBasicBlock &MBB, uint64_t Amount = !reserveCallFrame ? I->getOperand(0).getImm() : 0; uint64_t InternalAmt = (isDestroy || Amount) ? I->getOperand(1).getImm() : 0; I = MBB.erase(I); - I = skipDebugInstructionsForward(I, MBB.end()); if (!reserveCallFrame) { // If the stack pointer can be changed after prologue, turn the |
