summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d2e103d)
raw | patch | inline | side by side (parent: d2e103d)
author | Bill Wendling <isanbard@gmail.com> | |
Tue, 16 Aug 2011 20:45:24 +0000 (20:45 +0000) | ||
committer | Bill Wendling <isanbard@gmail.com> | |
Tue, 16 Aug 2011 20:45:24 +0000 (20:45 +0000) |
check for a LandingPadInst.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@137745 91177308-0d34-0410-b5e6-96231b3b80d8
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@137745 91177308-0d34-0410-b5e6-96231b3b80d8
index e1ad2f91ca1a4a55069f7d4ca59246fc2cbf21a4..d872a4fa6445048e1882ad03e08f822960a4ea98 100644 (file)
// 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;
diff --git a/lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp b/lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp
index b987340e13f2e56eb86d15e841c956df0877af1f..7446a51a4db11822c8a752c8f8fff8f80acea0aa 100644 (file)
// 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(),
diff --git a/lib/Transforms/InstCombine/InstructionCombining.cpp b/lib/Transforms/InstCombine/InstructionCombining.cpp
index f13733cf05c92b2bce57cf2fd882eaf451b6356f..47e7dd4c2203ed6aeae6daa50402144070a888c1 100644 (file)
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;
diff --git a/lib/Transforms/Instrumentation/GCOVProfiling.cpp b/lib/Transforms/Instrumentation/GCOVProfiling.cpp
index 4f22bbc9c7f68e07f32e27bfd5e1a87326fb6f13..622ac1fc4ee9c460c1eaacd0c2923a0660efe793 100644 (file)
}
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,
index fb4e8a4c9d89ccdd0b2bd62be2d91f296e92cb3d..607f2c4d58a519a2a74bd98cc5df93911a7835c9 100644 (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);
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),
(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;
}
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);
}