Nigel
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make the optional verification step more strict. 

llvm-svn: 132822
This commit is contained in:
Rafael Espindola 2011-06-09 23:55:56 +00:00
parent c9e93a44be
commit 9e97a895f3
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
llvm/lib/CodeGen/TailDuplication.cpp
View File

@ -152,11 +152,11 @@ static void VerifyPHIs(MachineFunction &MF, bool CheckExtra) {
for (unsigned i = 1, e = MI->getNumOperands(); i != e; i += 2) { for (unsigned i = 1, e = MI->getNumOperands(); i != e; i += 2) {
MachineBasicBlock *PHIBB = MI->getOperand(i+1).getMBB(); MachineBasicBlock *PHIBB = MI->getOperand(i+1).getMBB();
if (CheckExtra && !Preds.count(PHIBB)) { if (CheckExtra && !Preds.count(PHIBB)) {
// This is not a hard error.
dbgs() << "Warning: malformed PHI in BB#" << MBB->getNumber() dbgs() << "Warning: malformed PHI in BB#" << MBB->getNumber()
<< ": " << *MI; << ": " << *MI;
dbgs() << " extra input from predecessor BB#" dbgs() << " extra input from predecessor BB#"
<< PHIBB->getNumber() << '\n'; << PHIBB->getNumber() << '\n';
llvm_unreachable(0);
} }
if (PHIBB->getNumber() < 0) { if (PHIBB->getNumber() < 0) {
dbgs() << "Malformed PHI in BB#" << MBB->getNumber() << ": " << *MI; dbgs() << "Malformed PHI in BB#" << MBB->getNumber() << ": " << *MI;
@ -443,6 +443,13 @@ TailDuplicatePass::UpdateSuccessorsPHIs(MachineBasicBlock *FromBB, bool isDead,
// This register is defined in the tail block. // This register is defined in the tail block.
for (unsigned j = 0, ee = LI->second.size(); j != ee; ++j) { for (unsigned j = 0, ee = LI->second.size(); j != ee; ++j) {
MachineBasicBlock *SrcBB = LI->second[j].first; MachineBasicBlock *SrcBB = LI->second[j].first;
// If we didn't duplicate a bb into a particular predecessor, we
// might still have added an entry to SSAUpdateVals to correcly
// recompute SSA. If that case, avoid adding a dummy extra argument
// this PHI.
if (!SrcBB->isSuccessor(SuccBB))
continue;
unsigned SrcReg = LI->second[j].second; unsigned SrcReg = LI->second[j].second;
if (Idx != 0) { if (Idx != 0) {
II->getOperand(Idx).setReg(SrcReg); II->getOperand(Idx).setReg(SrcReg);