VitaNuo updated this revision to Diff 548217.
VitaNuo added a comment.
Remove the preferred header hint for exporters.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D157395/new/
https://reviews.llvm.org/D157395
Files:
clang-tools-extra/include-cleaner/lib/FindHeaders.cpp
clang-tools-extra/include-cleaner/lib/Record.cpp
clang-tools-extra/include-cleaner/unittests/RecordTest.cpp
Index: clang-tools-extra/include-cleaner/unittests/RecordTest.cpp
===================================================================
--- clang-tools-extra/include-cleaner/unittests/RecordTest.cpp
+++ clang-tools-extra/include-cleaner/unittests/RecordTest.cpp
@@ -439,6 +439,25 @@
PI.getExporters(SM.getFileEntryForID(SM.getMainFileID()), FM).empty());
}
+TEST_F(PragmaIncludeTest, IWYUTransitiveExport) {
+ Inputs.Code = R"cpp(
+ #include "export1.h"
+ )cpp";
+ Inputs.ExtraFiles["export1.h"] = R"cpp(
+ #include "export2.h" // IWYU pragma: export
+ )cpp";
+ Inputs.ExtraFiles["export2.h"] = R"cpp(
+ #include "provider.h" // IWYU pragma: export
+ )cpp";
+ Inputs.ExtraFiles["provider.h"] = "";
+ TestAST Processed = build();
+ auto &FM = Processed.fileManager();
+
+ EXPECT_THAT(PI.getExporters(FM.getFile("provider.h").get(), FM),
+ testing::UnorderedElementsAre(FileNamed("export1.h"),
+ FileNamed("export2.h")));
+}
+
TEST_F(PragmaIncludeTest, IWYUExportForStandardHeaders) {
Inputs.Code = R"cpp(
#include "export.h"
@@ -484,9 +503,11 @@
testing::UnorderedElementsAre(FileNamed("export1.h"),
FileNamed("normal.h")));
EXPECT_THAT(PI.getExporters(FM.getFile("private2.h").get(), FM),
- testing::UnorderedElementsAre(FileNamed("export1.h")));
+ testing::UnorderedElementsAre(FileNamed("export1.h"),
+ FileNamed("normal.h")));
EXPECT_THAT(PI.getExporters(FM.getFile("private3.h").get(), FM),
- testing::UnorderedElementsAre(FileNamed("export1.h")));
+ testing::UnorderedElementsAre(FileNamed("export1.h"),
+ FileNamed("normal.h")));
EXPECT_TRUE(PI.getExporters(FM.getFile("foo.h").get(), FM).empty());
EXPECT_TRUE(PI.getExporters(FM.getFile("bar.h").get(), FM).empty());
Index: clang-tools-extra/include-cleaner/lib/Record.cpp
===================================================================
--- clang-tools-extra/include-cleaner/lib/Record.cpp
+++ clang-tools-extra/include-cleaner/lib/Record.cpp
@@ -12,6 +12,7 @@
#include "clang/AST/ASTContext.h"
#include "clang/AST/DeclGroup.h"
#include "clang/Basic/FileEntry.h"
+#include "clang/Basic/FileManager.h"
#include "clang/Basic/LLVM.h"
#include "clang/Basic/SourceLocation.h"
#include "clang/Basic/SourceManager.h"
@@ -24,16 +25,21 @@
#include "clang/Tooling/Inclusions/HeaderAnalysis.h"
#include "clang/Tooling/Inclusions/StandardLibrary.h"
#include "llvm/ADT/ArrayRef.h"
+#include "llvm/ADT/DenseMap.h"
#include "llvm/ADT/STLExtras.h"
+#include "llvm/ADT/SmallSet.h"
#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/StringRef.h"
+#include "llvm/ADT/iterator_range.h"
#include "llvm/Support/Allocator.h"
#include "llvm/Support/Error.h"
+#include "llvm/Support/FileSystem/UniqueID.h"
#include "llvm/Support/StringSaver.h"
#include <algorithm>
#include <assert.h>
#include <memory>
#include <optional>
+#include <set>
#include <utility>
#include <vector>
@@ -387,24 +393,44 @@
return It->getSecond();
}
+template <typename Iter>
static llvm::SmallVector<const FileEntry *>
-toFileEntries(llvm::ArrayRef<StringRef> FileNames, FileManager &FM) {
+toFileEntries(Iter FileNamesBegin, Iter FileNamesEnd, FileManager &FM) {
llvm::SmallVector<const FileEntry *> Results;
- for (auto FName : FileNames) {
+ for (auto FNameIt = FileNamesBegin; FNameIt != FileNamesEnd; ++FNameIt) {
// FIMXE: log the failing cases?
- if (auto FE = expectedToOptional(FM.getFileRef(FName)))
+ if (auto FE = expectedToOptional(FM.getFileRef(*FNameIt)))
Results.push_back(*FE);
}
return Results;
}
-llvm::SmallVector<const FileEntry *>
-PragmaIncludes::getExporters(const FileEntry *File, FileManager &FM) const {
- auto It = IWYUExportBy.find(File->getUniqueID());
+
+void collectExportersRecursively(
+ llvm::DenseMap<llvm::sys::fs::UniqueID,
+ llvm::SmallVector</*FileEntry::getName()*/ llvm::StringRef>>
+ IWYUExportBy,
+ const llvm::sys::fs::UniqueID &UID, std::set<const FileEntry *> &Result,
+ FileManager &FM) {
+ auto It = IWYUExportBy.find(UID);
if (It == IWYUExportBy.end())
- return {};
+ return;
+ auto Exporters =
+ toFileEntries(It->getSecond().begin(), It->getSecond().end(), FM);
+ for (const auto &E : Exporters) {
+ Result.insert(E);
+ collectExportersRecursively(IWYUExportBy, E->getUniqueID(), Result, FM);
+ }
+}
- return toFileEntries(It->getSecond(), FM);
+llvm::SmallVector<const FileEntry *>
+PragmaIncludes::getExporters(const FileEntry *File, FileManager &FM) const {
+ std::set<const FileEntry *> UniqueExporters;
+ collectExportersRecursively(IWYUExportBy, File->getUniqueID(),
+ UniqueExporters, FM);
+ llvm::SmallVector<const FileEntry *> Exporters{UniqueExporters.begin(),
+ UniqueExporters.end()};
+ return Exporters;
}
llvm::SmallVector<const FileEntry *>
PragmaIncludes::getExporters(tooling::stdlib::Header StdHeader,
@@ -412,7 +438,7 @@
auto It = StdIWYUExportBy.find(StdHeader);
if (It == StdIWYUExportBy.end())
return {};
- return toFileEntries(It->getSecond(), FM);
+ return toFileEntries(It->getSecond().begin(), It->getSecond().end(), FM);
}
bool PragmaIncludes::isSelfContained(const FileEntry *FE) const {
Index: clang-tools-extra/include-cleaner/lib/FindHeaders.cpp
===================================================================
--- clang-tools-extra/include-cleaner/lib/FindHeaders.cpp
+++ clang-tools-extra/include-cleaner/lib/FindHeaders.cpp
@@ -23,8 +23,11 @@
#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/StringRef.h"
#include "llvm/Support/Casting.h"
+#include "llvm/Support/Error.h"
#include "llvm/Support/ErrorHandling.h"
+#include <algorithm>
#include <optional>
+#include <set>
#include <utility>
namespace clang::include_cleaner {
@@ -188,17 +191,24 @@
if (!PI)
return {{FE, Hints::PublicHeader | Hints::OriginHeader}};
bool IsOrigin = true;
+ std::set<const FileEntry *> Exporters;
while (FE) {
Results.emplace_back(FE,
isPublicHeader(FE, *PI) |
(IsOrigin ? Hints::OriginHeader : Hints::None));
- // FIXME: compute transitive exporter headers.
- for (const auto *Export : PI->getExporters(FE, SM.getFileManager()))
+ for (const auto *Export : PI->getExporters(FE, SM.getFileManager())) {
+ Exporters.insert(Export);
Results.emplace_back(Export, isPublicHeader(Export, *PI));
+ }
if (auto Verbatim = PI->getPublic(FE); !Verbatim.empty()) {
- Results.emplace_back(Verbatim,
- Hints::PublicHeader | Hints::PreferredHeader);
+ Hints Hint = Hints::PublicHeader;
+ auto FE =
+ expectedToOptional(SM.getFileManager().getFileRef(Verbatim));
+ if (!FE || std::find(Exporters.begin(), Exporters.end(), FE) ==
+ Exporters.end())
+ Hint |= Hints::PreferredHeader;
+ Results.emplace_back(Verbatim, Hint);
break;
}
if (PI->isSelfContained(FE) || FID == SM.getMainFileID())
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
