mirror of
https://github.com/RPCSX/llvm.git
synced 2024-11-27 21:50:40 +00:00
Revert r123419. It still breaks llvm-gcc-i386-linux-selfhost.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@123423 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
a899d1c264
commit
b6436e5be1
@ -155,22 +155,11 @@ MachineBasicBlock::SkipPHIsAndLabels(MachineBasicBlock::iterator I) {
|
||||
}
|
||||
|
||||
MachineBasicBlock::iterator MachineBasicBlock::getFirstTerminator() {
|
||||
iterator B = begin(), I = end();
|
||||
iterator Term = I;
|
||||
while (I != B) {
|
||||
--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;
|
||||
iterator I = end();
|
||||
while (I != begin() && (--I)->getDesc().isTerminator())
|
||||
; /*noop */
|
||||
if (I != end() && !I->getDesc().isTerminator()) ++I;
|
||||
return I;
|
||||
}
|
||||
|
||||
MachineBasicBlock::iterator MachineBasicBlock::getLastNonDebugInstr() {
|
||||
|
@ -339,8 +339,6 @@ void PHIElimination::LowerAtomicPHINode(
|
||||
#ifndef NDEBUG
|
||||
for (MachineBasicBlock::iterator TI = llvm::next(Term);
|
||||
TI != opBlock.end(); ++TI) {
|
||||
if (TI->isDebugValue())
|
||||
continue;
|
||||
assert(!TI->readsRegister(SrcReg) &&
|
||||
"Terminator instructions cannot use virtual registers unless"
|
||||
"they are the first terminator in a block!");
|
||||
@ -349,13 +347,9 @@ void PHIElimination::LowerAtomicPHINode(
|
||||
} else if (reusedIncoming || !IncomingReg) {
|
||||
// We may have to rewind a bit if we didn't insert a copy this time.
|
||||
KillInst = Term;
|
||||
while (KillInst != opBlock.begin()) {
|
||||
--KillInst;
|
||||
if (KillInst->isDebugValue())
|
||||
continue;
|
||||
if (KillInst->readsRegister(SrcReg))
|
||||
while (KillInst != opBlock.begin())
|
||||
if ((--KillInst)->readsRegister(SrcReg))
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
// We just inserted this copy.
|
||||
KillInst = prior(InsertPos);
|
||||
|
Loading…
Reference in New Issue
Block a user