diff options
| author | Tim Northover <tnorthover@apple.com> | 2013-12-08 08:12:20 +0000 |
|---|---|---|
| committer | Tim Northover <tnorthover@apple.com> | 2013-12-08 08:12:20 +0000 |
| commit | e8098892f517c492193f8f8ebdcbb861d7a7b54a (patch) | |
| tree | e42e27dc1a48051ae60b8ceaf5f6112eb3478de1 /lib/Target | |
| parent | 209178dacacb5c254926a9d8c72933f23feced9f (diff) | |
| download | llvm-e8098892f517c492193f8f8ebdcbb861d7a7b54a.tar.gz llvm-e8098892f517c492193f8f8ebdcbb861d7a7b54a.tar.bz2 llvm-e8098892f517c492193f8f8ebdcbb861d7a7b54a.tar.xz | |
Merging r196493. Simple conflict due to change API of updated
function.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_34@196717 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target')
| -rw-r--r-- | lib/Target/ARM/ARMFrameLowering.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/lib/Target/ARM/ARMFrameLowering.cpp b/lib/Target/ARM/ARMFrameLowering.cpp index 3e72d3690a..1457ace6bc 100644 --- a/lib/Target/ARM/ARMFrameLowering.cpp +++ b/lib/Target/ARM/ARMFrameLowering.cpp @@ -380,15 +380,10 @@ void ARMFrameLowering::emitEpilogue(MachineFunction &MF, if (NumBytes != 0) emitSPUpdate(isARM, MBB, MBBI, dl, TII, NumBytes); } else { - MachineBasicBlock::iterator FirstPop = MBBI; - // Unwind MBBI to point to first LDR / VLDRD. const uint16_t *CSRegs = RegInfo->getCalleeSavedRegs(&MF); if (MBBI != MBB.begin()) { do { - if (isPopOpcode(MBBI->getOpcode())) - FirstPop = MBBI; - --MBBI; } while (MBBI != MBB.begin() && isCSRestore(MBBI, TII, CSRegs)); if (!isCSRestore(MBBI, TII, CSRegs)) @@ -434,7 +429,7 @@ void ARMFrameLowering::emitEpilogue(MachineFunction &MF, ARM::SP) .addReg(FramePtr)); } - } else if (NumBytes && !tryFoldSPUpdateIntoPushPop(MF, FirstPop, NumBytes)) + } else if (NumBytes && !tryFoldSPUpdateIntoPushPop(MF, MBBI, NumBytes)) emitSPUpdate(isARM, MBB, MBBI, dl, TII, NumBytes); // Increment past our save areas. |