kbobyrev updated this revision to Diff 377197.
kbobyrev marked 10 inline comments as done.
kbobyrev added a comment.
Address review comments.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D108194/new/
https://reviews.llvm.org/D108194
Files:
clang-tools-extra/clangd/Headers.cpp
clang-tools-extra/clangd/Headers.h
clang-tools-extra/clangd/IncludeCleaner.cpp
clang-tools-extra/clangd/IncludeCleaner.h
clang-tools-extra/clangd/ParsedAST.cpp
clang-tools-extra/clangd/ParsedAST.h
clang-tools-extra/clangd/unittests/IncludeCleanerTests.cpp
Index: clang-tools-extra/clangd/unittests/IncludeCleanerTests.cpp
===================================================================
--- clang-tools-extra/clangd/unittests/IncludeCleanerTests.cpp
+++ clang-tools-extra/clangd/unittests/IncludeCleanerTests.cpp
@@ -16,6 +16,8 @@
namespace clangd {
namespace {
+using ::testing::UnorderedElementsAre;
+
TEST(IncludeCleaner, ReferencedLocations) {
struct TestCase {
std::string HeaderCode;
@@ -131,6 +133,42 @@
}
}
+TEST(IncludeCleaner, GetUnusedHeaders) {
+ llvm::StringLiteral MainFile = R"cpp(
+ #include "a.h"
+ #include "b.h"
+ #include "dir/c.h"
+ #include "dir/unused.h"
+ #include "unused.h"
+ void foo() {
+ a();
+ b();
+ c();
+ })cpp";
+ // Build expected ast with symbols coming from headers.
+ TestTU TU;
+ TU.Filename = "foo.cpp";
+ TU.AdditionalFiles["foo.h"] = "void foo();";
+ TU.AdditionalFiles["a.h"] = "void a();";
+ TU.AdditionalFiles["b.h"] = "void b();";
+ TU.AdditionalFiles["dir/c.h"] = "void c();";
+ TU.AdditionalFiles["unused.h"] = "void unused();";
+ TU.AdditionalFiles["dir/unused.h"] = "void dirUnused();";
+ TU.AdditionalFiles["not_included.h"] = "void notIncluded();";
+ TU.ExtraArgs = {"-I" + testPath("dir")};
+ TU.Code = MainFile.str();
+ ParsedAST AST = TU.build();
+ auto UnusedIncludes = computeUnusedIncludes(AST);
+ std::vector<std::string> UnusedHeaders;
+ UnusedHeaders.reserve(UnusedIncludes.size());
+ for (const auto &Include : UnusedIncludes) {
+ // Strip enclosing "".
+ UnusedHeaders.push_back(
+ Include->Written.substr(1, Include->Written.size() - 2));
+ }
+ EXPECT_THAT(UnusedHeaders, UnorderedElementsAre("unused.h", "dir/unused.h"));
+}
+
} // namespace
} // namespace clangd
} // namespace clang
Index: clang-tools-extra/clangd/ParsedAST.h
===================================================================
--- clang-tools-extra/clangd/ParsedAST.h
+++ clang-tools-extra/clangd/ParsedAST.h
@@ -159,6 +159,8 @@
std::unique_ptr<HeuristicResolver> Resolver;
};
+std::vector<const Inclusion *> computeUnusedIncludes(ParsedAST &AST);
+
} // namespace clangd
} // namespace clang
Index: clang-tools-extra/clangd/ParsedAST.cpp
===================================================================
--- clang-tools-extra/clangd/ParsedAST.cpp
+++ clang-tools-extra/clangd/ParsedAST.cpp
@@ -18,6 +18,7 @@
#include "FeatureModule.h"
#include "Headers.h"
#include "HeuristicResolver.h"
+#include "IncludeCleaner.h"
#include "IncludeFixer.h"
#include "Preamble.h"
#include "SourceCode.h"
@@ -624,5 +625,15 @@
return llvm::None;
return llvm::StringRef(Preamble->Version);
}
+
+std::vector<const Inclusion *> computeUnusedIncludes(ParsedAST &AST) {
+ const auto &SM = AST.getSourceManager();
+
+ auto Refs = findReferencedLocations(AST);
+ auto ReferencedFiles = translateToHeaderIDs(findReferencedFiles(Refs, SM),
+ AST.getIncludeStructure(), SM);
+ return getUnused(AST.getIncludeStructure(), ReferencedFiles, SM);
+}
+
} // namespace clangd
} // namespace clang
Index: clang-tools-extra/clangd/IncludeCleaner.h
===================================================================
--- clang-tools-extra/clangd/IncludeCleaner.h
+++ clang-tools-extra/clangd/IncludeCleaner.h
@@ -25,6 +25,7 @@
#include "ParsedAST.h"
#include "clang/Basic/SourceLocation.h"
#include "llvm/ADT/DenseSet.h"
+#include <vector>
namespace clang {
namespace clangd {
@@ -46,6 +47,21 @@
/// - err on the side of reporting all possible locations
ReferencedLocations findReferencedLocations(ParsedAST &AST);
+/// Retrieves IDs of all files containing SourceLocations from \p Locs.
+llvm::DenseSet<FileID> findReferencedFiles(const ReferencedLocations &Locs,
+ const SourceManager &SM);
+
+/// Maps FileIDs to the internal IncludeStructure representation (HeaderIDs).
+llvm::DenseSet<IncludeStructure::HeaderID>
+translateToHeaderIDs(const llvm::DenseSet<FileID> &Files,
+ const IncludeStructure &Includes, const SourceManager &SM);
+
+/// Retrieves headers that are referenced from the main file but not used.
+std::vector<const Inclusion *>
+getUnused(const IncludeStructure &Includes,
+ const llvm::DenseSet<IncludeStructure::HeaderID> &ReferencedFiles,
+ const SourceManager &SM);
+
} // namespace clangd
} // namespace clang
Index: clang-tools-extra/clangd/IncludeCleaner.cpp
===================================================================
--- clang-tools-extra/clangd/IncludeCleaner.cpp
+++ clang-tools-extra/clangd/IncludeCleaner.cpp
@@ -98,6 +98,35 @@
llvm::DenseSet<const void *> Visited;
};
+// Given a set of referenced FileIDs, determines all the potentially-referenced
+// files and macros by traversing expansion/spelling locations of macro IDs.
+// This is used to map the referenced SourceLocations onto real files.
+struct ReferencedFiles {
+ ReferencedFiles(const SourceManager &SM) : SM(SM) {}
+ llvm::DenseSet<FileID> Files;
+ llvm::DenseSet<FileID> Macros;
+ const SourceManager &SM;
+
+ void add(SourceLocation Loc) { add(SM.getFileID(Loc), Loc); }
+
+ void add(FileID FID, SourceLocation Loc) {
+ if (FID.isInvalid())
+ return;
+ assert(SM.isInFileID(Loc, FID));
+ if (Loc.isFileID()) {
+ Files.insert(FID);
+ return;
+ }
+ // Don't process the same macro FID twice.
+ if (!Macros.insert(FID).second)
+ return;
+ const auto &Exp = SM.getSLocEntry(FID).getExpansion();
+ add(Exp.getSpellingLoc());
+ add(Exp.getExpansionLocStart());
+ add(Exp.getExpansionLocEnd());
+ }
+};
+
} // namespace
ReferencedLocations findReferencedLocations(ParsedAST &AST) {
@@ -108,5 +137,61 @@
return Result;
}
+llvm::DenseSet<FileID>
+findReferencedFiles(const llvm::DenseSet<SourceLocation> &Locs,
+ const SourceManager &SM) {
+ std::vector<SourceLocation> Sorted{Locs.begin(), Locs.end()};
+ llvm::sort(Sorted); // Group by FileID.
+ ReferencedFiles Result(SM);
+ for (auto It = Sorted.begin(); It < Sorted.end();) {
+ FileID FID = SM.getFileID(*It);
+ Result.add(FID, *It);
+ // Cheaply skip over all the other locations from the same FileID.
+ // This avoids lots of redundant Loc->File lookups for the same file.
+ do
+ ++It;
+ while (It != Sorted.end() && SM.isInFileID(*It, FID));
+ }
+ return std::move(Result.Files);
+}
+
+std::vector<const Inclusion *>
+getUnused(const IncludeStructure &Structure,
+ const llvm::DenseSet<IncludeStructure::HeaderID> &ReferencedFiles,
+ const SourceManager &SM) {
+ std::vector<const Inclusion *> Unused;
+ for (const Inclusion &MFI : Structure.MainFileIncludes) {
+ // FIXME: Skip includes that are not self-contained.
+ if (MFI.Resolved.empty()) {
+ elog("{0} is unresolved", MFI.Written);
+ continue;
+ }
+ auto IncludeID = static_cast<IncludeStructure::HeaderID>(MFI.ID);
+ assert(IncludeID != IncludeStructure::HeaderID::Invalid);
+ bool Used = ReferencedFiles.find(IncludeID) != ReferencedFiles.end();
+ if (!Used) {
+ Unused.push_back(&MFI);
+ }
+ dlog("{0} is {1}", MFI.Written, Used ? "USED" : "UNUSED");
+ }
+ return Unused;
+}
+
+llvm::DenseSet<IncludeStructure::HeaderID>
+translateToHeaderIDs(const llvm::DenseSet<FileID> &Files,
+ const IncludeStructure &Includes,
+ const SourceManager &SM) {
+ llvm::DenseSet<IncludeStructure::HeaderID> TranslatedHeaderIDs;
+ TranslatedHeaderIDs.reserve(Files.size());
+ for (FileID FID : Files) {
+ const FileEntry *FE = SM.getFileEntryForID(FID);
+ assert(FE);
+ const auto File = Includes.getID(FE);
+ assert(File);
+ TranslatedHeaderIDs.insert(*File);
+ }
+ return TranslatedHeaderIDs;
+}
+
} // namespace clangd
} // namespace clang
Index: clang-tools-extra/clangd/Headers.h
===================================================================
--- clang-tools-extra/clangd/Headers.h
+++ clang-tools-extra/clangd/Headers.h
@@ -26,6 +26,7 @@
#include "llvm/Support/Error.h"
#include "llvm/Support/FileSystem/UniqueID.h"
#include "llvm/Support/VirtualFileSystem.h"
+#include <limits>
#include <string>
namespace clang {
@@ -61,6 +62,7 @@
unsigned HashOffset = 0; // Byte offset from start of file to #.
int HashLine = 0; // Line number containing the directive, 0-indexed.
SrcMgr::CharacteristicKind FileKind = SrcMgr::C_User;
+ unsigned ID = std::numeric_limits<unsigned>::max(); // Corresponding HeaderID.
};
llvm::raw_ostream &operator<<(llvm::raw_ostream &, const Inclusion &);
bool operator==(const Inclusion &LHS, const Inclusion &RHS);
@@ -132,7 +134,9 @@
// HeaderID identifies file in the include graph. It corresponds to a
// FileEntry rather than a FileID, but stays stable across preamble & main
// file builds.
- enum class HeaderID : unsigned {};
+ enum class HeaderID : unsigned {
+ Invalid = std::numeric_limits<unsigned>::max(),
+ };
llvm::Optional<HeaderID> getID(const FileEntry *Entry) const;
HeaderID getOrCreateID(const FileEntry *Entry);
Index: clang-tools-extra/clangd/Headers.cpp
===================================================================
--- clang-tools-extra/clangd/Headers.cpp
+++ clang-tools-extra/clangd/Headers.cpp
@@ -56,6 +56,8 @@
SM.getLineNumber(SM.getFileID(HashLoc), Inc.HashOffset) - 1;
Inc.FileKind = FileKind;
Inc.Directive = IncludeTok.getIdentifierInfo()->getPPKeywordID();
+ if (File)
+ Inc.ID = static_cast<unsigned>(Out->getOrCreateID(File));
}
// Record include graph (not just for main-file includes)
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
