[clang] [clang] Fix sorting module headers (PR #73146)

[via cfe-commits]

llvmbot wrote:


<!--LLVM PR SUMMARY COMMENT-->
@llvm/pr-subscribers-clang

@llvm/pr-subscribers-clang-modules

Author: Tulio Magno Quites Machado Filho (tuliom)

<details>
<summary>Changes</summary>

Struct Module::Header is not a POD type. As such, qsort() and llvm::array_pod_sort() must not be used to sort it. This became an issue with the new implementation of qsort() in glibc 2.39 that is not guaranteed to be a stable sort, causing Headers to be re-ordered and corrupted.

Replace the usage of llvm::array_pod_sort() with std::stable_sort() in order to fix this issue.  The signature of compareModuleHeaders() has to be modified.

This commit also fixes commit d3676d4b666ead794fc58bbc7e07aa406dcf487a that caused all headers to have NameAsWritten set to a 0-length string without adapting compareModuleHeaders() to the new field.

Fixes #<!-- -->73145.

---
Full diff: https://github.com/llvm/llvm-project/pull/73146.diff


1 Files Affected:

- (modified) clang/lib/Lex/ModuleMap.cpp (+6-4) 


``````````diff
diff --git a/clang/lib/Lex/ModuleMap.cpp b/clang/lib/Lex/ModuleMap.cpp
index 00e13c9be4a7d73..7ba5a5f8cbf973d 100644
--- a/clang/lib/Lex/ModuleMap.cpp
+++ b/clang/lib/Lex/ModuleMap.cpp
@@ -2509,9 +2509,11 @@ 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 ||
+    (A.NameAsWritten == B.NameAsWritten &&
+     A.PathRelativeToRootModuleDirectory < B.PathRelativeToRootModuleDirectory);
 }
 
 /// Parse an umbrella directory declaration.
@@ -2574,7 +2576,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);

``````````

</details>


https://github.com/llvm/llvm-project/pull/73146