Teach MachineBasicBlock::getFirstTerminator to ignore debug values.
It will still return an iterator that points to the first terminator or end(), but there may be DBG_VALUE instructions following the first terminator. llvm-svn: 123384
This commit is contained in:
parent
c8056a952e
commit
0e233ae183
|
@ -155,11 +155,22 @@ MachineBasicBlock::SkipPHIsAndLabels(MachineBasicBlock::iterator I) {
|
||||||
}
|
}
|
||||||
|
|
||||||
MachineBasicBlock::iterator MachineBasicBlock::getFirstTerminator() {
|
MachineBasicBlock::iterator MachineBasicBlock::getFirstTerminator() {
|
||||||
iterator I = end();
|
iterator B = begin(), I = end();
|
||||||
while (I != begin() && (--I)->getDesc().isTerminator())
|
iterator Term = I;
|
||||||
; /*noop */
|
while (I != B) {
|
||||||
if (I != end() && !I->getDesc().isTerminator()) ++I;
|
--I;
|
||||||
return I;
|
// Ignore any debug values after the first terminator.
|
||||||
|
if (I->isDebugValue())
|
||||||
|
continue;
|
||||||
|
// Stop once we see a non-debug non-terminator.
|
||||||
|
if (!I->getDesc().isTerminator())
|
||||||
|
break;
|
||||||
|
// Earliest terminator so far.
|
||||||
|
Term = I;
|
||||||
|
}
|
||||||
|
// Return the first terminator, or end().
|
||||||
|
// Everything after Term is terminators and debug values.
|
||||||
|
return Term;
|
||||||
}
|
}
|
||||||
|
|
||||||
void MachineBasicBlock::dump() const {
|
void MachineBasicBlock::dump() const {
|
||||||
|
|
|
@ -339,6 +339,8 @@ void PHIElimination::LowerAtomicPHINode(
|
||||||
#ifndef NDEBUG
|
#ifndef NDEBUG
|
||||||
for (MachineBasicBlock::iterator TI = llvm::next(Term);
|
for (MachineBasicBlock::iterator TI = llvm::next(Term);
|
||||||
TI != opBlock.end(); ++TI) {
|
TI != opBlock.end(); ++TI) {
|
||||||
|
if (TI->isDebugValue())
|
||||||
|
continue;
|
||||||
assert(!TI->readsRegister(SrcReg) &&
|
assert(!TI->readsRegister(SrcReg) &&
|
||||||
"Terminator instructions cannot use virtual registers unless"
|
"Terminator instructions cannot use virtual registers unless"
|
||||||
"they are the first terminator in a block!");
|
"they are the first terminator in a block!");
|
||||||
|
|
Loading…
Reference in New Issue