summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerguei Katkov <serguei.katkov@azul.com>2019-07-09 04:20:43 +0000
committerSerguei Katkov <serguei.katkov@azul.com>2019-07-09 04:20:43 +0000
commitc6caddb73d421538b0df41a4c19564c166384ffc (patch)
tree9f0b7357957af331e7b49ea06fef4141e3036a5f
parente085b40e9c4e5e4ebfbd0f98da17b77dec908bf7 (diff)
downloadbcm5719-llvm-c6caddb73d421538b0df41a4c19564c166384ffc.tar.gz
bcm5719-llvm-c6caddb73d421538b0df41a4c19564c166384ffc.zip
[LoopInfo] Update getExitEdges to accept vector of pairs for non const BasicBlock
D63921 requires getExitEdges fills a vector of Edge pairs where BasicBlocks are not constant. The rest Loop API mostly returns non-const BasicBlocks, so to be more consistent with other Loop API getExitEdges is modified to return non-const BasicBlocks as well. This is an alternative solution to D64060. Reviewers: reames, fhahn Reviewed By: reames, fhahn Subscribers: hiraditya, llvm-commits Differential Revision: https://reviews.llvm.org/D64309 llvm-svn: 365437
-rw-r--r--llvm/include/llvm/Analysis/LoopInfo.h2
-rw-r--r--llvm/lib/Transforms/Scalar/LoopPredication.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/llvm/include/llvm/Analysis/LoopInfo.h b/llvm/include/llvm/Analysis/LoopInfo.h
index 572864925bc..98b31295ada 100644
--- a/llvm/include/llvm/Analysis/LoopInfo.h
+++ b/llvm/include/llvm/Analysis/LoopInfo.h
@@ -279,7 +279,7 @@ public:
BlockT *getUniqueExitBlock() const;
/// Edge type.
- typedef std::pair<const BlockT *, const BlockT *> Edge;
+ typedef std::pair<BlockT *, BlockT *> Edge;
/// Return all pairs of (_inside_block_,_outside_block_).
void getExitEdges(SmallVectorImpl<Edge> &ExitEdges) const;
diff --git a/llvm/lib/Transforms/Scalar/LoopPredication.cpp b/llvm/lib/Transforms/Scalar/LoopPredication.cpp
index a14c690d5c4..507a1e251ca 100644
--- a/llvm/lib/Transforms/Scalar/LoopPredication.cpp
+++ b/llvm/lib/Transforms/Scalar/LoopPredication.cpp
@@ -903,7 +903,7 @@ bool LoopPredication::isLoopProfitableToPredicate() {
if (SkipProfitabilityChecks || !BPI)
return true;
- SmallVector<std::pair<const BasicBlock *, const BasicBlock *>, 8> ExitEdges;
+ SmallVector<std::pair<BasicBlock *, BasicBlock *>, 8> ExitEdges;
L->getExitEdges(ExitEdges);
// If there is only one exiting edge in the loop, it is always profitable to
// predicate the loop.
OpenPOWER on IntegriCloud