diff options
| -rw-r--r-- | include/llvm/Transforms/Utils/BasicBlockUtils.h | 9 | ||||
| -rw-r--r-- | lib/Transforms/Scalar/GVN.cpp | 4 | ||||
| -rw-r--r-- | lib/Transforms/Utils/BasicBlockUtils.cpp | 11 |
3 files changed, 13 insertions, 11 deletions
diff --git a/include/llvm/Transforms/Utils/BasicBlockUtils.h b/include/llvm/Transforms/Utils/BasicBlockUtils.h index 281437150f..5279e9620f 100644 --- a/include/llvm/Transforms/Utils/BasicBlockUtils.h +++ b/include/llvm/Transforms/Utils/BasicBlockUtils.h @@ -102,10 +102,11 @@ void FindFunctionBackedges(const Function &F, // void RemoveSuccessor(TerminatorInst *TI, unsigned SuccNum); -/// SuccessorNumber - Search for the specified successor of basic block BB and -/// return its position in the terminator instruction's list of successors. -/// It is an error to call this with a block that is not a successor. -unsigned SuccessorNumber(BasicBlock *BB, BasicBlock *Succ); +/// GetSuccessorNumber - Search for the specified successor of basic block BB +/// and return its position in the terminator instruction's list of +/// successors. It is an error to call this with a block that is not a +/// successor. +unsigned GetSuccessorNumber(BasicBlock *BB, BasicBlock *Succ); /// isCriticalEdge - Return true if the specified edge is a critical edge. /// Critical edges are edges from a block with multiple successors to a block diff --git a/lib/Transforms/Scalar/GVN.cpp b/lib/Transforms/Scalar/GVN.cpp index c144e16f48..0f01bc1266 100644 --- a/lib/Transforms/Scalar/GVN.cpp +++ b/lib/Transforms/Scalar/GVN.cpp @@ -1594,7 +1594,7 @@ bool GVN::processNonLocalLoad(LoadInst *LI, << Pred->getName() << "': " << *LI << '\n'); return false; } - unsigned SuccNum = SuccessorNumber(Pred, LoadBB); + unsigned SuccNum = GetSuccessorNumber(Pred, LoadBB); toSplit.push_back(std::make_pair(Pred->getTerminator(), SuccNum)); return false; } @@ -2151,7 +2151,7 @@ bool GVN::performPRE(Function &F) { // We can't do PRE safely on a critical edge, so instead we schedule // the edge to be split and perform the PRE the next time we iterate // on the function. - unsigned SuccNum = SuccessorNumber(PREPred, CurrentBlock); + unsigned SuccNum = GetSuccessorNumber(PREPred, CurrentBlock); if (isCriticalEdge(PREPred->getTerminator(), SuccNum)) { toSplit.push_back(std::make_pair(PREPred->getTerminator(), SuccNum)); continue; diff --git a/lib/Transforms/Utils/BasicBlockUtils.cpp b/lib/Transforms/Utils/BasicBlockUtils.cpp index 60185d2687..1f62dabb20 100644 --- a/lib/Transforms/Utils/BasicBlockUtils.cpp +++ b/lib/Transforms/Utils/BasicBlockUtils.cpp @@ -274,10 +274,11 @@ void llvm::RemoveSuccessor(TerminatorInst *TI, unsigned SuccNum) { ReplaceInstWithInst(TI, NewTI); } -/// SuccessorNumber - Search for the specified successor of basic block BB and -/// return its position in the terminator instruction's list of successors. -/// It is an error to call this with a block that is not a successor. -unsigned llvm::SuccessorNumber(BasicBlock *BB, BasicBlock *Succ) { +/// GetSuccessorNumber - Search for the specified successor of basic block BB +/// and return its position in the terminator instruction's list of +/// successors. It is an error to call this with a block that is not a +/// successor. +unsigned llvm::GetSuccessorNumber(BasicBlock *BB, BasicBlock *Succ) { TerminatorInst *Term = BB->getTerminator(); #ifndef NDEBUG unsigned e = Term->getNumSuccessors(); @@ -293,7 +294,7 @@ unsigned llvm::SuccessorNumber(BasicBlock *BB, BasicBlock *Succ) { /// SplitEdge - Split the edge connecting specified block. Pass P must /// not be NULL. BasicBlock *llvm::SplitEdge(BasicBlock *BB, BasicBlock *Succ, Pass *P) { - unsigned SuccNum = SuccessorNumber(BB, Succ); + unsigned SuccNum = GetSuccessorNumber(BB, Succ); // If this is a critical edge, let SplitCriticalEdge do it. TerminatorInst *LatchTerm = BB->getTerminator(); |