Skip to content

[clang] Fix sorting module headers #73146

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
Nov 24, 2023
Merged

[clang] Fix sorting module headers #73146

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d0a86b8
[clang] Fix sorting module headers
tuliom Nov 22, 2023
6e2e45c
fixup! [clang] Fix sorting module headers
tuliom Nov 22, 2023
d8c2a15
fixup! [clang] Fix sorting module headers
tuliom Nov 23, 2023
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
8 changes: 4 additions & 4 deletions clang/lib/Lex/ModuleMap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2509,9 +2509,9 @@ void ModuleMapParser::parseHeaderDecl(MMToken::TokenKind LeadingToken,
<< FixItHint::CreateReplacement(CurrModuleDeclLoc, "framework module");
}

static int compareModuleHeaders(const Module::Header *A,
const Module::Header *B) {
return A->NameAsWritten.compare(B->NameAsWritten);
static bool compareModuleHeaders(const Module::Header &A,
const Module::Header &B) {
return A.NameAsWritten < B.NameAsWritten;
}

/// Parse an umbrella directory declaration.
Expand Down Expand Up @@ -2574,7 +2574,7 @@ void ModuleMapParser::parseUmbrellaDirDecl(SourceLocation UmbrellaLoc) {
}

// Sort header paths so that the pcm doesn't depend on iteration order.
llvm::array_pod_sort(Headers.begin(), Headers.end(), compareModuleHeaders);
std::stable_sort(Headers.begin(), Headers.end(), compareModuleHeaders);

for (auto &Header : Headers)
Map.addHeader(ActiveModule, std::move(Header), ModuleMap::TextualHeader);
Expand Down