From d11beffef4f1117aceb9f2f5532b4a317c30c05a Mon Sep 17 00:00:00 2001 From: Manuel Jacob Date: Sun, 20 Jul 2014 09:10:11 +0000 Subject: [C++11] Add predecessors(BasicBlock *) / successors(BasicBlock *) iterator ranges. Summary: This patch introduces two new iterator ranges and updates existing code to use it. No functional change intended. Test Plan: All tests (make check-all) still pass. Reviewers: dblaikie Reviewed By: dblaikie Subscribers: llvm-commits Differential Revision: http://reviews.llvm.org/D4481 llvm-svn: 213474 --- llvm/lib/Transforms/Utils/CodeExtractor.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'llvm/lib/Transforms/Utils/CodeExtractor.cpp') diff --git a/llvm/lib/Transforms/Utils/CodeExtractor.cpp b/llvm/lib/Transforms/Utils/CodeExtractor.cpp index e70a7d6e76c..d7445ef65b6 100644 --- a/llvm/lib/Transforms/Utils/CodeExtractor.cpp +++ b/llvm/lib/Transforms/Utils/CodeExtractor.cpp @@ -91,9 +91,8 @@ static SetVector buildExtractionBlockSet(IteratorT BBBegin, for (SetVector::iterator I = std::next(Result.begin()), E = Result.end(); I != E; ++I) - for (pred_iterator PI = pred_begin(*I), PE = pred_end(*I); - PI != PE; ++PI) - assert(Result.count(*PI) && + for (BasicBlock *Pred : predecessors(*I)) + assert(Result.count(Pred) && "No blocks in this region may have entries from outside the region" " except for the first block!"); #endif @@ -721,9 +720,9 @@ Function *CodeExtractor::extractCodeRegion() { SmallPtrSet ExitBlocks; for (SetVector::iterator I = Blocks.begin(), E = Blocks.end(); I != E; ++I) - for (succ_iterator SI = succ_begin(*I), SE = succ_end(*I); SI != SE; ++SI) - if (!Blocks.count(*SI)) - ExitBlocks.insert(*SI); + for (BasicBlock *Succ : successors(*I)) + if (!Blocks.count(Succ)) + ExitBlocks.insert(Succ); NumExitBlocks = ExitBlocks.size(); // Construct new function based on inputs/outputs & add allocas for all defs. -- cgit v1.2.3