[llvm-branch-commits] [clang] Speed up diagnostic state file lookup (PR #241234)

Kazu Hirata via llvm-branch-commits llvm-branch-commits at lists.llvm.org
Wed Nov 11 09:54:46 PST 2026


================
@@ -3418,16 +3418,24 @@ void ASTWriter::WritePragmaDiagnosticMappings(const DiagnosticsEngine &Diag,
 
   // Emit the state transitions.
   unsigned NumLocations = 0;
-  for (auto &FileIDAndFile : Diag.DiagStatesByLoc.Files) {
-    if (!FileIDAndFile.first.isValid() ||
-        !FileIDAndFile.second.HasLocalTransitions)
+  SmallVector<std::pair<FileID, const DiagnosticsEngine::DiagStateMap::File *>,
+              16>
+      Files;
+  for (auto &FileIDAndFile : Diag.DiagStatesByLoc.Files)
+    Files.emplace_back(FileIDAndFile.first, FileIDAndFile.second.get());
+  llvm::sort(Files, [](const auto &LHS, const auto &RHS) {
+    return LHS.first.getOpaqueValue() < RHS.first.getOpaqueValue();
+  });
----------------
kazutakahirata wrote:

May I suggest using a structured binding and `llvm::less_first()` here as well?

```suggestion
  for (const auto &[ID, FilePtr] : Diag.DiagStatesByLoc.Files)
    Files.emplace_back(ID, FilePtr.get());
  llvm::sort(Files, llvm::less_first());
```

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


More information about the llvm-branch-commits mailing list