Author: Kirill Bobyrev Date: 2022-03-08T13:43:25+01:00 New Revision: d5106c8f973b76e49d64ac3d91236efafd771c7c
URL: https://github.com/llvm/llvm-project/commit/d5106c8f973b76e49d64ac3d91236efafd771c7c DIFF: https://github.com/llvm/llvm-project/commit/d5106c8f973b76e49d64ac3d91236efafd771c7c.diff LOG: [clangd] NFC: Cleanup IncludeCleaner API Make a further improvement to decrease verbosity of the API: ASTContext provides SourceManager access. Reviewed By: sammccall Differential Revision: https://reviews.llvm.org/D119842 Added: Modified: clang-tools-extra/clangd/IncludeCleaner.cpp clang-tools-extra/clangd/IncludeCleaner.h Removed: ################################################################################ diff --git a/clang-tools-extra/clangd/IncludeCleaner.cpp b/clang-tools-extra/clangd/IncludeCleaner.cpp index 90dfb2b4a3501..04dbf12410cf7 100644 --- a/clang-tools-extra/clangd/IncludeCleaner.cpp +++ b/clang-tools-extra/clangd/IncludeCleaner.cpp @@ -286,11 +286,11 @@ FileID headerResponsible(FileID ID, const SourceManager &SM, } // namespace -ReferencedLocations findReferencedLocations(const SourceManager &SM, - ASTContext &Ctx, Preprocessor &PP, +ReferencedLocations findReferencedLocations(ASTContext &Ctx, Preprocessor &PP, const syntax::TokenBuffer *Tokens) { trace::Span Tracer("IncludeCleaner::findReferencedLocations"); ReferencedLocations Result; + const auto &SM = Ctx.getSourceManager(); ReferencedLocationCrawler Crawler(Result, SM); Crawler.TraverseAST(Ctx); if (Tokens) @@ -299,8 +299,8 @@ ReferencedLocations findReferencedLocations(const SourceManager &SM, } ReferencedLocations findReferencedLocations(ParsedAST &AST) { - return findReferencedLocations(AST.getSourceManager(), AST.getASTContext(), - AST.getPreprocessor(), &AST.getTokens()); + return findReferencedLocations(AST.getASTContext(), AST.getPreprocessor(), + &AST.getTokens()); } ReferencedFiles diff --git a/clang-tools-extra/clangd/IncludeCleaner.h b/clang-tools-extra/clangd/IncludeCleaner.h index ad34e3d6facdf..183f84f2f3bfe 100644 --- a/clang-tools-extra/clangd/IncludeCleaner.h +++ b/clang-tools-extra/clangd/IncludeCleaner.h @@ -51,8 +51,7 @@ struct ReferencedLocations { /// - don't attempt to describe where symbols were referenced from in /// ambiguous cases (e.g. implicitly used symbols, multiple declarations) /// - err on the side of reporting all possible locations -ReferencedLocations findReferencedLocations(const SourceManager &SM, - ASTContext &Ctx, Preprocessor &PP, +ReferencedLocations findReferencedLocations(ASTContext &Ctx, Preprocessor &PP, const syntax::TokenBuffer *Tokens); ReferencedLocations findReferencedLocations(ParsedAST &AST); _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
