Author: Kazu Hirata Date: 2021-01-09T09:24:58-08:00 New Revision: 4d92ab1669a4a74219c655e00c6de6ea03b16fe8
URL: https://github.com/llvm/llvm-project/commit/4d92ab1669a4a74219c655e00c6de6ea03b16fe8 DIFF: https://github.com/llvm/llvm-project/commit/4d92ab1669a4a74219c655e00c6de6ea03b16fe8.diff LOG: [Transforms] Use llvm::find_if (NFC) Added: Modified: llvm/lib/Transforms/Scalar/GVNHoist.cpp llvm/lib/Transforms/Scalar/LICM.cpp llvm/lib/Transforms/Scalar/MergeICmps.cpp Removed: ################################################################################ diff --git a/llvm/lib/Transforms/Scalar/GVNHoist.cpp b/llvm/lib/Transforms/Scalar/GVNHoist.cpp index 8478521952b15..e2b40942f300f 100644 --- a/llvm/lib/Transforms/Scalar/GVNHoist.cpp +++ b/llvm/lib/Transforms/Scalar/GVNHoist.cpp @@ -888,8 +888,7 @@ void GVNHoist::findHoistableCandidates(OutValuesType &CHIBBs, auto TI = BB->getTerminator(); auto B = CHIs.begin(); // [PreIt, PHIIt) form a range of CHIs which have identical VNs. - auto PHIIt = std::find_if(CHIs.begin(), CHIs.end(), - [B](CHIArg &A) { return A != *B; }); + auto PHIIt = llvm::find_if(CHIs, [B](CHIArg &A) { return A != *B; }); auto PrevIt = CHIs.begin(); while (PrevIt != PHIIt) { // Collect values which satisfy safety checks. diff --git a/llvm/lib/Transforms/Scalar/LICM.cpp b/llvm/lib/Transforms/Scalar/LICM.cpp index 1b14bc972a9ea..c26d588d9d458 100644 --- a/llvm/lib/Transforms/Scalar/LICM.cpp +++ b/llvm/lib/Transforms/Scalar/LICM.cpp @@ -624,7 +624,7 @@ class ControlFlowHoister { else if (!TrueDestSucc.empty()) { Function *F = TrueDest->getParent(); auto IsSucc = [&](BasicBlock &BB) { return TrueDestSucc.count(&BB); }; - auto It = std::find_if(F->begin(), F->end(), IsSucc); + auto It = llvm::find_if(*F, IsSucc); assert(It != F->end() && "Could not find successor in function"); CommonSucc = &*It; } @@ -692,8 +692,7 @@ class ControlFlowHoister { return BB != Pair.second && (Pair.first->getSuccessor(0) == BB || Pair.first->getSuccessor(1) == BB); }; - auto It = std::find_if(HoistableBranches.begin(), HoistableBranches.end(), - HasBBAsSuccessor); + auto It = llvm::find_if(HoistableBranches, HasBBAsSuccessor); // If not involved in a pending branch, hoist to preheader BasicBlock *InitialPreheader = CurLoop->getLoopPreheader(); diff --git a/llvm/lib/Transforms/Scalar/MergeICmps.cpp b/llvm/lib/Transforms/Scalar/MergeICmps.cpp index 1559e7a41a7cb..7f8b75ac88067 100644 --- a/llvm/lib/Transforms/Scalar/MergeICmps.cpp +++ b/llvm/lib/Transforms/Scalar/MergeICmps.cpp @@ -628,9 +628,8 @@ static BasicBlock *mergeComparisons(ArrayRef<BCECmpBlock> Comparisons, // If there is one block that requires splitting, we do it now, i.e. // just before we know we will collapse the chain. The instructions // can be executed before any of the instructions in the chain. - const auto ToSplit = - std::find_if(Comparisons.begin(), Comparisons.end(), - [](const BCECmpBlock &B) { return B.RequireSplit; }); + const auto ToSplit = llvm::find_if( + Comparisons, [](const BCECmpBlock &B) { return B.RequireSplit; }); if (ToSplit != Comparisons.end()) { LLVM_DEBUG(dbgs() << "Splitting non_BCE work to header\n"); ToSplit->split(BB, AA); _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
