6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-09-25 17:20:48 +00:00
Code Issues Projects Releases Wiki Activity

A few places where we want to skip the landingpad instruction for insertion.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@137712 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Bill Wendling
2011-08-16 04:52:55 +00:00
parent 614051a1c5
commit 05d0023a95
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Analysis/ScalarEvolutionExpander.cpp
View File

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

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

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

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

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