diff options
| author | Adrian Prantl <aprantl@apple.com> | 2015-12-21 19:25:03 +0000 |
|---|---|---|
| committer | Adrian Prantl <aprantl@apple.com> | 2015-12-21 19:25:03 +0000 |
| commit | 7deb7ebf8850bdf9c48504d3b0525ecab1312525 (patch) | |
| tree | 0f9dbb676e411d17c673379d838f42904e5f905b /lib/Target/ARM/ARMLoadStoreOptimizer.cpp | |
| parent | 9fc3869acde3a67528cd87f5ead02b5b8eccbd0a (diff) | |
Teach ARMLoadStoreOptimizer to ignore DBG_VALUE instructions when merging
instructions.
As noted in PR24563.
rdar://problem/23963293
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@256183 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target/ARM/ARMLoadStoreOptimizer.cpp')
| -rw-r--r-- | lib/Target/ARM/ARMLoadStoreOptimizer.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/Target/ARM/ARMLoadStoreOptimizer.cpp b/lib/Target/ARM/ARMLoadStoreOptimizer.cpp index 21227cf0ed9..f16ce690859 100644 --- a/lib/Target/ARM/ARMLoadStoreOptimizer.cpp +++ b/lib/Target/ARM/ARMLoadStoreOptimizer.cpp @@ -1800,7 +1800,11 @@ bool ARMLoadStoreOpt::MergeReturnIntoLDM(MachineBasicBlock &MBB) { (MBBI->getOpcode() == ARM::BX_RET || MBBI->getOpcode() == ARM::tBX_RET || MBBI->getOpcode() == ARM::MOVPCLR)) { - MachineInstr *PrevMI = std::prev(MBBI); + MachineBasicBlock::iterator PrevI = std::prev(MBBI); + // Ignore any DBG_VALUE instructions. + while (PrevI->isDebugValue() && PrevI != MBB.begin()) + --PrevI; + MachineInstr *PrevMI = PrevI; unsigned Opcode = PrevMI->getOpcode(); if (Opcode == ARM::LDMIA_UPD || Opcode == ARM::LDMDA_UPD || Opcode == ARM::LDMDB_UPD || Opcode == ARM::LDMIB_UPD || |