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

In places where it's using "getFirstNonPHI", skip the landingpad instruction if necessary. 

llvm-svn: 137679
This commit is contained in:
Bill Wendling 2011-08-15 23:19:54 +00:00
parent c5cc625c79
commit 5a18b7c7c7
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
llvm/lib/Transforms/Scalar/CodeGenPrepare.cpp
View File

@ -469,7 +469,7 @@ static bool OptimizeCmpExpression(CmpInst *CI) {
if (!InsertedCmp) { if (!InsertedCmp) {
BasicBlock::iterator InsertPt = UserBB->getFirstNonPHI(); BasicBlock::iterator InsertPt = UserBB->getFirstNonPHI();
if (isa<LandingPadInst>(InsertPt)) ++InsertPt; // Skip landingpad inst.
InsertedCmp = InsertedCmp =
CmpInst::Create(CI->getOpcode(), CmpInst::Create(CI->getOpcode(),
CI->getPredicate(), CI->getOperand(0), CI->getPredicate(), CI->getOperand(0),
@ -561,10 +561,13 @@ bool CodeGenPrepare::OptimizeCallInst(CallInst *CI) {
(DVI->getParent() != VI->getParent() || DT->dominates(DVI, VI))) { (DVI->getParent() != VI->getParent() || DT->dominates(DVI, VI))) {
DEBUG(dbgs() << "Moving Debug Value before :\n" << *DVI << ' ' << *VI); DEBUG(dbgs() << "Moving Debug Value before :\n" << *DVI << ' ' << *VI);
DVI->removeFromParent(); DVI->removeFromParent();
if (isa<PHINode>(VI)) if (isa<PHINode>(VI)) {
DVI->insertBefore(VI->getParent()->getFirstNonPHI()); BasicBlock::iterator InsertPt = VI->getParent()->getFirstNonPHI();
else if (isa<LandingPadInst>(InsertPt)) ++InsertPt;
DVI->insertBefore(InsertPt);
} else {
DVI->insertAfter(VI); DVI->insertAfter(VI);
}
return true; return true;
} }
@ -1061,7 +1064,7 @@ bool CodeGenPrepare::OptimizeExtUses(Instruction *I) {
if (!InsertedTrunc) { if (!InsertedTrunc) {
BasicBlock::iterator InsertPt = UserBB->getFirstNonPHI(); BasicBlock::iterator InsertPt = UserBB->getFirstNonPHI();
if (isa<LandingPadInst>(InsertPt)) ++InsertPt;
InsertedTrunc = new TruncInst(I, Src->getType(), "", InsertPt); InsertedTrunc = new TruncInst(I, Src->getType(), "", InsertPt);
} }