Skip to content

[analyzer] Use getFileName and do not use realpath names #126039

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 1 commit into from
Feb 6, 2025
Merged

[analyzer] Use getFileName and do not use realpath names #126039

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions clang/lib/StaticAnalyzer/Core/BugReporter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,8 @@ std::string timeTraceName(const BugReportEquivClass &EQ) {
return ("Flushing EQC " + BT.getDescription()).str();
}

llvm::TimeTraceMetadata timeTraceMetadata(const BugReportEquivClass &EQ) {
llvm::TimeTraceMetadata timeTraceMetadata(const BugReportEquivClass &EQ,
const SourceManager &SM) {
// Must be called only when constructing non-bogus TimeTraceScope
assert(llvm::timeTraceProfilerEnabled());

Expand All @@ -309,9 +310,7 @@ llvm::TimeTraceMetadata timeTraceMetadata(const BugReportEquivClass &EQ) {
const BugReport *R = BugReports.front().get();
const auto &BT = R->getBugType();
auto Loc = R->getLocation().asLocation();
std::string File = "";
if (const auto *Entry = Loc.getFileEntry())
File = Entry->tryGetRealPathName().str();
std::string File = SM.getFilename(Loc).str();
return {BT.getCheckerName().str(), std::move(File),
static_cast<int>(Loc.getLineNumber())};
}
Expand Down Expand Up @@ -3150,8 +3149,9 @@ BugReport *PathSensitiveBugReporter::findReportInEquivalenceClass(
}

void BugReporter::FlushReport(BugReportEquivClass &EQ) {
llvm::TimeTraceScope TCS{timeTraceName(EQ),
[&EQ]() { return timeTraceMetadata(EQ); }};
llvm::TimeTraceScope TCS{timeTraceName(EQ), [&]() {
return timeTraceMetadata(EQ, getSourceManager());
}};
SmallVector<BugReport*, 10> bugReports;
BugReport *report = findReportInEquivalenceClass(EQ, bugReports);
if (!report)
Expand Down