Skip to content

[NFC][clang] Don't sort sections of SpecialCaseList #162166

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 3 commits into from
Oct 7, 2025
Merged

[NFC][clang] Don't sort sections of SpecialCaseList #162166

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7488475
[𝘀𝗽𝗿] initial version
vitalybuka Oct 6, 2025
1d45ee0
format
vitalybuka Oct 6, 2025
4593e48
rebase
vitalybuka Oct 7, 2025
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
35 changes: 9 additions & 26 deletions clang/lib/Basic/Diagnostic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,33 +537,16 @@ WarningsSpecialCaseList::create(const llvm::MemoryBuffer &Input,
}

void WarningsSpecialCaseList::processSections(DiagnosticsEngine &Diags) {
// Drop the default section introduced by special case list, we only support
// exact diagnostic group names.
// FIXME: We should make this configurable in the parser instead.
// FIXME: C++20 can use std::erase_if(Sections, [](Section &sec) { return
// sec.SectionStr == "*"; });
llvm::erase_if(Sections, [](Section &sec) { return sec.SectionStr == "*"; });
// Make sure we iterate sections by their line numbers.
std::vector<std::pair<unsigned, const Section *>> LineAndSectionEntry;
LineAndSectionEntry.reserve(Sections.size());
for (const auto &Entry : Sections) {
StringRef DiagName = Entry.SectionStr;
// Each section has a matcher with that section's name, attached to that
// line.
const auto &DiagSectionMatcher = Entry.SectionMatcher;
unsigned DiagLine = 0;
for (const auto &Glob : DiagSectionMatcher->Globs)
if (Glob->Name == DiagName) {
DiagLine = Glob->LineNo;
break;
}
LineAndSectionEntry.emplace_back(DiagLine, &Entry);
}
llvm::sort(LineAndSectionEntry);
static constexpr auto WarningFlavor = clang::diag::Flavor::WarningOrError;
for (const auto &[_, SectionEntry] : LineAndSectionEntry) {
for (const auto &SectionEntry : Sections) {
StringRef DiagGroup = SectionEntry.SectionStr;
if (DiagGroup == "*") {
// Drop the default section introduced by special case list, we only
// support exact diagnostic group names.
// FIXME: We should make this configurable in the parser instead.
continue;
}
SmallVector<diag::kind> GroupDiags;
StringRef DiagGroup = SectionEntry->SectionStr;
if (Diags.getDiagnosticIDs()->getDiagnosticsInGroup(
WarningFlavor, DiagGroup, GroupDiags)) {
StringRef Suggestion =
Expand All @@ -576,7 +559,7 @@ void WarningsSpecialCaseList::processSections(DiagnosticsEngine &Diags) {
for (diag::kind Diag : GroupDiags)
// We're intentionally overwriting any previous mappings here to make sure
// latest one takes precedence.
DiagToSection[Diag] = SectionEntry;
DiagToSection[Diag] = &SectionEntry;
}
}

Expand Down