aboutsummaryrefslogtreecommitdiff
path: root/llvm/lib/Transforms/Scalar
diff options
context:
space:
mode:
authorKazu Hirata <kazu@google.com>2020-11-18 20:42:22 -0800
committerKazu Hirata <kazu@google.com>2020-11-18 20:42:22 -0800
commit43c0e4f6657666df335a4bb4dad74f32fcfef607 (patch)
tree3c3a93f409c9725b17bf9773368aae132aab56a5 /llvm/lib/Transforms/Scalar
parentb51e844f7a4ca4a0cb976bd59bf8b5588d6f3be5 (diff)
downloadllvm-project-43c0e4f6657666df335a4bb4dad74f32fcfef607.tar.gz
[Transforms] Use llvm::is_contained (NFC)
Diffstat (limited to 'llvm/lib/Transforms/Scalar')
-rw-r--r--llvm/lib/Transforms/Scalar/GVN.cpp3
-rw-r--r--llvm/lib/Transforms/Scalar/GVNHoist.cpp5
-rw-r--r--llvm/lib/Transforms/Scalar/LoopInterchange.cpp3
3 files changed, 3 insertions, 8 deletions
diff --git a/llvm/lib/Transforms/Scalar/GVN.cpp b/llvm/lib/Transforms/Scalar/GVN.cpp
index ba2a6fc1ef49..32b38fd97f31 100644
--- a/llvm/lib/Transforms/Scalar/GVN.cpp
+++ b/llvm/lib/Transforms/Scalar/GVN.cpp
@@ -2804,8 +2804,7 @@ void GVN::addDeadBlock(BasicBlock *BB) {
if (!DeadBlocks.count(P))
continue;
- if (llvm::any_of(successors(P),
- [B](BasicBlock *Succ) { return Succ == B; }) &&
+ if (llvm::is_contained(successors(P), B) &&
isCriticalEdge(P->getTerminator(), B)) {
if (BasicBlock *S = splitCriticalEdges(P, B))
DeadBlocks.insert(P = S);
diff --git a/llvm/lib/Transforms/Scalar/GVNHoist.cpp b/llvm/lib/Transforms/Scalar/GVNHoist.cpp
index 44b3417d9d45..ea47f2a17969 100644
--- a/llvm/lib/Transforms/Scalar/GVNHoist.cpp
+++ b/llvm/lib/Transforms/Scalar/GVNHoist.cpp
@@ -806,11 +806,8 @@ bool GVNHoist::valueAnticipable(CHIArgs C, Instruction *TI) const {
return false; // Not enough args in this CHI.
for (auto CHI : C) {
- BasicBlock *Dest = CHI.Dest;
// Find if all the edges have values flowing out of BB.
- bool Found = llvm::any_of(
- successors(TI), [Dest](const BasicBlock *BB) { return BB == Dest; });
- if (!Found)
+ if (!llvm::is_contained(successors(TI), CHI.Dest))
return false;
}
return true;
diff --git a/llvm/lib/Transforms/Scalar/LoopInterchange.cpp b/llvm/lib/Transforms/Scalar/LoopInterchange.cpp
index afa4c4dfaa66..81b7c3a8338a 100644
--- a/llvm/lib/Transforms/Scalar/LoopInterchange.cpp
+++ b/llvm/lib/Transforms/Scalar/LoopInterchange.cpp
@@ -701,8 +701,7 @@ bool LoopInterchangeLegality::findInductionAndReductions(
Value *V = followLCSSA(PHI.getIncomingValueForBlock(L->getLoopLatch()));
PHINode *InnerRedPhi = findInnerReductionPhi(InnerLoop, V);
if (!InnerRedPhi ||
- !llvm::any_of(InnerRedPhi->incoming_values(),
- [&PHI](Value *V) { return V == &PHI; })) {
+ !llvm::is_contained(InnerRedPhi->incoming_values(), &PHI)) {
LLVM_DEBUG(
dbgs()
<< "Failed to recognize PHI as an induction or reduction.\n");