From: Haojian Wu Date: Thu, 1 Jun 2023 13:21:08 +0000 (+0200) Subject: [include-cleaner] NFC, use const HeaderSearch when possible. X-Git-Tag: upstream/17.0.6~6490 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7de541235f24e53af95d481df2bf8b15f6656ad3;p=platform%2Fupstream%2Fllvm.git [include-cleaner] NFC, use const HeaderSearch when possible. --- diff --git a/clang-tools-extra/include-cleaner/include/clang-include-cleaner/Analysis.h b/clang-tools-extra/include-cleaner/include/clang-include-cleaner/Analysis.h index 66916a5..6d764c6 100644 --- a/clang-tools-extra/include-cleaner/include/clang-include-cleaner/Analysis.h +++ b/clang-tools-extra/include-cleaner/include/clang-include-cleaner/Analysis.h @@ -67,7 +67,7 @@ struct AnalysisResults { AnalysisResults analyze(llvm::ArrayRef ASTRoots, llvm::ArrayRef MacroRefs, const Includes &I, const PragmaIncludes *PI, - const SourceManager &SM, HeaderSearch &HS); + const SourceManager &SM, const HeaderSearch &HS); /// Removes unused includes and inserts missing ones in the main file. /// Returns the modified main-file code. @@ -75,7 +75,7 @@ AnalysisResults analyze(llvm::ArrayRef ASTRoots, std::string fixIncludes(const AnalysisResults &Results, llvm::StringRef Code, const format::FormatStyle &IncludeStyle); -std::string spellHeader(const Header &H, HeaderSearch &HS, +std::string spellHeader(const Header &H, const HeaderSearch &HS, const FileEntry *Main); /// Gets all the providers for a symbol by traversing each location. diff --git a/clang-tools-extra/include-cleaner/lib/Analysis.cpp b/clang-tools-extra/include-cleaner/lib/Analysis.cpp index 84f1f4c..bf50e06 100644 --- a/clang-tools-extra/include-cleaner/lib/Analysis.cpp +++ b/clang-tools-extra/include-cleaner/lib/Analysis.cpp @@ -53,7 +53,7 @@ void walkUsed(llvm::ArrayRef ASTRoots, } } -std::string spellHeader(const Header &H, HeaderSearch &HS, +std::string spellHeader(const Header &H, const HeaderSearch &HS, const FileEntry *Main) { switch (H.kind()) { case Header::Physical: { @@ -73,7 +73,7 @@ std::string spellHeader(const Header &H, HeaderSearch &HS, AnalysisResults analyze(llvm::ArrayRef ASTRoots, llvm::ArrayRef MacroRefs, const Includes &Inc, const PragmaIncludes *PI, - const SourceManager &SM, HeaderSearch &HS) { + const SourceManager &SM, const HeaderSearch &HS) { const FileEntry *MainFile = SM.getFileEntryForID(SM.getMainFileID()); llvm::DenseSet Used; llvm::StringSet<> Missing; diff --git a/clang-tools-extra/include-cleaner/lib/AnalysisInternal.h b/clang-tools-extra/include-cleaner/lib/AnalysisInternal.h index 6bfed91..cd796c2 100644 --- a/clang-tools-extra/include-cleaner/lib/AnalysisInternal.h +++ b/clang-tools-extra/include-cleaner/lib/AnalysisInternal.h @@ -63,7 +63,7 @@ std::vector> locateSymbol(const Symbol &S); void writeHTMLReport(FileID File, const Includes &, llvm::ArrayRef Roots, llvm::ArrayRef MacroRefs, ASTContext &Ctx, - HeaderSearch &HS, PragmaIncludes *PI, + const HeaderSearch &HS, PragmaIncludes *PI, llvm::raw_ostream &OS); } // namespace include_cleaner diff --git a/clang-tools-extra/include-cleaner/lib/HTMLReport.cpp b/clang-tools-extra/include-cleaner/lib/HTMLReport.cpp index c1d1982..65b8297 100644 --- a/clang-tools-extra/include-cleaner/lib/HTMLReport.cpp +++ b/clang-tools-extra/include-cleaner/lib/HTMLReport.cpp @@ -134,7 +134,7 @@ class Reporter { llvm::raw_ostream &OS; const ASTContext &Ctx; const SourceManager &SM; - HeaderSearch &HS; + const HeaderSearch &HS; const include_cleaner::Includes &Includes; const PragmaIncludes *PI; FileID MainFile; @@ -208,7 +208,7 @@ class Reporter { } public: - Reporter(llvm::raw_ostream &OS, ASTContext &Ctx, HeaderSearch &HS, + Reporter(llvm::raw_ostream &OS, ASTContext &Ctx, const HeaderSearch &HS, const include_cleaner::Includes &Includes, const PragmaIncludes *PI, FileID MainFile) : OS(OS), Ctx(Ctx), SM(Ctx.getSourceManager()), HS(HS), @@ -513,7 +513,7 @@ private: void writeHTMLReport(FileID File, const include_cleaner::Includes &Includes, llvm::ArrayRef Roots, llvm::ArrayRef MacroRefs, ASTContext &Ctx, - HeaderSearch &HS, PragmaIncludes *PI, + const HeaderSearch &HS, PragmaIncludes *PI, llvm::raw_ostream &OS) { Reporter R(OS, Ctx, HS, Includes, PI, File); const auto& SM = Ctx.getSourceManager(); diff --git a/clang-tools-extra/include-cleaner/lib/Record.cpp b/clang-tools-extra/include-cleaner/lib/Record.cpp index ff29fda..113a69c 100644 --- a/clang-tools-extra/include-cleaner/lib/Record.cpp +++ b/clang-tools-extra/include-cleaner/lib/Record.cpp @@ -305,7 +305,7 @@ private: bool InMainFile = false; const SourceManager &SM; - HeaderSearch &HeaderInfo; + const HeaderSearch &HeaderInfo; PragmaIncludes *Out; llvm::BumpPtrAllocator Arena; /// Intern table for strings. Contents are on the arena.