diff options
author | Kazu Hirata <kazu@google.com> | 2021-10-24 17:35:33 -0700 |
---|---|---|
committer | Kazu Hirata <kazu@google.com> | 2021-10-24 17:35:33 -0700 |
commit | 4bd46501c394ce221d34b60155f48ebbf6b6897d (patch) | |
tree | 79000039fd89e30325195605fa9387416d82880f /clang/lib | |
parent | 19d3bc1e67b0b651e79bd31a1364c4c9dabdfdd3 (diff) | |
download | llvm-4bd46501c394ce221d34b60155f48ebbf6b6897d.zip llvm-4bd46501c394ce221d34b60155f48ebbf6b6897d.tar.gz llvm-4bd46501c394ce221d34b60155f48ebbf6b6897d.tar.bz2 |
Use llvm::any_of and llvm::none_of (NFC)
Diffstat (limited to 'clang/lib')
-rw-r--r-- | clang/lib/Analysis/CFG.cpp | 2 | ||||
-rw-r--r-- | clang/lib/Analysis/ThreadSafety.cpp | 8 | ||||
-rw-r--r-- | clang/lib/Basic/Targets/AVR.cpp | 6 | ||||
-rw-r--r-- | clang/lib/CodeGen/CGGPUBuiltin.cpp | 2 | ||||
-rw-r--r-- | clang/lib/CodeGen/CoverageMappingGen.cpp | 12 | ||||
-rw-r--r-- | clang/lib/Driver/ToolChains/Clang.cpp | 7 | ||||
-rw-r--r-- | clang/lib/Format/UnwrappedLineParser.cpp | 7 | ||||
-rw-r--r-- | clang/lib/Parse/ParseExprCXX.cpp | 4 | ||||
-rw-r--r-- | clang/lib/Sema/AnalysisBasedWarnings.cpp | 2 | ||||
-rw-r--r-- | clang/lib/Sema/SemaDeclCXX.cpp | 2 | ||||
-rw-r--r-- | clang/lib/Sema/SemaTemplateVariadic.cpp | 7 |
11 files changed, 25 insertions, 34 deletions
diff --git a/clang/lib/Analysis/CFG.cpp b/clang/lib/Analysis/CFG.cpp index 69b745c..8a3051a 100644 --- a/clang/lib/Analysis/CFG.cpp +++ b/clang/lib/Analysis/CFG.cpp @@ -5912,7 +5912,7 @@ static bool isImmediateSinkBlock(const CFGBlock *Blk) { // at least for now, but once we have better support for exceptions, // we'd need to carefully handle the case when the throw is being // immediately caught. - if (std::any_of(Blk->begin(), Blk->end(), [](const CFGElement &Elm) { + if (llvm::any_of(*Blk, [](const CFGElement &Elm) { if (Optional<CFGStmt> StmtElm = Elm.getAs<CFGStmt>()) if (isa<CXXThrowExpr>(StmtElm->getStmt())) return true; diff --git a/clang/lib/Analysis/ThreadSafety.cpp b/clang/lib/Analysis/ThreadSafety.cpp index d6bb8cf..b196ffa 100644 --- a/clang/lib/Analysis/ThreadSafety.cpp +++ b/clang/lib/Analysis/ThreadSafety.cpp @@ -86,11 +86,9 @@ class CapExprSet : public SmallVector<CapabilityExpr, 4> { public: /// Push M onto list, but discard duplicates. void push_back_nodup(const CapabilityExpr &CapE) { - iterator It = std::find_if(begin(), end(), - [=](const CapabilityExpr &CapE2) { - return CapE.equals(CapE2); - }); - if (It == end()) + if (llvm::none_of(*this, [=](const CapabilityExpr &CapE2) { + return CapE.equals(CapE2); + })) push_back(CapE); } }; diff --git a/clang/lib/Basic/Targets/AVR.cpp b/clang/lib/Basic/Targets/AVR.cpp index 38ce613..50b0fc0 100644 --- a/clang/lib/Basic/Targets/AVR.cpp +++ b/clang/lib/Basic/Targets/AVR.cpp @@ -313,10 +313,8 @@ static constexpr llvm::StringLiteral ValidFamilyNames[] = { bool AVRTargetInfo::isValidCPUName(StringRef Name) const { bool IsFamily = llvm::is_contained(ValidFamilyNames, Name); - bool IsMCU = - llvm::find_if(AVRMcus, [&](const MCUInfo &Info) { - return Info.Name == Name; - }) != std::end(AVRMcus); + bool IsMCU = llvm::any_of( + AVRMcus, [&](const MCUInfo &Info) { return Info.Name == Name; }); return IsFamily || IsMCU; } diff --git a/clang/lib/CodeGen/CGGPUBuiltin.cpp b/clang/lib/CodeGen/CGGPUBuiltin.cpp index f860623..afbebd0 100644 --- a/clang/lib/CodeGen/CGGPUBuiltin.cpp +++ b/clang/lib/CodeGen/CGGPUBuiltin.cpp @@ -83,7 +83,7 @@ CodeGenFunction::EmitNVPTXDevicePrintfCallExpr(const CallExpr *E, /* ParamsToSkip = */ 0); // We don't know how to emit non-scalar varargs. - if (std::any_of(Args.begin() + 1, Args.end(), [&](const CallArg &A) { + if (llvm::any_of(llvm::drop_begin(Args), [&](const CallArg &A) { return !A.getRValue(*this).isScalar(); })) { CGM.ErrorUnsupported(E, "non-scalar arg to printf"); diff --git a/clang/lib/CodeGen/CoverageMappingGen.cpp b/clang/lib/CodeGen/CoverageMappingGen.cpp index 8a11da6..2d11495 100644 --- a/clang/lib/CodeGen/CoverageMappingGen.cpp +++ b/clang/lib/CodeGen/CoverageMappingGen.cpp @@ -751,13 +751,11 @@ struct CounterCoverageMappingBuilder /// is already added to \c SourceRegions. bool isRegionAlreadyAdded(SourceLocation StartLoc, SourceLocation EndLoc, bool isBranch = false) { - return SourceRegions.rend() != - std::find_if(SourceRegions.rbegin(), SourceRegions.rend(), - [&](const SourceMappingRegion &Region) { - return Region.getBeginLoc() == StartLoc && - Region.getEndLoc() == EndLoc && - Region.isBranch() == isBranch; - }); + return llvm::any_of( + llvm::reverse(SourceRegions), [&](const SourceMappingRegion &Region) { + return Region.getBeginLoc() == StartLoc && + Region.getEndLoc() == EndLoc && Region.isBranch() == isBranch; + }); } /// Adjust the most recently visited location to \c EndLoc. diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp index d5b5e3b..c418012 100644 --- a/clang/lib/Driver/ToolChains/Clang.cpp +++ b/clang/lib/Driver/ToolChains/Clang.cpp @@ -4691,10 +4691,9 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA, if (Args.hasFlag(options::OPT_fdiscard_value_names, options::OPT_fno_discard_value_names, !IsAssertBuild)) { if (Args.hasArg(options::OPT_fdiscard_value_names) && - (std::any_of(Inputs.begin(), Inputs.end(), - [](const clang::driver::InputInfo &II) { - return types::isLLVMIR(II.getType()); - }))) { + llvm::any_of(Inputs, [](const clang::driver::InputInfo &II) { + return types::isLLVMIR(II.getType()); + })) { D.Diag(diag::warn_ignoring_fdiscard_for_bitcode); } CmdArgs.push_back("-discard-value-names"); diff --git a/clang/lib/Format/UnwrappedLineParser.cpp b/clang/lib/Format/UnwrappedLineParser.cpp index ad4818a..ef1785b 100644 --- a/clang/lib/Format/UnwrappedLineParser.cpp +++ b/clang/lib/Format/UnwrappedLineParser.cpp @@ -1075,10 +1075,9 @@ void UnwrappedLineParser::readTokenWithJavaScriptASI() { if (PreviousMustBeValue || Previous->is(tok::r_paren)) { // If the line contains an '@' sign, the previous token might be an // annotation, which can precede another identifier/value. - bool HasAt = std::find_if(Line->Tokens.begin(), Line->Tokens.end(), - [](UnwrappedLineNode &LineNode) { - return LineNode.Tok->is(tok::at); - }) != Line->Tokens.end(); + bool HasAt = llvm::any_of(Line->Tokens, [](UnwrappedLineNode &LineNode) { + return LineNode.Tok->is(tok::at); + }); if (HasAt) return; } diff --git a/clang/lib/Parse/ParseExprCXX.cpp b/clang/lib/Parse/ParseExprCXX.cpp index 4bdb739..4e5c0ac 100644 --- a/clang/lib/Parse/ParseExprCXX.cpp +++ b/clang/lib/Parse/ParseExprCXX.cpp @@ -1068,8 +1068,8 @@ bool Parser::ParseLambdaIntroducer(LambdaIntroducer &Intro, // Ensure that any ellipsis was in the right place. SourceLocation EllipsisLoc; - if (std::any_of(std::begin(EllipsisLocs), std::end(EllipsisLocs), - [](SourceLocation Loc) { return Loc.isValid(); })) { + if (llvm::any_of(EllipsisLocs, + [](SourceLocation Loc) { return Loc.isValid(); })) { // The '...' should appear before the identifier in an init-capture, and // after the identifier otherwise. bool InitCapture = InitKind != LambdaCaptureInitKind::NoInit; diff --git a/clang/lib/Sema/AnalysisBasedWarnings.cpp b/clang/lib/Sema/AnalysisBasedWarnings.cpp index e28203e..796590c 100644 --- a/clang/lib/Sema/AnalysisBasedWarnings.cpp +++ b/clang/lib/Sema/AnalysisBasedWarnings.cpp @@ -1634,7 +1634,7 @@ public: private: static bool hasAlwaysUninitializedUse(const UsesVec* vec) { - return std::any_of(vec->begin(), vec->end(), [](const UninitUse &U) { + return llvm::any_of(*vec, [](const UninitUse &U) { return U.getKind() == UninitUse::Always || U.getKind() == UninitUse::AfterCall || U.getKind() == UninitUse::AfterDecl; diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp index 03f7a95..ea7715b 100644 --- a/clang/lib/Sema/SemaDeclCXX.cpp +++ b/clang/lib/Sema/SemaDeclCXX.cpp @@ -436,7 +436,7 @@ void Sema::CheckExtraCXXDefaultArguments(Declarator &D) { } static bool functionDeclHasDefaultArgument(const FunctionDecl *FD) { - return std::any_of(FD->param_begin(), FD->param_end(), [](ParmVarDecl *P) { + return llvm::any_of(FD->parameters(), [](ParmVarDecl *P) { return P->hasDefaultArg() && !P->hasInheritedDefaultArg(); }); } diff --git a/clang/lib/Sema/SemaTemplateVariadic.cpp b/clang/lib/Sema/SemaTemplateVariadic.cpp index bda6be1..c0bb310 100644 --- a/clang/lib/Sema/SemaTemplateVariadic.cpp +++ b/clang/lib/Sema/SemaTemplateVariadic.cpp @@ -308,8 +308,7 @@ Sema::DiagnoseUnexpandedParameterPacks(SourceLocation Loc, } return declaresSameEntity(Pack.first.get<NamedDecl *>(), LocalPack); }; - if (std::find_if(LSI->LocalPacks.begin(), LSI->LocalPacks.end(), - DeclaresThisPack) != LSI->LocalPacks.end()) + if (llvm::any_of(LSI->LocalPacks, DeclaresThisPack)) LambdaParamPackReferences.push_back(Pack); } @@ -328,8 +327,8 @@ Sema::DiagnoseUnexpandedParameterPacks(SourceLocation Loc, bool EnclosingStmtExpr = false; for (unsigned N = FunctionScopes.size(); N; --N) { sema::FunctionScopeInfo *Func = FunctionScopes[N-1]; - if (std::any_of( - Func->CompoundScopes.begin(), Func->CompoundScopes.end(), + if (llvm::any_of( + Func->CompoundScopes, [](sema::CompoundScopeInfo &CSI) { return CSI.IsStmtExpr; })) { EnclosingStmtExpr = true; break; |