Author: Kazu Hirata Date: 2021-10-11T11:06:44-07:00 New Revision: d4090482013599b1c246f3553717e2a88d6b24a5
URL: https://github.com/llvm/llvm-project/commit/d4090482013599b1c246f3553717e2a88d6b24a5 DIFF: https://github.com/llvm/llvm-project/commit/d4090482013599b1c246f3553717e2a88d6b24a5.diff LOG: [Sema] Use llvm::is_contained (NFC) Added: Modified: clang/lib/Sema/AnalysisBasedWarnings.cpp clang/lib/Sema/SemaAccess.cpp clang/lib/Sema/SemaDecl.cpp clang/lib/Sema/SemaDeclAttr.cpp clang/lib/Sema/SemaExpr.cpp clang/lib/Sema/SemaInit.cpp clang/lib/Sema/SemaLookup.cpp clang/lib/Sema/SemaOpenMP.cpp clang/lib/Sema/SemaTemplateInstantiate.cpp Removed: ################################################################################ diff --git a/clang/lib/Sema/AnalysisBasedWarnings.cpp b/clang/lib/Sema/AnalysisBasedWarnings.cpp index 99ce143d3559d..30bceb085bb98 100644 --- a/clang/lib/Sema/AnalysisBasedWarnings.cpp +++ b/clang/lib/Sema/AnalysisBasedWarnings.cpp @@ -497,8 +497,7 @@ static ControlFlowKind CheckFallThrough(AnalysisDeclContext &AC) { HasAbnormalEdge = true; continue; } - if (std::find(B.succ_begin(), B.succ_end(), &cfg->getExit()) - == B.succ_end()) { + if (!llvm::is_contained(B.succs(), &cfg->getExit())) { HasAbnormalEdge = true; continue; } diff --git a/clang/lib/Sema/SemaAccess.cpp b/clang/lib/Sema/SemaAccess.cpp index 580305c1110bc..3f7b387ec9250 100644 --- a/clang/lib/Sema/SemaAccess.cpp +++ b/clang/lib/Sema/SemaAccess.cpp @@ -140,7 +140,7 @@ struct EffectiveContext { bool includesClass(const CXXRecordDecl *R) const { R = R->getCanonicalDecl(); - return llvm::find(Records, R) != Records.end(); + return llvm::is_contained(Records, R); } /// Retrieves the innermost "useful" context. Can be null if we're diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp index 48f298f2ce823..1a8d7cc67a8f8 100644 --- a/clang/lib/Sema/SemaDecl.cpp +++ b/clang/lib/Sema/SemaDecl.cpp @@ -2962,8 +2962,7 @@ void Sema::mergeDeclAttributes(NamedDecl *New, Decl *Old, if (const auto *NewAbiTagAttr = New->getAttr<AbiTagAttr>()) { if (const auto *OldAbiTagAttr = Old->getAttr<AbiTagAttr>()) { for (const auto &NewTag : NewAbiTagAttr->tags()) { - if (std::find(OldAbiTagAttr->tags_begin(), OldAbiTagAttr->tags_end(), - NewTag) == OldAbiTagAttr->tags_end()) { + if (!llvm::is_contained(OldAbiTagAttr->tags(), NewTag)) { Diag(NewAbiTagAttr->getLocation(), diag::err_new_abi_tag_on_redeclaration) << NewTag; diff --git a/clang/lib/Sema/SemaDeclAttr.cpp b/clang/lib/Sema/SemaDeclAttr.cpp index cd50818d10638..07e80901e2193 100644 --- a/clang/lib/Sema/SemaDeclAttr.cpp +++ b/clang/lib/Sema/SemaDeclAttr.cpp @@ -1796,7 +1796,7 @@ static void handleOwnershipAttr(Sema &S, Decl *D, const ParsedAttr &AL) { I->getOwnKind() == OwnershipAttr::Returns) { // A returns attribute conflicts with any other returns attribute using // a diff erent index. - if (std::find(I->args_begin(), I->args_end(), Idx) == I->args_end()) { + if (!llvm::is_contained(I->args(), Idx)) { S.Diag(I->getLocation(), diag::err_ownership_returns_index_mismatch) << I->args_begin()->getSourceIndex(); if (I->args_size()) diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp index d72cb43549fb5..dc2455e0afbcd 100644 --- a/clang/lib/Sema/SemaExpr.cpp +++ b/clang/lib/Sema/SemaExpr.cpp @@ -12946,7 +12946,7 @@ static void DiagnoseRecursiveConstFields(Sema &S, const ValueDecl *VD, // Then we append it to the list to check next in order. FieldTy = FieldTy.getCanonicalType(); if (const auto *FieldRecTy = FieldTy->getAs<RecordType>()) { - if (llvm::find(RecordTypeList, FieldRecTy) == RecordTypeList.end()) + if (!llvm::is_contained(RecordTypeList, FieldRecTy)) RecordTypeList.push_back(FieldRecTy); } } diff --git a/clang/lib/Sema/SemaInit.cpp b/clang/lib/Sema/SemaInit.cpp index efbdd187cbe1d..75686e2947041 100644 --- a/clang/lib/Sema/SemaInit.cpp +++ b/clang/lib/Sema/SemaInit.cpp @@ -9915,8 +9915,7 @@ Sema::PerformCopyInitialization(const InitializedEntity &Entity, const bool ShouldTrackCopy = Entity.isParameterKind() && Seq.isConstructorInitialization(); if (ShouldTrackCopy) { - if (llvm::find(CurrentParameterCopyTypes, Entity.getType()) != - CurrentParameterCopyTypes.end()) { + if (llvm::is_contained(CurrentParameterCopyTypes, Entity.getType())) { Seq.SetOverloadFailure( InitializationSequence::FK_ConstructorOverloadFailed, OR_No_Viable_Function); diff --git a/clang/lib/Sema/SemaLookup.cpp b/clang/lib/Sema/SemaLookup.cpp index f0ab50f0acddc..e4e5f57745c61 100644 --- a/clang/lib/Sema/SemaLookup.cpp +++ b/clang/lib/Sema/SemaLookup.cpp @@ -4596,9 +4596,7 @@ void TypoCorrectionConsumer::NamespaceSpecifierSet::addNameSpecifier( dyn_cast_or_null<NamedDecl>(NamespaceDeclChain.back())) { IdentifierInfo *Name = ND->getIdentifier(); bool SameNameSpecifier = false; - if (std::find(CurNameSpecifierIdentifiers.begin(), - CurNameSpecifierIdentifiers.end(), - Name) != CurNameSpecifierIdentifiers.end()) { + if (llvm::is_contained(CurNameSpecifierIdentifiers, Name)) { std::string NewNameSpecifier; llvm::raw_string_ostream SpecifierOStream(NewNameSpecifier); SmallVector<const IdentifierInfo *, 4> NewNameSpecifierIdentifiers; @@ -4607,8 +4605,7 @@ void TypoCorrectionConsumer::NamespaceSpecifierSet::addNameSpecifier( SpecifierOStream.flush(); SameNameSpecifier = NewNameSpecifier == CurNameSpecifier; } - if (SameNameSpecifier || llvm::find(CurContextIdentifiers, Name) != - CurContextIdentifiers.end()) { + if (SameNameSpecifier || llvm::is_contained(CurContextIdentifiers, Name)) { // Rebuild the NestedNameSpecifier as a globally-qualified specifier. NNS = NestedNameSpecifier::GlobalSpecifier(Context); NumSpecifiers = diff --git a/clang/lib/Sema/SemaOpenMP.cpp b/clang/lib/Sema/SemaOpenMP.cpp index 850b6f162d728..b340091e3c2d0 100644 --- a/clang/lib/Sema/SemaOpenMP.cpp +++ b/clang/lib/Sema/SemaOpenMP.cpp @@ -19437,8 +19437,7 @@ static void checkMappableExpressionList( Expr *UnresolvedMapper = nullptr; bool HasHoldModifier = - Modifiers.end() != std::find(Modifiers.begin(), Modifiers.end(), - OMPC_MAP_MODIFIER_ompx_hold); + llvm::is_contained(Modifiers, OMPC_MAP_MODIFIER_ompx_hold); // Keep track of the mappable components and base declarations in this clause. // Each entry in the list is going to have a list of components associated. We @@ -19738,7 +19737,7 @@ OMPClause *Sema::ActOnOpenMPMapClause( unsigned Count = 0; for (unsigned I = 0, E = MapTypeModifiers.size(); I < E; ++I) { if (MapTypeModifiers[I] != OMPC_MAP_MODIFIER_unknown && - llvm::find(Modifiers, MapTypeModifiers[I]) != std::end(Modifiers)) { + llvm::is_contained(Modifiers, MapTypeModifiers[I])) { Diag(MapTypeModifiersLoc[I], diag::err_omp_duplicate_map_type_modifier); continue; } @@ -20727,7 +20726,7 @@ OMPClause *Sema::ActOnOpenMPToClause( unsigned Count = 0; for (unsigned I = 0, E = MotionModifiers.size(); I < E; ++I) { if (MotionModifiers[I] != OMPC_MOTION_MODIFIER_unknown && - llvm::find(Modifiers, MotionModifiers[I]) != std::end(Modifiers)) { + llvm::is_contained(Modifiers, MotionModifiers[I])) { Diag(MotionModifiersLoc[I], diag::err_omp_duplicate_motion_modifier); continue; } @@ -20764,7 +20763,7 @@ OMPClause *Sema::ActOnOpenMPFromClause( unsigned Count = 0; for (unsigned I = 0, E = MotionModifiers.size(); I < E; ++I) { if (MotionModifiers[I] != OMPC_MOTION_MODIFIER_unknown && - llvm::find(Modifiers, MotionModifiers[I]) != std::end(Modifiers)) { + llvm::is_contained(Modifiers, MotionModifiers[I])) { Diag(MotionModifiersLoc[I], diag::err_omp_duplicate_motion_modifier); continue; } diff --git a/clang/lib/Sema/SemaTemplateInstantiate.cpp b/clang/lib/Sema/SemaTemplateInstantiate.cpp index a0f4d0cd8c241..7d4c000e7e904 100644 --- a/clang/lib/Sema/SemaTemplateInstantiate.cpp +++ b/clang/lib/Sema/SemaTemplateInstantiate.cpp @@ -3658,7 +3658,7 @@ void LocalInstantiationScope::MakeInstantiatedLocalArgPack(const Decl *D) { bool LocalInstantiationScope::isLocalPackExpansion(const Decl *D) { for (DeclArgumentPack *Pack : ArgumentPacks) - if (std::find(Pack->begin(), Pack->end(), D) != Pack->end()) + if (llvm::is_contained(*Pack, D)) return true; return false; } _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
