RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-24 11:42:57 +01:00
Code Issues Projects Releases Wiki Activity

Use the getFirstInsertionPt() method instead of getFirstNonPHI + an 'isa<>'

Browse Source 
check for a LandingPadInst.

llvm-svn: 137745
This commit is contained in:
Bill Wendling 2011-08-16 20:45:24 +00:00
parent 4ad70bfedd
commit 3d7b8eaa78
5 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/Analysis/ScalarEvolutionExpander.cpp
View File

@ -1323,11 +1323,8 @@ Value *SCEVExpander::expand(const SCEV *S) {
// If the SCEV is computable at this level, insert it into the header
// after the PHIs (and after any other instructions that we've inserted
// there) so that it is guaranteed to dominate any user inside the loop.
if (L && SE.hasComputableLoopEvolution(S, L) && !PostIncLoops.count(L)) {
InsertPt = L->getHeader()->getFirstNonPHI();
if (isa<LandingPadInst>(InsertPt))
InsertPt = llvm::next(BasicBlock::iterator(InsertPt));
}
if (L && SE.hasComputableLoopEvolution(S, L) && !PostIncLoops.count(L))
InsertPt = L->getHeader()->getFirstInsertionPt();
while (isInsertedInstruction(InsertPt) || isa<DbgInfoIntrinsic>(InsertPt))
InsertPt = llvm::next(BasicBlock::iterator(InsertPt));
break;

3
lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp
View File

@ -600,8 +600,7 @@ bool InstCombiner::SimplifyStoreAtEndOfBlock(StoreInst &SI) {
// Advance to a place where it is safe to insert the new store and
// insert it.
BBI = DestBB->getFirstNonPHI();
if (isa<LandingPadInst>(BBI)) ++BBI;
BBI = DestBB->getFirstInsertionPt();
StoreInst *NewSI = new StoreInst(MergedVal, SI.getOperand(1),
SI.isVolatile(),
SI.getAlignment(),

3
lib/Transforms/InstCombine/InstructionCombining.cpp
View File

@ -1435,8 +1435,7 @@ static bool TryToSinkInstruction(Instruction *I, BasicBlock *DestBlock) {
return false;
}
BasicBlock::iterator InsertPos = DestBlock->getFirstNonPHI();
if (isa<LandingPadInst>(InsertPos)) ++InsertPos; // Skip landingpad inst.
BasicBlock::iterator InsertPos = DestBlock->getFirstInsertionPt();
I->moveBefore(InsertPos);
++NumSunkInst;
return true;

4
lib/Transforms/Instrumentation/GCOVProfiling.cpp
View File

@ -505,8 +505,8 @@ bool GCOVProfiler::emitProfileArcs(DebugInfoFinder &DIF) {
}
for (int i = 0, e = ComplexEdgeSuccs.size(); i != e; ++i) {
// call runtime to perform increment
BasicBlock::iterator InsertPt = ComplexEdgeSuccs[i+1]->getFirstNonPHI();
if (isa<LandingPadInst>(InsertPt)) ++InsertPt;
BasicBlock::iterator InsertPt =
ComplexEdgeSuccs[i+1]->getFirstInsertionPt();
IRBuilder<> Builder(InsertPt);
Value *CounterPtrArray =
Builder.CreateConstInBoundsGEP2_64(EdgeTable, 0,

19
lib/Transforms/Scalar/CodeGenPrepare.cpp
View File

@ -410,9 +410,7 @@ static bool OptimizeNoopCopyExpression(CastInst *CI, const TargetLowering &TLI){
CastInst *&InsertedCast = InsertedCasts[UserBB];
if (!InsertedCast) {
BasicBlock::iterator InsertPt = UserBB->getFirstNonPHI();
if (isa<LandingPadInst>(InsertPt)) ++InsertPt;
BasicBlock::iterator InsertPt = UserBB->getFirstInsertionPt();
InsertedCast =
CastInst::Create(CI->getOpcode(), CI->getOperand(0), CI->getType(), "",
InsertPt);
@ -468,8 +466,7 @@ static bool OptimizeCmpExpression(CmpInst *CI) {
CmpInst *&InsertedCmp = InsertedCmps[UserBB];
if (!InsertedCmp) {
BasicBlock::iterator InsertPt = UserBB->getFirstNonPHI();
if (isa<LandingPadInst>(InsertPt)) ++InsertPt; // Skip landingpad inst.
BasicBlock::iterator InsertPt = UserBB->getFirstInsertionPt();
InsertedCmp =
CmpInst::Create(CI->getOpcode(),
CI->getPredicate(), CI->getOperand(0),
@ -561,13 +558,10 @@ bool CodeGenPrepare::OptimizeCallInst(CallInst *CI) {
(DVI->getParent() != VI->getParent() || DT->dominates(DVI, VI))) {
DEBUG(dbgs() << "Moving Debug Value before :\n" << *DVI << ' ' << *VI);
DVI->removeFromParent();
if (isa<PHINode>(VI)) {
BasicBlock::iterator InsertPt = VI->getParent()->getFirstNonPHI();
if (isa<LandingPadInst>(InsertPt)) ++InsertPt;
DVI->insertBefore(InsertPt);
} else {
if (isa<PHINode>(VI))
DVI->insertBefore(VI->getParent()->getFirstInsertionPt());
else
DVI->insertAfter(VI);
}
return true;
}
@ -1063,8 +1057,7 @@ bool CodeGenPrepare::OptimizeExtUses(Instruction *I) {
Instruction *&InsertedTrunc = InsertedTruncs[UserBB];
if (!InsertedTrunc) {
BasicBlock::iterator InsertPt = UserBB->getFirstNonPHI();
if (isa<LandingPadInst>(InsertPt)) ++InsertPt;
BasicBlock::iterator InsertPt = UserBB->getFirstInsertionPt();
InsertedTrunc = new TruncInst(I, Src->getType(), "", InsertPt);
}