commit f7ca976e74eafeeab0e9097f0fb07d6bb447415b
author Jakob Stoklund Olesen <stoklund@2pi.dk> Thu Jan 13 22:47:43 2011 +0000
committer Jakob Stoklund Olesen <stoklund@2pi.dk> Thu Jan 13 22:47:43 2011 +0000
tree 04ad8c9016b178af27b75bf153ec6967f0036b5d
parent 0fba7143596330eb0e6d5e19777278abe1c9ba70

Fix a few more places that should use MBB::getLastNonDebugInstr().

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@123408 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Target/ARM/ARMLoadStoreOptimizer.cpp

diff --git a/lib/Target/ARM/ARMLoadStoreOptimizer.cpp b/lib/Target/ARM/ARMLoadStoreOptimizer.cpp
index 2eca4b1..3a3fc42 100644
--- a/lib/Target/ARM/ARMLoadStoreOptimizer.cpp
+++ b/lib/Target/ARM/ARMLoadStoreOptimizer.cpp
@@ -1351,7 +1351,7 @@
 bool ARMLoadStoreOpt::MergeReturnIntoLDM(MachineBasicBlock &MBB) {
   if (MBB.empty()) return false;
 
-  MachineBasicBlock::iterator MBBI = prior(MBB.end());
+  MachineBasicBlock::iterator MBBI = MBB.getLastNonDebugInstr();
   if (MBBI != MBB.begin() &&
       (MBBI->getOpcode() == ARM::BX_RET ||
        MBBI->getOpcode() == ARM::tBX_RET ||