Author: Kazu Hirata Date: 2021-10-12T09:19:49-07:00 New Revision: 57b40b5f34383634949d1639e64a5c2acd0dc5f6
URL: https://github.com/llvm/llvm-project/commit/57b40b5f34383634949d1639e64a5c2acd0dc5f6 DIFF: https://github.com/llvm/llvm-project/commit/57b40b5f34383634949d1639e64a5c2acd0dc5f6.diff LOG: [AST, CodeGen, Driver] Use llvm::is_contained (NFC) Added: Modified: clang/lib/AST/CXXInheritance.cpp clang/lib/AST/DeclCXX.cpp clang/lib/AST/ParentMapContext.cpp clang/lib/AST/RecordLayoutBuilder.cpp clang/lib/AST/Type.cpp clang/lib/AST/VTableBuilder.cpp clang/lib/CodeGen/CGDebugInfo.cpp clang/lib/CodeGen/CGOpenMPRuntime.cpp clang/lib/Driver/ToolChains/Clang.cpp clang/lib/Driver/ToolChains/Hexagon.cpp Removed: ################################################################################ diff --git a/clang/lib/AST/CXXInheritance.cpp b/clang/lib/AST/CXXInheritance.cpp index 9027fa7a7515..cc787eddad2f 100644 --- a/clang/lib/AST/CXXInheritance.cpp +++ b/clang/lib/AST/CXXInheritance.cpp @@ -465,7 +465,7 @@ void OverridingMethods::add(unsigned OverriddenSubobject, UniqueVirtualMethod Overriding) { SmallVectorImpl<UniqueVirtualMethod> &SubobjectOverrides = Overrides[OverriddenSubobject]; - if (llvm::find(SubobjectOverrides, Overriding) == SubobjectOverrides.end()) + if (!llvm::is_contained(SubobjectOverrides, Overriding)) SubobjectOverrides.push_back(Overriding); } diff --git a/clang/lib/AST/DeclCXX.cpp b/clang/lib/AST/DeclCXX.cpp index 119450480c1f..016d28879227 100644 --- a/clang/lib/AST/DeclCXX.cpp +++ b/clang/lib/AST/DeclCXX.cpp @@ -1776,7 +1776,7 @@ void CXXRecordDecl::removeConversion(const NamedDecl *ConvDecl) { for (unsigned I = 0, E = Convs.size(); I != E; ++I) { if (Convs[I].getDecl() == ConvDecl) { Convs.erase(I); - assert(llvm::find(Convs, ConvDecl) == Convs.end() && + assert(!llvm::is_contained(Convs, ConvDecl) && "conversion was found multiple times in unresolved set"); return; } @@ -3014,8 +3014,7 @@ CXXRecordDecl *ConstructorUsingShadowDecl::getNominatedBaseClass() const { void BaseUsingDecl::anchor() {} void BaseUsingDecl::addShadowDecl(UsingShadowDecl *S) { - assert(std::find(shadow_begin(), shadow_end(), S) == shadow_end() && - "declaration already in set"); + assert(!llvm::is_contained(shadows(), S) && "declaration already in set"); assert(S->getIntroducer() == this); if (FirstUsingShadow.getPointer()) @@ -3024,8 +3023,7 @@ void BaseUsingDecl::addShadowDecl(UsingShadowDecl *S) { } void BaseUsingDecl::removeShadowDecl(UsingShadowDecl *S) { - assert(std::find(shadow_begin(), shadow_end(), S) != shadow_end() && - "declaration not in set"); + assert(llvm::is_contained(shadows(), S) && "declaration not in set"); assert(S->getIntroducer() == this); // Remove S from the shadow decl chain. This is O(n) but hopefully rare. diff --git a/clang/lib/AST/ParentMapContext.cpp b/clang/lib/AST/ParentMapContext.cpp index 847e14c0c1e5..d216be5b59e8 100644 --- a/clang/lib/AST/ParentMapContext.cpp +++ b/clang/lib/AST/ParentMapContext.cpp @@ -389,11 +389,10 @@ class ParentMapContext::ParentMap::ASTVisitor auto *Vector = NodeOrVector.template get<ParentVector *>(); // Skip duplicates for types that have memoization data. // We must check that the type has memoization data before calling - // std::find() because DynTypedNode::operator== can't compare all + // llvm::is_contained() because DynTypedNode::operator== can't compare all // types. bool Found = ParentStack.back().getMemoizationData() && - std::find(Vector->begin(), Vector->end(), - ParentStack.back()) != Vector->end(); + llvm::is_contained(*Vector, ParentStack.back()); if (!Found) Vector->push_back(ParentStack.back()); } diff --git a/clang/lib/AST/RecordLayoutBuilder.cpp b/clang/lib/AST/RecordLayoutBuilder.cpp index d17d1e26742c..35c0e92038a7 100644 --- a/clang/lib/AST/RecordLayoutBuilder.cpp +++ b/clang/lib/AST/RecordLayoutBuilder.cpp @@ -240,7 +240,7 @@ EmptySubobjectMap::CanPlaceSubobjectAtOffset(const CXXRecordDecl *RD, return true; const ClassVectorTy &Classes = I->second; - if (llvm::find(Classes, RD) == Classes.end()) + if (!llvm::is_contained(Classes, RD)) return true; // There is already an empty class of the same type at this offset. diff --git a/clang/lib/AST/Type.cpp b/clang/lib/AST/Type.cpp index de57b40b221a..58cae0378a98 100644 --- a/clang/lib/AST/Type.cpp +++ b/clang/lib/AST/Type.cpp @@ -3507,7 +3507,7 @@ bool RecordType::hasConstFields() const { return true; 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/AST/VTableBuilder.cpp b/clang/lib/AST/VTableBuilder.cpp index 38d6fc28e098..2c3aa36af195 100644 --- a/clang/lib/AST/VTableBuilder.cpp +++ b/clang/lib/AST/VTableBuilder.cpp @@ -1070,7 +1070,7 @@ void ItaniumVTableBuilder::AddThunk(const CXXMethodDecl *MD, SmallVectorImpl<ThunkInfo> &ThunksVector = Thunks[MD]; // Check if we have this thunk already. - if (llvm::find(ThunksVector, Thunk) != ThunksVector.end()) + if (llvm::is_contained(ThunksVector, Thunk)) return; ThunksVector.push_back(Thunk); @@ -2498,7 +2498,7 @@ class VFTableBuilder { SmallVector<ThunkInfo, 1> &ThunksVector = Thunks[MD]; // Check if we have this thunk already. - if (llvm::find(ThunksVector, Thunk) != ThunksVector.end()) + if (llvm::is_contained(ThunksVector, Thunk)) return; ThunksVector.push_back(Thunk); diff --git a/clang/lib/CodeGen/CGDebugInfo.cpp b/clang/lib/CodeGen/CGDebugInfo.cpp index dcc838562e82..132b5c28e8f5 100644 --- a/clang/lib/CodeGen/CGDebugInfo.cpp +++ b/clang/lib/CodeGen/CGDebugInfo.cpp @@ -4449,8 +4449,7 @@ llvm::DILocalVariable *CGDebugInfo::EmitDeclare(const VarDecl *VD, // Use DW_OP_deref to tell the debugger to load the pointer and treat it as // the address of the variable. if (UsePointerValue) { - assert(std::find(Expr.begin(), Expr.end(), llvm::dwarf::DW_OP_deref) == - Expr.end() && + assert(!llvm::is_contained(Expr, llvm::dwarf::DW_OP_deref) && "Debug info already contains DW_OP_deref."); Expr.push_back(llvm::dwarf::DW_OP_deref); } diff --git a/clang/lib/CodeGen/CGOpenMPRuntime.cpp b/clang/lib/CodeGen/CGOpenMPRuntime.cpp index 19a51b537021..ce9262704312 100644 --- a/clang/lib/CodeGen/CGOpenMPRuntime.cpp +++ b/clang/lib/CodeGen/CGOpenMPRuntime.cpp @@ -7596,19 +7596,14 @@ class MappableExprsHandler { Bits |= OMP_MAP_PTR_AND_OBJ; if (AddIsTargetParamFlag) Bits |= OMP_MAP_TARGET_PARAM; - if (llvm::find(MapModifiers, OMPC_MAP_MODIFIER_always) - != MapModifiers.end()) + if (llvm::is_contained(MapModifiers, OMPC_MAP_MODIFIER_always)) Bits |= OMP_MAP_ALWAYS; - if (llvm::find(MapModifiers, OMPC_MAP_MODIFIER_close) - != MapModifiers.end()) + if (llvm::is_contained(MapModifiers, OMPC_MAP_MODIFIER_close)) Bits |= OMP_MAP_CLOSE; - if (llvm::find(MapModifiers, OMPC_MAP_MODIFIER_present) != - MapModifiers.end() || - llvm::find(MotionModifiers, OMPC_MOTION_MODIFIER_present) != - MotionModifiers.end()) + if (llvm::is_contained(MapModifiers, OMPC_MAP_MODIFIER_present) || + llvm::is_contained(MotionModifiers, OMPC_MOTION_MODIFIER_present)) Bits |= OMP_MAP_PRESENT; - if (llvm::find(MapModifiers, OMPC_MAP_MODIFIER_ompx_hold) != - MapModifiers.end()) + if (llvm::is_contained(MapModifiers, OMPC_MAP_MODIFIER_ompx_hold)) Bits |= OMP_MAP_OMPX_HOLD; if (IsNonContiguous) Bits |= OMP_MAP_NON_CONTIG; diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp index 7ce6aa289e09..d2c08412d593 100644 --- a/clang/lib/Driver/ToolChains/Clang.cpp +++ b/clang/lib/Driver/ToolChains/Clang.cpp @@ -4592,8 +4592,7 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA, options::OPT_mllvm, }; for (const auto &A : Args) - if (llvm::find(kBitcodeOptionBlacklist, A->getOption().getID()) != - std::end(kBitcodeOptionBlacklist)) + if (llvm::is_contained(kBitcodeOptionBlacklist, A->getOption().getID())) D.Diag(diag::err_drv_unsupported_embed_bitcode) << A->getSpelling(); // Render the CodeGen options that need to be passed. diff --git a/clang/lib/Driver/ToolChains/Hexagon.cpp b/clang/lib/Driver/ToolChains/Hexagon.cpp index 01568e0b2edd..18270818d158 100644 --- a/clang/lib/Driver/ToolChains/Hexagon.cpp +++ b/clang/lib/Driver/ToolChains/Hexagon.cpp @@ -487,7 +487,7 @@ void HexagonToolChain::getHexagonLibraryPaths(const ArgList &Args, std::string TargetDir = getHexagonTargetDir(D.getInstalledDir(), D.PrefixDirs); - if (llvm::find(RootDirs, TargetDir) == RootDirs.end()) + if (!llvm::is_contained(RootDirs, TargetDir)) RootDirs.push_back(TargetDir); bool HasPIC = Args.hasArg(options::OPT_fpic, options::OPT_fPIC); _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
