Author: Kazu Hirata Date: 2020-12-13T09:48:47-08:00 New Revision: 5891ad4e222f510e532ba2ce6cd56919986d9cb1
URL: https://github.com/llvm/llvm-project/commit/5891ad4e222f510e532ba2ce6cd56919986d9cb1 DIFF: https://github.com/llvm/llvm-project/commit/5891ad4e222f510e532ba2ce6cd56919986d9cb1.diff LOG: [Transforms] Use llvm::erase_value (NFC) Added: Modified: llvm/lib/Transforms/Scalar/LoopUnswitch.cpp llvm/lib/Transforms/Utils/LoopUnroll.cpp llvm/lib/Transforms/Utils/SimplifyCFG.cpp llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp Removed: ################################################################################ diff --git a/llvm/lib/Transforms/Scalar/LoopUnswitch.cpp b/llvm/lib/Transforms/Scalar/LoopUnswitch.cpp index 00b242c16f38..50792d713b41 100644 --- a/llvm/lib/Transforms/Scalar/LoopUnswitch.cpp +++ b/llvm/lib/Transforms/Scalar/LoopUnswitch.cpp @@ -1386,9 +1386,7 @@ void LoopUnswitch::unswitchNontrivialCondition(Value *LIC, Constant *Val, /// Remove all instances of I from the worklist vector specified. static void removeFromWorklist(Instruction *I, std::vector<Instruction *> &Worklist) { - - Worklist.erase(std::remove(Worklist.begin(), Worklist.end(), I), - Worklist.end()); + llvm::erase_value(Worklist, I); } /// When we find that I really equals V, remove I from the diff --git a/llvm/lib/Transforms/Utils/LoopUnroll.cpp b/llvm/lib/Transforms/Utils/LoopUnroll.cpp index 7bea696a853a..4d5d03528633 100644 --- a/llvm/lib/Transforms/Utils/LoopUnroll.cpp +++ b/llvm/lib/Transforms/Utils/LoopUnroll.cpp @@ -865,9 +865,7 @@ LoopUnrollResult llvm::UnrollLoop(Loop *L, UnrollLoopOptions ULO, LoopInfo *LI, if (MergeBlockIntoPredecessor(Dest, &DTU, LI)) { // Dest has been folded into Fold. Update our worklists accordingly. std::replace(Latches.begin(), Latches.end(), Dest, Fold); - UnrolledLoopBlocks.erase(std::remove(UnrolledLoopBlocks.begin(), - UnrolledLoopBlocks.end(), Dest), - UnrolledLoopBlocks.end()); + llvm::erase_value(UnrolledLoopBlocks, Dest); } } } diff --git a/llvm/lib/Transforms/Utils/SimplifyCFG.cpp b/llvm/lib/Transforms/Utils/SimplifyCFG.cpp index 073a43faadd9..f2b7ffd67057 100644 --- a/llvm/lib/Transforms/Utils/SimplifyCFG.cpp +++ b/llvm/lib/Transforms/Utils/SimplifyCFG.cpp @@ -791,7 +791,7 @@ BasicBlock *SimplifyCFGOpt::GetValueEqualityComparisonCases( static void EliminateBlockCases(BasicBlock *BB, std::vector<ValueEqualityComparisonCase> &Cases) { - Cases.erase(std::remove(Cases.begin(), Cases.end(), BB), Cases.end()); + llvm::erase_value(Cases, BB); } /// Return true if there are any keys in C1 that exist in C2 as well. diff --git a/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp b/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp index dc35f5c3df3d..c5ba3709f6b1 100644 --- a/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp +++ b/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp @@ -7398,9 +7398,8 @@ static bool findBuildAggregate(Instruction *LastInsertInst, if (findBuildAggregate_rec(LastInsertInst, TTI, BuildVectorOpds, InsertElts, 0)) { - llvm::erase_if(BuildVectorOpds, - [](const Value *V) { return V == nullptr; }); - llvm::erase_if(InsertElts, [](const Value *V) { return V == nullptr; }); + llvm::erase_value(BuildVectorOpds, nullptr); + llvm::erase_value(InsertElts, nullptr); if (BuildVectorOpds.size() >= 2) return true; } _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
