Better terminator avoidance.
This approach also works when the terminator doesn't have a slot index. (Which
can happen??)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@123413 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/LiveDebugVariables.cpp b/lib/CodeGen/LiveDebugVariables.cpp
index 5e8e309..38b270d 100644
--- a/lib/CodeGen/LiveDebugVariables.cpp
+++ b/lib/CodeGen/LiveDebugVariables.cpp
@@ -589,14 +589,6 @@
SlotIndex Start = LIS.getMBBStartIdx(MBB);
Idx = Idx.getBaseIndex();
- // Don't insert anything after the first terminator.
- MachineBasicBlock::iterator Term = MBB->getFirstTerminator();
- if (Term != MBB->end() && !LIS.isNotInMIMap(Term) &&
- Idx >= LIS.getInstructionIndex(Term)) {
- DL = Term->getDebugLoc();
- return Term;
- }
-
// Try to find an insert location by going backwards from Idx.
MachineInstr *MI;
while (!(MI = LIS.getInstructionFromIndex(Idx))) {
@@ -611,7 +603,9 @@
}
// We found an instruction. The insert point is after the instr.
DL = MI->getDebugLoc();
- return llvm::next(MachineBasicBlock::iterator(MI));
+ // Don't insert anything after the first terminator, though.
+ return MI->getDesc().isTerminator() ? MBB->getFirstTerminator() :
+ llvm::next(MachineBasicBlock::iterator(MI));
}
void UserValue::insertDebugValue(MachineBasicBlock *MBB, SlotIndex Idx,