Simplify some code by using blocks_begin(), blocks_end(), and

the iterator typedefs instead of handling the std::vector
directly.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@64016 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Dan Gohman 2009-02-07 16:10:35 +00:00
parent f996831427
commit f3ab3a9372

View File

@ -98,7 +98,7 @@ public:
/// contains - Return true if the specified basic block is in this loop /// contains - Return true if the specified basic block is in this loop
/// ///
bool contains(const BlockT *BB) const { bool contains(const BlockT *BB) const {
return std::find(Blocks.begin(), Blocks.end(), BB) != Blocks.end(); return std::find(block_begin(), block_end(), BB) != block_end();
} }
/// iterator/begin/end - Return the loops contained entirely within this loop. /// iterator/begin/end - Return the loops contained entirely within this loop.
@ -173,8 +173,7 @@ public:
std::sort(LoopBBs.begin(), LoopBBs.end()); std::sort(LoopBBs.begin(), LoopBBs.end());
typedef GraphTraits<BlockT*> BlockTraits; typedef GraphTraits<BlockT*> BlockTraits;
for (typename std::vector<BlockT*>::const_iterator BI = Blocks.begin(), for (block_iterator BI = block_begin(), BE = block_end(); BI != BE; ++BI)
BE = Blocks.end(); BI != BE; ++BI)
for (typename BlockTraits::ChildIteratorType I = for (typename BlockTraits::ChildIteratorType I =
BlockTraits::child_begin(*BI), E = BlockTraits::child_end(*BI); BlockTraits::child_begin(*BI), E = BlockTraits::child_end(*BI);
I != E; ++I) I != E; ++I)
@ -195,8 +194,7 @@ public:
std::sort(LoopBBs.begin(), LoopBBs.end()); std::sort(LoopBBs.begin(), LoopBBs.end());
typedef GraphTraits<BlockT*> BlockTraits; typedef GraphTraits<BlockT*> BlockTraits;
for (typename std::vector<BlockT*>::const_iterator BI = Blocks.begin(), for (block_iterator BI = block_begin(), BE = block_end(); BI != BE; ++BI)
BE = Blocks.end(); BI != BE; ++BI)
for (typename BlockTraits::ChildIteratorType I = for (typename BlockTraits::ChildIteratorType I =
BlockTraits::child_begin(*BI), E = BlockTraits::child_end(*BI); BlockTraits::child_begin(*BI), E = BlockTraits::child_end(*BI);
I != E; ++I) I != E; ++I)
@ -217,8 +215,7 @@ public:
std::vector<BlockT*> switchExitBlocks; std::vector<BlockT*> switchExitBlocks;
for (typename std::vector<BlockT*>::const_iterator BI = Blocks.begin(), for (block_iterator BI = block_begin(), BE = block_end(); BI != BE; ++BI) {
BE = Blocks.end(); BI != BE; ++BI) {
BlockT *current = *BI; BlockT *current = *BI;
switchExitBlocks.clear(); switchExitBlocks.clear();
@ -579,8 +576,7 @@ public:
assert (getHeader() && "Loop header is missing"); assert (getHeader() && "Loop header is missing");
assert (getLoopPreheader() && "Loop preheader is missing"); assert (getLoopPreheader() && "Loop preheader is missing");
assert (getLoopLatch() && "Loop latch is missing"); assert (getLoopLatch() && "Loop latch is missing");
for (typename std::vector<LoopBase<BlockT>*>::const_iterator I = for (iterator I = SubLoops.begin(), E = SubLoops.end(); I != E; ++I)
SubLoops.begin(), E = SubLoops.end(); I != E; ++I)
(*I)->verifyLoop(); (*I)->verifyLoop();
#endif #endif
} }