Skip to content

[clang-include-cleaner] Fix incorrect directory issue for writing files #111375

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Oct 17, 2024
Merged

[clang-include-cleaner] Fix incorrect directory issue for writing files #111375

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
23b90bb
[clang-include-cleaner] Fix incorrect directory issue for writing files
bc-lee Oct 7, 2024
eef397c
Fix path issue identified by @kadircet
bc-lee Oct 9, 2024
2409d6f
Apply code review feedback
bc-lee Oct 10, 2024
0c9477d
Add test cases where the cwd and the compilation database's directory…
bc-lee Oct 10, 2024
dec9be8
Fix the previous commit that removed existing test cases
bc-lee Oct 10, 2024
b39f36e
Make clang-format happy
bc-lee Oct 10, 2024
3a0f02e
Fix unittest failures in Windows
bc-lee Oct 10, 2024
c65d828
Apply review comments.
bc-lee Oct 13, 2024
11f78a3
Apply review comments
bc-lee Oct 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 22 additions & 2 deletions clang-tools-extra/include-cleaner/tool/IncludeCleaner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,11 +173,22 @@ class Action : public clang::ASTFrontendAction {
if (!HTMLReportPath.empty())
writeHTML();

// Source File's path relative to compilation database.
llvm::StringRef Path =
Copy link
Member

@kadircet kadircet Oct 9, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we keep reporting with abs-paths here, i.e:

llvm::SmallString<256> AbsPath(SM.getFileEntryRefForID(SM.getMainFileID())->getName());
SM.getFileManager().makeAbsolutePath(AbsPath);
...

This way we can recognize these paths in main and perform the mapping accordingly.

SM.getFileEntryRefForID(SM.getMainFileID())->getName();
assert(!Path.empty() && "Main file path not known?");
llvm::StringRef Code = SM.getBufferData(SM.getMainFileID());

auto Cwd = getCompilerInstance()
.getFileManager()
.getVirtualFileSystem()
.getCurrentWorkingDirectory();
if (Cwd.getError()) {
llvm::errs() << "Failed to get current working directory: "
<< Cwd.getError().message() << "\n";
return;
}

auto Results =
analyze(AST.Roots, PP.MacroReferences, PP.Includes, &PI,
getCompilerInstance().getPreprocessor(), HeaderFilter);
Expand All @@ -201,8 +212,17 @@ class Action : public clang::ASTFrontendAction {
}
}

if (!Results.Missing.empty() || !Results.Unused.empty())
EditedFiles.try_emplace(Path, Final);
if (!Results.Missing.empty() || !Results.Unused.empty()) {
auto Sept = llvm::sys::path::get_separator();
// Adjust the path to be absolute if it is not.
std::string FullPath;
if (llvm::sys::path::is_absolute(Path))
FullPath = Path.str();
else
FullPath = Cwd.get() + Sept.str() + Path.str();

EditedFiles.try_emplace(FullPath, Final);
}
}

void writeHTML() {
Expand Down
Loading