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

Use dominates(Instruction, Use) in the verifier. 

This removes a bit of context from the verifier erros, but reduces code
duplication in a fairly critical part of LLVM and makes dominates easier to test.

llvm-svn: 157845
This commit is contained in:
Rafael Espindola 2012-06-01 21:56:26 +00:00
parent ac80f60eed
commit 103c2cfbbd
2 changed files with 4 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
llvm/lib/VMCore/Verifier.cpp
View File

@ -1575,53 +1575,9 @@ void Verifier::visitLandingPadInst(LandingPadInst &LPI) {
void Verifier::verifyDominatesUse(Instruction &I, unsigned i) { void Verifier::verifyDominatesUse(Instruction &I, unsigned i) {
Instruction *Op = cast<Instruction>(I.getOperand(i)); Instruction *Op = cast<Instruction>(I.getOperand(i));
BasicBlock *BB = I.getParent();
BasicBlock *OpBlock = Op->getParent();
PHINode *PN = dyn_cast<PHINode>(&I);
// DT can handle non phi instructions for us. const Use &U = I.getOperandUse(i);
if (!PN) { Assert2(InstsInThisBlock.count(Op) || DT->dominates(Op, U),
// Definition must dominate use unless use is unreachable!
Assert2(InstsInThisBlock.count(Op) || !DT->isReachableFromEntry(BB) ||
DT->dominates(Op, &I),
"Instruction does not dominate all uses!", Op, &I);
return;
}
// Check that a definition dominates all of its uses.
if (InvokeInst *II = dyn_cast<InvokeInst>(Op)) {
// Invoke results are only usable in the normal destination, not in the
// exceptional destination.
BasicBlock *NormalDest = II->getNormalDest();
// PHI nodes differ from other nodes because they actually "use" the
// value in the predecessor basic blocks they correspond to.
BasicBlock *UseBlock = BB;
unsigned j = PHINode::getIncomingValueNumForOperand(i);
UseBlock = PN->getIncomingBlock(j);
Assert2(UseBlock, "Invoke operand is PHI node with bad incoming-BB",
Op, &I);
if (UseBlock == OpBlock) {
// Special case of a phi node in the normal destination or the unwind
// destination.
Assert2(BB == NormalDest || !DT->isReachableFromEntry(UseBlock),
"Invoke result not available in the unwind destination!",
Op, &I);
} else {
Assert2(DT->dominates(II, UseBlock) ||
!DT->isReachableFromEntry(UseBlock),
"Invoke result does not dominate all uses!", Op, &I);
}
}
// PHI nodes are more difficult than other nodes because they actually
// "use" the value in the predecessor basic blocks they correspond to.
unsigned j = PHINode::getIncomingValueNumForOperand(i);
BasicBlock *PredBB = PN->getIncomingBlock(j);
Assert2(PredBB && (DT->dominates(OpBlock, PredBB) ||
!DT->isReachableFromEntry(PredBB)),
"Instruction does not dominate all uses!", Op, &I); "Instruction does not dominate all uses!", Op, &I);
} }

4
llvm/test/Verifier/dominates.ll
View File

@ -20,7 +20,7 @@ bb2:
%y3 = landingpad i32 personality i32 ()* @g %y3 = landingpad i32 personality i32 ()* @g
cleanup cleanup
ret void ret void
; CHECK: Invoke result not available in the unwind destination! ; CHECK: Instruction does not dominate all uses!
; CHECK-NEXT: %y1 = invoke i32 @g() ; CHECK-NEXT: %y1 = invoke i32 @g()
; CHECK-NEXT: to label %bb1 unwind label %bb2 ; CHECK-NEXT: to label %bb1 unwind label %bb2
; CHECK-NEXT: %y2 = phi i32 [ %y1, %bb0 ] ; CHECK-NEXT: %y2 = phi i32 [ %y1, %bb0 ]
@ -38,7 +38,7 @@ bb2:
bb3: bb3:
%y3 = phi i32 [%y1, %bb2] %y3 = phi i32 [%y1, %bb2]
ret void ret void
; CHECK: Invoke result does not dominate all uses! ; CHECK: Instruction does not dominate all uses!
; CHECK-NEXT: %y1 = invoke i32 @g() ; CHECK-NEXT: %y1 = invoke i32 @g()
; CHECK-NEXT: to label %bb1 unwind label %bb2 ; CHECK-NEXT: to label %bb1 unwind label %bb2
; CHECK-NEXT: %y3 = phi i32 [ %y1, %bb2 ] ; CHECK-NEXT: %y3 = phi i32 [ %y1, %bb2 ]