From 83e6931827e0c0d2a1e61c49d2dff9e7a8906ce8 Mon Sep 17 00:00:00 2001 From: Kazu Hirata Date: Sat, 2 Sep 2023 09:32:46 -0700 Subject: [PATCH] [llvm] Use llvm::is_contained (NFC) --- llvm/lib/Target/Hexagon/HexagonISelDAGToDAGHVX.cpp | 2 +- llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp | 2 +- llvm/lib/Transforms/Utils/SimplifyCFG.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/llvm/lib/Target/Hexagon/HexagonISelDAGToDAGHVX.cpp b/llvm/lib/Target/Hexagon/HexagonISelDAGToDAGHVX.cpp index 14c00cd97f7b71..efb0d405fef2c2 100644 --- a/llvm/lib/Target/Hexagon/HexagonISelDAGToDAGHVX.cpp +++ b/llvm/lib/Target/Hexagon/HexagonISelDAGToDAGHVX.cpp @@ -2341,7 +2341,7 @@ OpRef HvxSelector::perfect(ShuffleMask SM, OpRef Va, ResultStack &Results) { } auto Comps = getPerfectCompletions(SM, LogLen); - if (llvm::any_of(Comps, [](uint32_t P) { return P == 0; })) + if (llvm::is_contained(Comps, 0)) return OpRef::fail(); auto Pick = completeToPerfect(Comps, LogLen); diff --git a/llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp b/llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp index 186a9fee901f85..6af7e9eaa57754 100644 --- a/llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp +++ b/llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp @@ -291,7 +291,7 @@ Instruction *InstCombinerImpl::SimplifyAnyMemSet(AnyMemSetInst *MI) { StoreInst *S = Builder.CreateStore(FillVal, Dest, MI->isVolatile()); S->copyMetadata(*MI, LLVMContext::MD_DIAssignID); for (auto *DAI : at::getAssignmentMarkers(S)) { - if (any_of(DAI->location_ops(), [&](Value *V) { return V == FillC; })) + if (llvm::is_contained(DAI->location_ops(), FillC)) DAI->replaceVariableLocationOp(FillC, FillVal); } diff --git a/llvm/lib/Transforms/Utils/SimplifyCFG.cpp b/llvm/lib/Transforms/Utils/SimplifyCFG.cpp index 7af366b47e9f56..a36a2f534b858e 100644 --- a/llvm/lib/Transforms/Utils/SimplifyCFG.cpp +++ b/llvm/lib/Transforms/Utils/SimplifyCFG.cpp @@ -3018,7 +3018,7 @@ bool SimplifyCFGOpt::SpeculativelyExecuteBB(BranchInst *BI, // store %merge, %x.dest, !DIAssignID !2 // dbg.assign %merge, "x", ..., !2 for (auto *DAI : at::getAssignmentMarkers(SpeculatedStore)) { - if (any_of(DAI->location_ops(), [&](Value *V) { return V == OrigV; })) + if (llvm::is_contained(DAI->location_ops(), OrigV)) DAI->replaceVariableLocationOp(OrigV, S); } }