6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-06-25 16:24:23 +00:00
Code Issues Projects Releases Wiki Activity

Use Loop::block_iterator.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@52616 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Dan Gohman
2008-06-22 20:18:58 +00:00
parent 6c459a28ec
commit 9b78763fce
4 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Transforms/Scalar/IndVarSimplify.cpp
View File

@ -574,9 +574,10 @@ bool IndVarSimplify::runOnLoop(Loop *L, LPPassManager &LPM) {
#if 0 #if 0
// Now replace all derived expressions in the loop body with simpler // Now replace all derived expressions in the loop body with simpler
// expressions. // expressions.
for (unsigned i = 0, e = L->getBlocks().size(); i != e; ++i) for (LoopInfo::block_iterator I = L->block_begin(), E = L->block_end();
if (LI->getLoopFor(L->getBlocks()[i]) == L) { // Not in a subloop... I != E; ++I) {
BasicBlock *BB = L->getBlocks()[i]; BasicBlock *BB = *I;
if (LI->getLoopFor(BB) == L) { // Not in a subloop...
for (BasicBlock::iterator I = BB->begin(), E = BB->end(); I != E; ++I) for (BasicBlock::iterator I = BB->begin(), E = BB->end(); I != E; ++I)
if (I->getType()->isInteger() && // Is an integer instruction if (I->getType()->isInteger() && // Is an integer instruction
!I->use_empty() && !I->use_empty() &&
@ -593,6 +594,7 @@ bool IndVarSimplify::runOnLoop(Loop *L, LPPassManager &LPM) {
} }
} }
} }
}
#endif #endif
DeleteTriviallyDeadInstructions(DeadInsts); DeleteTriviallyDeadInstructions(DeadInsts);

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

@ -258,10 +258,12 @@ bool LICM::runOnLoop(Loop *L, LPPassManager &LPM) {
// Because subloops have already been incorporated into AST, we skip blocks in // Because subloops have already been incorporated into AST, we skip blocks in
// subloops. // subloops.
// //
for (std::vector<BasicBlock*>::const_iterator I = L->getBlocks().begin(), for (Loop::block_iterator I = L->block_begin(), E = L->block_end();
E = L->getBlocks().end(); I != E; ++I) I != E; ++I) {
if (LI->getLoopFor(*I) == L) // Ignore blocks in subloops... BasicBlock *BB = *I;
CurAST->add(**I); // Incorporate the specified basic block if (LI->getLoopFor(BB) == L) // Ignore blocks in subloops...
CurAST->add(*BB); // Incorporate the specified basic block
}
// We want to visit all of the instructions in this loop... that are not parts // We want to visit all of the instructions in this loop... that are not parts
// of our subloops (they have already had their invariants hoisted out of // of our subloops (they have already had their invariants hoisted out of
@ -698,12 +700,11 @@ void LICM::PromoteValuesInLoop() {
// Scan the basic blocks in the loop, replacing uses of our pointers with // Scan the basic blocks in the loop, replacing uses of our pointers with
// uses of the allocas in question. // uses of the allocas in question.
// //
const std::vector<BasicBlock*> &LoopBBs = CurLoop->getBlocks(); for (Loop::block_iterator I = CurLoop->block_begin(),
for (std::vector<BasicBlock*>::const_iterator I = LoopBBs.begin(), E = CurLoop->block_end(); I != E; ++I) {
E = LoopBBs.end(); I != E; ++I) { BasicBlock *BB = *I;
// Rewrite all loads and stores in the block of the pointer... // Rewrite all loads and stores in the block of the pointer...
for (BasicBlock::iterator II = (*I)->begin(), E = (*I)->end(); for (BasicBlock::iterator II = BB->begin(), E = BB->end(); II != E; ++II) {
II != E; ++II) {
if (LoadInst *L = dyn_cast<LoadInst>(II)) { if (LoadInst *L = dyn_cast<LoadInst>(II)) {
std::map<Value*, AllocaInst*>::iterator std::map<Value*, AllocaInst*>::iterator
I = ValueToAllocaMap.find(L->getOperand(0)); I = ValueToAllocaMap.find(L->getOperand(0));

5
lib/Transforms/Scalar/LoopUnroll.cpp
View File

@ -67,8 +67,9 @@ LoopPass *llvm::createLoopUnrollPass() { return new LoopUnroll(); }
/// ApproximateLoopSize - Approximate the size of the loop. /// ApproximateLoopSize - Approximate the size of the loop.
static unsigned ApproximateLoopSize(const Loop *L) { static unsigned ApproximateLoopSize(const Loop *L) {
unsigned Size = 0; unsigned Size = 0;
for (unsigned i = 0, e = L->getBlocks().size(); i != e; ++i) { for (Loop::block_iterator I = L->block_begin(), E = L->block_end();
BasicBlock *BB = L->getBlocks()[i]; I != E; ++I) {
BasicBlock *BB = *I;
Instruction *Term = BB->getTerminator(); Instruction *Term = BB->getTerminator();
for (BasicBlock::iterator I = BB->begin(), E = BB->end(); I != E; ++I) { for (BasicBlock::iterator I = BB->begin(), E = BB->end(); I != E; ++I) {
if (isa<PHINode>(I) && BB == L->getHeader()) { if (isa<PHINode>(I) && BB == L->getHeader()) {

5
lib/Transforms/Utils/LoopSimplify.cpp
View File

@ -460,8 +460,9 @@ Loop *LoopSimplify::SeparateNestedLoop(Loop *L) {
// L is now a subloop of our outer loop. // L is now a subloop of our outer loop.
NewOuter->addChildLoop(L); NewOuter->addChildLoop(L);
for (unsigned i = 0, e = L->getBlocks().size(); i != e; ++i) for (Loop::block_iterator I = L->block_begin(), E = L->block_end();
NewOuter->addBlockEntry(L->getBlocks()[i]); I != E; ++I)
NewOuter->addBlockEntry(*I);
// Determine which blocks should stay in L and which should be moved out to // Determine which blocks should stay in L and which should be moved out to
// the Outer loop now. // the Outer loop now.