mirrors/llvm-project
0
0
Fork 0
mirror of https://github.com/llvm/llvm-project.git synced 2025-05-03 10:36:07 +00:00
Code Issues Projects Releases Wiki Activity

Try for the third time to teach getFirstTerminator() about debug values.

Browse Source 
This time let's rephrase to trick gcc-4.3 into not miscompiling.

llvm-svn: 123432
This commit is contained in:
Jakob Stoklund Olesen 2011-01-14 06:33:45 +00:00
parent e93e4f118c
commit ab3d6ecbd2
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
llvm/lib/CodeGen/MachineBasicBlock.cpp
View File

@ -156,9 +156,10 @@ MachineBasicBlock::SkipPHIsAndLabels(MachineBasicBlock::iterator I) {
MachineBasicBlock::iterator MachineBasicBlock::getFirstTerminator() { MachineBasicBlock::iterator MachineBasicBlock::getFirstTerminator() {
iterator I = end(); iterator I = end();
while (I != begin() && (--I)->getDesc().isTerminator()) while (I != begin() && ((--I)->getDesc().isTerminator() || I->isDebugValue()))
; /*noop */ ; /*noop */
if (I != end() && !I->getDesc().isTerminator()) ++I; while (I != end() && !I->getDesc().isTerminator())
++I;
return I; return I;
} }

10
llvm/lib/CodeGen/PHIElimination.cpp
View File

@ -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!");
@ -347,9 +349,13 @@ void PHIElimination::LowerAtomicPHINode(
} else if (reusedIncoming || !IncomingReg) { } else if (reusedIncoming || !IncomingReg) {
// We may have to rewind a bit if we didn't insert a copy this time. // We may have to rewind a bit if we didn't insert a copy this time.
KillInst = Term; KillInst = Term;
while (KillInst != opBlock.begin()) while (KillInst != opBlock.begin()) {
if ((--KillInst)->readsRegister(SrcReg)) --KillInst;
if (KillInst->isDebugValue())
continue;
if (KillInst->readsRegister(SrcReg))
break; break;
}
} else { } else {
// We just inserted this copy. // We just inserted this copy.
KillInst = prior(InsertPos); KillInst = prior(InsertPos);