Author: Kazu Hirata Date: 2021-10-13T20:41:55-07:00 New Revision: e567f37dabc242cb02fb8b8b288fd05a0aebfb8f
URL: https://github.com/llvm/llvm-project/commit/e567f37dabc242cb02fb8b8b288fd05a0aebfb8f DIFF: https://github.com/llvm/llvm-project/commit/e567f37dabc242cb02fb8b8b288fd05a0aebfb8f.diff LOG: [clang] Use llvm::is_contained (NFC) Added: Modified: clang/lib/ARCMigrate/ARCMT.cpp clang/lib/Edit/EditedSource.cpp clang/lib/Format/QualifierAlignmentFixer.cpp clang/lib/Frontend/CompilerInvocation.cpp clang/lib/Lex/ModuleMap.cpp clang/lib/Lex/PPDirectives.cpp clang/lib/Lex/PPMacroExpansion.cpp clang/lib/Lex/Preprocessor.cpp clang/lib/Parse/ParseTentative.cpp clang/lib/Serialization/ASTReader.cpp clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp clang/lib/StaticAnalyzer/Checkers/MoveChecker.cpp clang/lib/StaticAnalyzer/Checkers/PthreadLockChecker.cpp clang/lib/StaticAnalyzer/Core/BugReporter.cpp clang/lib/StaticAnalyzer/Core/HTMLDiagnostics.cpp clang/tools/libclang/CIndex.cpp clang/tools/libclang/CIndexHigh.cpp Removed: ################################################################################ diff --git a/clang/lib/ARCMigrate/ARCMT.cpp b/clang/lib/ARCMigrate/ARCMT.cpp index 36fbe90e1e3a5..4851c434d7652 100644 --- a/clang/lib/ARCMigrate/ARCMT.cpp +++ b/clang/lib/ARCMigrate/ARCMT.cpp @@ -65,7 +65,7 @@ bool CapturedDiagList::hasDiagnostic(ArrayRef<unsigned> IDs, while (I != List.end()) { FullSourceLoc diagLoc = I->getLocation(); if ((IDs.empty() || // empty means any diagnostic in the range. - llvm::find(IDs, I->getID()) != IDs.end()) && + llvm::is_contained(IDs, I->getID())) && !diagLoc.isBeforeInTranslationUnitThan(range.getBegin()) && (diagLoc == range.getEnd() || diagLoc.isBeforeInTranslationUnitThan(range.getEnd()))) { diff --git a/clang/lib/Edit/EditedSource.cpp b/clang/lib/Edit/EditedSource.cpp index 43da3451aa15a..ee57660b8c72c 100644 --- a/clang/lib/Edit/EditedSource.cpp +++ b/clang/lib/Edit/EditedSource.cpp @@ -60,7 +60,7 @@ void EditedSource::finishedCommit() { MacroArgUse ArgUse; std::tie(ExpLoc, ArgUse) = ExpArg; auto &ArgUses = ExpansionToArgMap[ExpLoc]; - if (llvm::find(ArgUses, ArgUse) == ArgUses.end()) + if (!llvm::is_contained(ArgUses, ArgUse)) ArgUses.push_back(ArgUse); } CurrCommitMacroArgExps.clear(); diff --git a/clang/lib/Format/QualifierAlignmentFixer.cpp b/clang/lib/Format/QualifierAlignmentFixer.cpp index b1a0fd84fa698..c70705a1cd7ff 100644 --- a/clang/lib/Format/QualifierAlignmentFixer.cpp +++ b/clang/lib/Format/QualifierAlignmentFixer.cpp @@ -419,7 +419,7 @@ void QualifierAlignmentFixer::PrepareLeftRightOrdering( // To iterate forward or backward through the order list as qualifier // can push through each other. // The Order list must define the position of "type" to signify - assert(std::find(Order.begin(), Order.end(), "type") != Order.end() && + assert(llvm::is_contained(Order, "type") && "QualifierOrder must contain type"); // Split the Order list by type and reverse the left side. @@ -447,8 +447,7 @@ void QualifierAlignmentFixer::PrepareLeftRightOrdering( bool LeftRightQualifierAlignmentFixer::isQualifierOrType( const FormatToken *Tok, const std::vector<tok::TokenKind> &specifiedTypes) { return Tok && (Tok->isSimpleTypeSpecifier() || Tok->is(tok::kw_auto) || - (std::find(specifiedTypes.begin(), specifiedTypes.end(), - Tok->Tok.getKind()) != specifiedTypes.end())); + llvm::is_contained(specifiedTypes, Tok->Tok.getKind())); } // If a token is an identifier and it's upper case, it could diff --git a/clang/lib/Frontend/CompilerInvocation.cpp b/clang/lib/Frontend/CompilerInvocation.cpp index 34cbb7aab2666..7360e6b40d69a 100644 --- a/clang/lib/Frontend/CompilerInvocation.cpp +++ b/clang/lib/Frontend/CompilerInvocation.cpp @@ -1120,10 +1120,9 @@ static void parseAnalyzerConfigs(AnalyzerOptions &AnOpts, for (const StringRef &CheckerOrPackage : CheckersAndPackages) { if (Diags) { bool IsChecker = CheckerOrPackage.contains('.'); - bool IsValidName = - IsChecker - ? llvm::find(Checkers, CheckerOrPackage) != Checkers.end() - : llvm::find(Packages, CheckerOrPackage) != Packages.end(); + bool IsValidName = IsChecker + ? llvm::is_contained(Checkers, CheckerOrPackage) + : llvm::is_contained(Packages, CheckerOrPackage); if (!IsValidName) Diags->Report(diag::err_unknown_analyzer_checker_or_package) @@ -2875,7 +2874,7 @@ static void GenerateHeaderSearchArgs(HeaderSearchOptions &Opts, llvm::ArrayRef<frontend::IncludeDirGroup> Groups, llvm::Optional<bool> IsFramework, llvm::Optional<bool> IgnoreSysRoot) { - return llvm::find(Groups, Entry.Group) != Groups.end() && + return llvm::is_contained(Groups, Entry.Group) && (!IsFramework || (Entry.IsFramework == *IsFramework)) && (!IgnoreSysRoot || (Entry.IgnoreSysRoot == *IgnoreSysRoot)); }; diff --git a/clang/lib/Lex/ModuleMap.cpp b/clang/lib/Lex/ModuleMap.cpp index 8475417171c82..53b824baba58b 100644 --- a/clang/lib/Lex/ModuleMap.cpp +++ b/clang/lib/Lex/ModuleMap.cpp @@ -989,9 +989,8 @@ Module *ModuleMap::inferFrameworkModule(const DirectoryEntry *FrameworkDir, // We're allowed to infer for this directory, but make sure it's okay // to infer this particular module. StringRef Name = llvm::sys::path::stem(FrameworkDirName); - canInfer = std::find(inferred->second.ExcludedModules.begin(), - inferred->second.ExcludedModules.end(), - Name) == inferred->second.ExcludedModules.end(); + canInfer = + !llvm::is_contained(inferred->second.ExcludedModules, Name); Attrs.IsSystem |= inferred->second.Attrs.IsSystem; Attrs.IsExternC |= inferred->second.Attrs.IsExternC; diff --git a/clang/lib/Lex/PPDirectives.cpp b/clang/lib/Lex/PPDirectives.cpp index 425d68cc7a413..ea14921b3aeaf 100644 --- a/clang/lib/Lex/PPDirectives.cpp +++ b/clang/lib/Lex/PPDirectives.cpp @@ -2535,7 +2535,7 @@ bool Preprocessor::ReadMacroParameterList(MacroInfo *MI, Token &Tok) { // If this is already used as a parameter, it is used multiple times (e.g. // #define X(A,A. - if (llvm::find(Parameters, II) != Parameters.end()) { // C99 6.10.3p6 + if (llvm::is_contained(Parameters, II)) { // C99 6.10.3p6 Diag(Tok, diag::err_pp_duplicate_name_in_arg_list) << II; return true; } diff --git a/clang/lib/Lex/PPMacroExpansion.cpp b/clang/lib/Lex/PPMacroExpansion.cpp index 7b5232d462749..bf19f538647e6 100644 --- a/clang/lib/Lex/PPMacroExpansion.cpp +++ b/clang/lib/Lex/PPMacroExpansion.cpp @@ -426,7 +426,7 @@ static bool isTrivialSingleTokenExpansion(const MacroInfo *MI, // If this is a function-like macro invocation, it's safe to trivially expand // as long as the identifier is not a macro argument. - return std::find(MI->param_begin(), MI->param_end(), II) == MI->param_end(); + return !llvm::is_contained(MI->params(), II); } /// isNextPPTokenLParen - Determine whether the next preprocessor token to be diff --git a/clang/lib/Lex/Preprocessor.cpp b/clang/lib/Lex/Preprocessor.cpp index bf0b85e038f05..b026ae36fc0fe 100644 --- a/clang/lib/Lex/Preprocessor.cpp +++ b/clang/lib/Lex/Preprocessor.cpp @@ -1383,7 +1383,7 @@ bool Preprocessor::parseSimpleIntegerLiteral(Token &Tok, uint64_t &Value) { void Preprocessor::addCommentHandler(CommentHandler *Handler) { assert(Handler && "NULL comment handler"); - assert(llvm::find(CommentHandlers, Handler) == CommentHandlers.end() && + assert(!llvm::is_contained(CommentHandlers, Handler) && "Comment handler already registered"); CommentHandlers.push_back(Handler); } diff --git a/clang/lib/Parse/ParseTentative.cpp b/clang/lib/Parse/ParseTentative.cpp index a40376d239915..be3823ecda01d 100644 --- a/clang/lib/Parse/ParseTentative.cpp +++ b/clang/lib/Parse/ParseTentative.cpp @@ -1103,9 +1103,7 @@ Parser::TPResult Parser::TryParseDeclarator(bool mayBeAbstract, } bool Parser::isTentativelyDeclared(IdentifierInfo *II) { - return std::find(TentativelyDeclaredIdentifiers.begin(), - TentativelyDeclaredIdentifiers.end(), II) - != TentativelyDeclaredIdentifiers.end(); + return llvm::is_contained(TentativelyDeclaredIdentifiers, II); } namespace { diff --git a/clang/lib/Serialization/ASTReader.cpp b/clang/lib/Serialization/ASTReader.cpp index dc78e442a6951..4db851c183123 100644 --- a/clang/lib/Serialization/ASTReader.cpp +++ b/clang/lib/Serialization/ASTReader.cpp @@ -728,8 +728,7 @@ static bool checkPreprocessorOptions(const PreprocessorOptions &PPOpts, if (File == ExistingPPOpts.ImplicitPCHInclude) continue; - if (std::find(PPOpts.Includes.begin(), PPOpts.Includes.end(), File) - != PPOpts.Includes.end()) + if (llvm::is_contained(PPOpts.Includes, File)) continue; SuggestedPredefines += "#include \""; @@ -739,9 +738,7 @@ static bool checkPreprocessorOptions(const PreprocessorOptions &PPOpts, for (unsigned I = 0, N = ExistingPPOpts.MacroIncludes.size(); I != N; ++I) { StringRef File = ExistingPPOpts.MacroIncludes[I]; - if (std::find(PPOpts.MacroIncludes.begin(), PPOpts.MacroIncludes.end(), - File) - != PPOpts.MacroIncludes.end()) + if (llvm::is_contained(PPOpts.MacroIncludes, File)) continue; SuggestedPredefines += "#__include_macros \""; diff --git a/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp b/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp index 3fc046015f151..20894039c3c0c 100644 --- a/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp +++ b/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp @@ -260,7 +260,7 @@ class GenericTaintChecker : public Checker<check::PreCall, check::PostCall> { } bool isDestinationArgument(unsigned ArgNum) const { - return (llvm::find(DstArgs, ArgNum) != DstArgs.end()); + return llvm::is_contained(DstArgs, ArgNum); } static bool isTaintedOrPointsToTainted(const Expr *E, diff --git a/clang/lib/StaticAnalyzer/Checkers/MoveChecker.cpp b/clang/lib/StaticAnalyzer/Checkers/MoveChecker.cpp index cbe9389820009..790ecfef867a5 100644 --- a/clang/lib/StaticAnalyzer/Checkers/MoveChecker.cpp +++ b/clang/lib/StaticAnalyzer/Checkers/MoveChecker.cpp @@ -712,12 +712,9 @@ ProgramStateRef MoveChecker::checkRegionChanges( // directly, but not all of them end up being invalidated. // But when they do, they appear in the InvalidatedRegions array as well. for (const auto *Region : RequestedRegions) { - if (ThisRegion != Region) { - if (llvm::find(InvalidatedRegions, Region) != - std::end(InvalidatedRegions)) { - State = removeFromState(State, Region); - } - } + if (ThisRegion != Region && + llvm::is_contained(InvalidatedRegions, Region)) + State = removeFromState(State, Region); } } else { // For invalidations that aren't caused by calls, assume nothing. In diff --git a/clang/lib/StaticAnalyzer/Checkers/PthreadLockChecker.cpp b/clang/lib/StaticAnalyzer/Checkers/PthreadLockChecker.cpp index ee71b55a39e69..88802757b729b 100644 --- a/clang/lib/StaticAnalyzer/Checkers/PthreadLockChecker.cpp +++ b/clang/lib/StaticAnalyzer/Checkers/PthreadLockChecker.cpp @@ -681,9 +681,7 @@ ProgramStateRef PthreadLockChecker::checkRegionChanges( // We assume that system library function wouldn't touch the mutex unless // it takes the mutex explicitly as an argument. // FIXME: This is a bit quadratic. - if (IsLibraryFunction && - std::find(ExplicitRegions.begin(), ExplicitRegions.end(), R) == - ExplicitRegions.end()) + if (IsLibraryFunction && !llvm::is_contained(ExplicitRegions, R)) continue; State = State->remove<LockMap>(R); diff --git a/clang/lib/StaticAnalyzer/Core/BugReporter.cpp b/clang/lib/StaticAnalyzer/Core/BugReporter.cpp index da441dcdf0183..4bd0e00e57671 100644 --- a/clang/lib/StaticAnalyzer/Core/BugReporter.cpp +++ b/clang/lib/StaticAnalyzer/Core/BugReporter.cpp @@ -1458,7 +1458,7 @@ static void addContextEdges(PathPieces &pieces, const LocationContext *LC) { break; // If the source is in the same context, we're already good. - if (llvm::find(SrcContexts, DstContext) != SrcContexts.end()) + if (llvm::is_contained(SrcContexts, DstContext)) break; // Update the subexpression node to point to the context edge. diff --git a/clang/lib/StaticAnalyzer/Core/HTMLDiagnostics.cpp b/clang/lib/StaticAnalyzer/Core/HTMLDiagnostics.cpp index 9db3b140f21e5..81c1576471316 100644 --- a/clang/lib/StaticAnalyzer/Core/HTMLDiagnostics.cpp +++ b/clang/lib/StaticAnalyzer/Core/HTMLDiagnostics.cpp @@ -752,8 +752,7 @@ static void HandlePopUpPieceEndTag(Rewriter &R, Out << "</div></td><td>" << Piece.getString() << "</td></tr>"; // If no report made at this range mark the variable and add the end tags. - if (std::find(PopUpRanges.begin(), PopUpRanges.end(), Range) == - PopUpRanges.end()) { + if (!llvm::is_contained(PopUpRanges, Range)) { // Store that we create a report at this range. PopUpRanges.push_back(Range); @@ -1091,8 +1090,7 @@ void HTMLDiagnostics::HandlePiece(Rewriter &R, FileID BugFileID, ArrayRef<SourceRange> Ranges = P.getRanges(); for (const auto &Range : Ranges) { // If we have already highlighted the range as a pop-up there is no work. - if (std::find(PopUpRanges.begin(), PopUpRanges.end(), Range) != - PopUpRanges.end()) + if (llvm::is_contained(PopUpRanges, Range)) continue; HighlightRange(R, LPosInfo.first, Range); diff --git a/clang/tools/libclang/CIndex.cpp b/clang/tools/libclang/CIndex.cpp index f76f041952865..02f986a6df1c8 100644 --- a/clang/tools/libclang/CIndex.cpp +++ b/clang/tools/libclang/CIndex.cpp @@ -9087,7 +9087,7 @@ cxindex::checkForMacroInMacroDefinition(const MacroInfo *MI, const Token &Tok, return nullptr; // Check that the identifier is not one of the macro arguments. - if (std::find(MI->param_begin(), MI->param_end(), &II) != MI->param_end()) + if (llvm::is_contained(MI->params(), &II)) return nullptr; MacroDirective *InnerMD = PP.getLocalMacroDirectiveHistory(&II); diff --git a/clang/tools/libclang/CIndexHigh.cpp b/clang/tools/libclang/CIndexHigh.cpp index 04699ccb01a58..0b49d1842e12a 100644 --- a/clang/tools/libclang/CIndexHigh.cpp +++ b/clang/tools/libclang/CIndexHigh.cpp @@ -109,14 +109,14 @@ struct FindFileIdRefVisitData { private: bool isOverriddingMethod(const Decl *D) const { - if (llvm::find(TopMethods, D) != TopMethods.end()) + if (llvm::is_contained(TopMethods, D)) return true; TopMethodsTy methods; getTopOverriddenMethods(TU, D, methods); for (TopMethodsTy::iterator I = methods.begin(), E = methods.end(); I != E; ++I) { - if (llvm::find(TopMethods, *I) != TopMethods.end()) + if (llvm::is_contained(TopMethods, *I)) return true; } _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
