[libcxx-commits] [libcxx] [libcxx] Avoid including deprecated ClangTidyModuleRegistry.h (PR #208945)

Aiden Grossman via libcxx-commits libcxx-commits at lists.llvm.org
Mon Jul 13 06:41:29 PDT 2026 

https://github.com/boomanaiden154 updated https://github.com/llvm/llvm-project/pull/208945

>From 20c1f414a5514766969069b9e42764db3b48f288 Mon Sep 17 00:00:00 2001
From: Aiden Grossman <aidengrossman at google.com>
Date: Sat, 11 Jul 2026 19:50:43 +0000
Subject: [PATCH 1/5] [libcxx] Avoid including deprecated
 ClangTidyModuleRegistry.h

Deprecated in 1bcf74006bcf528d14377173dba459759d35c961. Causes warnings
during compilation and will presumably become an error.
---
 libcxx/test/tools/clang_tidy_checks/abi_tag_on_virtual.cpp      | 2 +-
 libcxx/test/tools/clang_tidy_checks/empty_namespaces.cpp        | 2 +-
 .../tools/clang_tidy_checks/header_exportable_declarations.cpp  | 2 +-
 libcxx/test/tools/clang_tidy_checks/hide_from_abi.cpp           | 2 +-
 libcxx/test/tools/clang_tidy_checks/libcpp_module.cpp           | 2 +-
 libcxx/test/tools/clang_tidy_checks/robust_against_adl.cpp      | 2 +-
 .../clang_tidy_checks/robust_against_operator_ampersand.cpp     | 2 +-
 libcxx/test/tools/clang_tidy_checks/uglify_attributes.cpp       | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/libcxx/test/tools/clang_tidy_checks/abi_tag_on_virtual.cpp b/libcxx/test/tools/clang_tidy_checks/abi_tag_on_virtual.cpp
index f1866179a3b68..64dca4a08d62f 100644
--- a/libcxx/test/tools/clang_tidy_checks/abi_tag_on_virtual.cpp
+++ b/libcxx/test/tools/clang_tidy_checks/abi_tag_on_virtual.cpp
@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang-tidy/ClangTidyCheck.h"
-#include "clang-tidy/ClangTidyModuleRegistry.h"
+#include "clang-tidy/ClangTidyModule.h"
 
 #include "abi_tag_on_virtual.hpp"
 
diff --git a/libcxx/test/tools/clang_tidy_checks/empty_namespaces.cpp b/libcxx/test/tools/clang_tidy_checks/empty_namespaces.cpp
index e176b29670ce9..7ccf6e3a910af 100644
--- a/libcxx/test/tools/clang_tidy_checks/empty_namespaces.cpp
+++ b/libcxx/test/tools/clang_tidy_checks/empty_namespaces.cpp
@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang-tidy/ClangTidyCheck.h"
-#include "clang-tidy/ClangTidyModuleRegistry.h"
+#include "clang-tidy/ClangTidyModule.h"
 
 #include "empty_namespaces.hpp"
 
diff --git a/libcxx/test/tools/clang_tidy_checks/header_exportable_declarations.cpp b/libcxx/test/tools/clang_tidy_checks/header_exportable_declarations.cpp
index 8ec029f7dba2d..24f8c1bf8caf3 100644
--- a/libcxx/test/tools/clang_tidy_checks/header_exportable_declarations.cpp
+++ b/libcxx/test/tools/clang_tidy_checks/header_exportable_declarations.cpp
@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang-tidy/ClangTidyCheck.h"
-#include "clang-tidy/ClangTidyModuleRegistry.h"
+#include "clang-tidy/ClangTidyModule.h"
 
 #include "llvm/ADT/ArrayRef.h"
 
diff --git a/libcxx/test/tools/clang_tidy_checks/hide_from_abi.cpp b/libcxx/test/tools/clang_tidy_checks/hide_from_abi.cpp
index f05470e47d3e7..cb0c6a33b8498 100644
--- a/libcxx/test/tools/clang_tidy_checks/hide_from_abi.cpp
+++ b/libcxx/test/tools/clang_tidy_checks/hide_from_abi.cpp
@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang-tidy/ClangTidyCheck.h"
-#include "clang-tidy/ClangTidyModuleRegistry.h"
+#include "clang-tidy/ClangTidyModule.h"
 
 #include "hide_from_abi.hpp"
 
diff --git a/libcxx/test/tools/clang_tidy_checks/libcpp_module.cpp b/libcxx/test/tools/clang_tidy_checks/libcpp_module.cpp
index b6298eefdeb44..b94989ca8c788 100644
--- a/libcxx/test/tools/clang_tidy_checks/libcpp_module.cpp
+++ b/libcxx/test/tools/clang_tidy_checks/libcpp_module.cpp
@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang-tidy/ClangTidyModule.h"
-#include "clang-tidy/ClangTidyModuleRegistry.h"
+#include "clang-tidy/ClangTidyModule.h"
 
 #include "abi_tag_on_virtual.hpp"
 #include "empty_namespaces.hpp"
diff --git a/libcxx/test/tools/clang_tidy_checks/robust_against_adl.cpp b/libcxx/test/tools/clang_tidy_checks/robust_against_adl.cpp
index 1bfe96b414b7c..a7e3f547d3ed8 100644
--- a/libcxx/test/tools/clang_tidy_checks/robust_against_adl.cpp
+++ b/libcxx/test/tools/clang_tidy_checks/robust_against_adl.cpp
@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang-tidy/ClangTidyCheck.h"
-#include "clang-tidy/ClangTidyModuleRegistry.h"
+#include "clang-tidy/ClangTidyModule.h"
 
 #include "robust_against_adl.hpp"
 
diff --git a/libcxx/test/tools/clang_tidy_checks/robust_against_operator_ampersand.cpp b/libcxx/test/tools/clang_tidy_checks/robust_against_operator_ampersand.cpp
index a608954aa2cc7..e94c95561f92f 100644
--- a/libcxx/test/tools/clang_tidy_checks/robust_against_operator_ampersand.cpp
+++ b/libcxx/test/tools/clang_tidy_checks/robust_against_operator_ampersand.cpp
@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang-tidy/ClangTidyCheck.h"
-#include "clang-tidy/ClangTidyModuleRegistry.h"
+#include "clang-tidy/ClangTidyModule.h"
 #include "clang/ASTMatchers/ASTMatchers.h"
 #include "clang/Tooling/FixIt.h"
 
diff --git a/libcxx/test/tools/clang_tidy_checks/uglify_attributes.cpp b/libcxx/test/tools/clang_tidy_checks/uglify_attributes.cpp
index 24bacde6304bc..aa325d9ba378f 100644
--- a/libcxx/test/tools/clang_tidy_checks/uglify_attributes.cpp
+++ b/libcxx/test/tools/clang_tidy_checks/uglify_attributes.cpp
@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang-tidy/ClangTidyCheck.h"
-#include "clang-tidy/ClangTidyModuleRegistry.h"
+#include "clang-tidy/ClangTidyModule.h"
 
 #include "uglify_attributes.hpp"
 #include "utilities.hpp"

>From b39d6dcc1677d373375ea74079991b674d73d5c1 Mon Sep 17 00:00:00 2001
From: Aiden Grossman <aidengrossman at google.com>
Date: Sun, 12 Jul 2026 19:53:28 +0000
Subject: [PATCH 2/5] fix

---
 libcxx/test/tools/clang_tidy_checks/abi_tag_on_virtual.cpp    | 4 ++++
 libcxx/test/tools/clang_tidy_checks/empty_namespaces.cpp      | 4 ++++
 .../clang_tidy_checks/header_exportable_declarations.cpp      | 4 ++++
 libcxx/test/tools/clang_tidy_checks/hide_from_abi.cpp         | 4 ++++
 libcxx/test/tools/clang_tidy_checks/libcpp_module.cpp         | 4 +++-
 libcxx/test/tools/clang_tidy_checks/robust_against_adl.cpp    | 4 ++++
 .../clang_tidy_checks/robust_against_operator_ampersand.cpp   | 4 ++++
 libcxx/test/tools/clang_tidy_checks/uglify_attributes.cpp     | 4 ++++
 8 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/libcxx/test/tools/clang_tidy_checks/abi_tag_on_virtual.cpp b/libcxx/test/tools/clang_tidy_checks/abi_tag_on_virtual.cpp
index 64dca4a08d62f..a45cc441943b8 100644
--- a/libcxx/test/tools/clang_tidy_checks/abi_tag_on_virtual.cpp
+++ b/libcxx/test/tools/clang_tidy_checks/abi_tag_on_virtual.cpp
@@ -7,7 +7,11 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang-tidy/ClangTidyCheck.h"
+#if CLANG_VERSION_MAJOR > 23
 #include "clang-tidy/ClangTidyModule.h"
+#else
+#include "clang-tidy/ClangTidyModuleRegistry.h"
+#endif
 
 #include "abi_tag_on_virtual.hpp"
 
diff --git a/libcxx/test/tools/clang_tidy_checks/empty_namespaces.cpp b/libcxx/test/tools/clang_tidy_checks/empty_namespaces.cpp
index 7ccf6e3a910af..5ea8b89bf6fc8 100644
--- a/libcxx/test/tools/clang_tidy_checks/empty_namespaces.cpp
+++ b/libcxx/test/tools/clang_tidy_checks/empty_namespaces.cpp
@@ -7,7 +7,11 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang-tidy/ClangTidyCheck.h"
+#if CLANG_VERSION_MAJOR > 23
 #include "clang-tidy/ClangTidyModule.h"
+#else
+#include "clang-tidy/ClangTidyModuleRegistry.h"
+#endif
 
 #include "empty_namespaces.hpp"
 
diff --git a/libcxx/test/tools/clang_tidy_checks/header_exportable_declarations.cpp b/libcxx/test/tools/clang_tidy_checks/header_exportable_declarations.cpp
index 24f8c1bf8caf3..66d75795dbf0f 100644
--- a/libcxx/test/tools/clang_tidy_checks/header_exportable_declarations.cpp
+++ b/libcxx/test/tools/clang_tidy_checks/header_exportable_declarations.cpp
@@ -7,7 +7,11 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang-tidy/ClangTidyCheck.h"
+#if CLANG_VERSION_MAJOR > 23
 #include "clang-tidy/ClangTidyModule.h"
+#else
+#include "clang-tidy/ClangTidyModuleRegistry.h"
+#endif
 
 #include "llvm/ADT/ArrayRef.h"
 
diff --git a/libcxx/test/tools/clang_tidy_checks/hide_from_abi.cpp b/libcxx/test/tools/clang_tidy_checks/hide_from_abi.cpp
index cb0c6a33b8498..75c9fe06b2420 100644
--- a/libcxx/test/tools/clang_tidy_checks/hide_from_abi.cpp
+++ b/libcxx/test/tools/clang_tidy_checks/hide_from_abi.cpp
@@ -7,7 +7,11 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang-tidy/ClangTidyCheck.h"
+#if CLANG_VERSION_MAJOR > 23
 #include "clang-tidy/ClangTidyModule.h"
+#else
+#include "clang-tidy/ClangTidyModuleRegistry.h"
+#endif
 
 #include "hide_from_abi.hpp"
 
diff --git a/libcxx/test/tools/clang_tidy_checks/libcpp_module.cpp b/libcxx/test/tools/clang_tidy_checks/libcpp_module.cpp
index b94989ca8c788..4724c04c08fd8 100644
--- a/libcxx/test/tools/clang_tidy_checks/libcpp_module.cpp
+++ b/libcxx/test/tools/clang_tidy_checks/libcpp_module.cpp
@@ -7,7 +7,9 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang-tidy/ClangTidyModule.h"
-#include "clang-tidy/ClangTidyModule.h"
+#if CLANG_VERSION_MAJOR < 23
+#include "clang-tidy/ClangTidyModuleRegistry.h"
+#endif
 
 #include "abi_tag_on_virtual.hpp"
 #include "empty_namespaces.hpp"
diff --git a/libcxx/test/tools/clang_tidy_checks/robust_against_adl.cpp b/libcxx/test/tools/clang_tidy_checks/robust_against_adl.cpp
index a7e3f547d3ed8..b1d1377e38d4c 100644
--- a/libcxx/test/tools/clang_tidy_checks/robust_against_adl.cpp
+++ b/libcxx/test/tools/clang_tidy_checks/robust_against_adl.cpp
@@ -7,7 +7,11 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang-tidy/ClangTidyCheck.h"
+#if CLANG_VERSION_MAJOR > 23
 #include "clang-tidy/ClangTidyModule.h"
+#else
+#include "clang-tidy/ClangTidyModuleRegistry.h"
+#endif
 
 #include "robust_against_adl.hpp"
 
diff --git a/libcxx/test/tools/clang_tidy_checks/robust_against_operator_ampersand.cpp b/libcxx/test/tools/clang_tidy_checks/robust_against_operator_ampersand.cpp
index e94c95561f92f..3a60327d3117b 100644
--- a/libcxx/test/tools/clang_tidy_checks/robust_against_operator_ampersand.cpp
+++ b/libcxx/test/tools/clang_tidy_checks/robust_against_operator_ampersand.cpp
@@ -7,7 +7,11 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang-tidy/ClangTidyCheck.h"
+#if CLANG_VERSION_MAJOR > 23
 #include "clang-tidy/ClangTidyModule.h"
+#else
+#include "clang-tidy/ClangTidyModuleRegistry.h"
+#endif
 #include "clang/ASTMatchers/ASTMatchers.h"
 #include "clang/Tooling/FixIt.h"
 
diff --git a/libcxx/test/tools/clang_tidy_checks/uglify_attributes.cpp b/libcxx/test/tools/clang_tidy_checks/uglify_attributes.cpp
index aa325d9ba378f..1b98f187c7c49 100644
--- a/libcxx/test/tools/clang_tidy_checks/uglify_attributes.cpp
+++ b/libcxx/test/tools/clang_tidy_checks/uglify_attributes.cpp
@@ -7,7 +7,11 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang-tidy/ClangTidyCheck.h"
+#if CLANG_VERSION_MAJOR > 23
 #include "clang-tidy/ClangTidyModule.h"
+#else
+#include "clang-tidy/ClangTidyModuleRegistry.h"
+#endif
 
 #include "uglify_attributes.hpp"
 #include "utilities.hpp"

>From f1cbae15a1ca638433098c7ef6251cf0b26f83c8 Mon Sep 17 00:00:00 2001
From: Aiden Grossman <aidengrossman at google.com>
Date: Sun, 12 Jul 2026 20:49:48 +0000
Subject: [PATCH 3/5] formatting

---
 libcxx/test/tools/clang_tidy_checks/abi_tag_on_virtual.cpp    | 4 ++--
 libcxx/test/tools/clang_tidy_checks/empty_namespaces.cpp      | 4 ++--
 .../clang_tidy_checks/header_exportable_declarations.cpp      | 4 ++--
 libcxx/test/tools/clang_tidy_checks/hide_from_abi.cpp         | 4 ++--
 libcxx/test/tools/clang_tidy_checks/libcpp_module.cpp         | 2 +-
 libcxx/test/tools/clang_tidy_checks/robust_against_adl.cpp    | 4 ++--
 .../clang_tidy_checks/robust_against_operator_ampersand.cpp   | 4 ++--
 libcxx/test/tools/clang_tidy_checks/uglify_attributes.cpp     | 4 ++--
 8 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/libcxx/test/tools/clang_tidy_checks/abi_tag_on_virtual.cpp b/libcxx/test/tools/clang_tidy_checks/abi_tag_on_virtual.cpp
index a45cc441943b8..16445b3b86f23 100644
--- a/libcxx/test/tools/clang_tidy_checks/abi_tag_on_virtual.cpp
+++ b/libcxx/test/tools/clang_tidy_checks/abi_tag_on_virtual.cpp
@@ -8,9 +8,9 @@
 
 #include "clang-tidy/ClangTidyCheck.h"
 #if CLANG_VERSION_MAJOR > 23
-#include "clang-tidy/ClangTidyModule.h"
+#  include "clang-tidy/ClangTidyModule.h"
 #else
-#include "clang-tidy/ClangTidyModuleRegistry.h"
+#  include "clang-tidy/ClangTidyModuleRegistry.h"
 #endif
 
 #include "abi_tag_on_virtual.hpp"
diff --git a/libcxx/test/tools/clang_tidy_checks/empty_namespaces.cpp b/libcxx/test/tools/clang_tidy_checks/empty_namespaces.cpp
index 5ea8b89bf6fc8..53dc4b74a965f 100644
--- a/libcxx/test/tools/clang_tidy_checks/empty_namespaces.cpp
+++ b/libcxx/test/tools/clang_tidy_checks/empty_namespaces.cpp
@@ -8,9 +8,9 @@
 
 #include "clang-tidy/ClangTidyCheck.h"
 #if CLANG_VERSION_MAJOR > 23
-#include "clang-tidy/ClangTidyModule.h"
+#  include "clang-tidy/ClangTidyModule.h"
 #else
-#include "clang-tidy/ClangTidyModuleRegistry.h"
+#  include "clang-tidy/ClangTidyModuleRegistry.h"
 #endif
 
 #include "empty_namespaces.hpp"
diff --git a/libcxx/test/tools/clang_tidy_checks/header_exportable_declarations.cpp b/libcxx/test/tools/clang_tidy_checks/header_exportable_declarations.cpp
index 66d75795dbf0f..bec3c1d2cd120 100644
--- a/libcxx/test/tools/clang_tidy_checks/header_exportable_declarations.cpp
+++ b/libcxx/test/tools/clang_tidy_checks/header_exportable_declarations.cpp
@@ -8,9 +8,9 @@
 
 #include "clang-tidy/ClangTidyCheck.h"
 #if CLANG_VERSION_MAJOR > 23
-#include "clang-tidy/ClangTidyModule.h"
+#  include "clang-tidy/ClangTidyModule.h"
 #else
-#include "clang-tidy/ClangTidyModuleRegistry.h"
+#  include "clang-tidy/ClangTidyModuleRegistry.h"
 #endif
 
 #include "llvm/ADT/ArrayRef.h"
diff --git a/libcxx/test/tools/clang_tidy_checks/hide_from_abi.cpp b/libcxx/test/tools/clang_tidy_checks/hide_from_abi.cpp
index 75c9fe06b2420..b4b3f0b9cfa68 100644
--- a/libcxx/test/tools/clang_tidy_checks/hide_from_abi.cpp
+++ b/libcxx/test/tools/clang_tidy_checks/hide_from_abi.cpp
@@ -8,9 +8,9 @@
 
 #include "clang-tidy/ClangTidyCheck.h"
 #if CLANG_VERSION_MAJOR > 23
-#include "clang-tidy/ClangTidyModule.h"
+#  include "clang-tidy/ClangTidyModule.h"
 #else
-#include "clang-tidy/ClangTidyModuleRegistry.h"
+#  include "clang-tidy/ClangTidyModuleRegistry.h"
 #endif
 
 #include "hide_from_abi.hpp"
diff --git a/libcxx/test/tools/clang_tidy_checks/libcpp_module.cpp b/libcxx/test/tools/clang_tidy_checks/libcpp_module.cpp
index 4724c04c08fd8..93d195ee89f27 100644
--- a/libcxx/test/tools/clang_tidy_checks/libcpp_module.cpp
+++ b/libcxx/test/tools/clang_tidy_checks/libcpp_module.cpp
@@ -8,7 +8,7 @@
 
 #include "clang-tidy/ClangTidyModule.h"
 #if CLANG_VERSION_MAJOR < 23
-#include "clang-tidy/ClangTidyModuleRegistry.h"
+#  include "clang-tidy/ClangTidyModuleRegistry.h"
 #endif
 
 #include "abi_tag_on_virtual.hpp"
diff --git a/libcxx/test/tools/clang_tidy_checks/robust_against_adl.cpp b/libcxx/test/tools/clang_tidy_checks/robust_against_adl.cpp
index b1d1377e38d4c..4cdabf3de7c90 100644
--- a/libcxx/test/tools/clang_tidy_checks/robust_against_adl.cpp
+++ b/libcxx/test/tools/clang_tidy_checks/robust_against_adl.cpp
@@ -8,9 +8,9 @@
 
 #include "clang-tidy/ClangTidyCheck.h"
 #if CLANG_VERSION_MAJOR > 23
-#include "clang-tidy/ClangTidyModule.h"
+#  include "clang-tidy/ClangTidyModule.h"
 #else
-#include "clang-tidy/ClangTidyModuleRegistry.h"
+#  include "clang-tidy/ClangTidyModuleRegistry.h"
 #endif
 
 #include "robust_against_adl.hpp"
diff --git a/libcxx/test/tools/clang_tidy_checks/robust_against_operator_ampersand.cpp b/libcxx/test/tools/clang_tidy_checks/robust_against_operator_ampersand.cpp
index 3a60327d3117b..919838abba615 100644
--- a/libcxx/test/tools/clang_tidy_checks/robust_against_operator_ampersand.cpp
+++ b/libcxx/test/tools/clang_tidy_checks/robust_against_operator_ampersand.cpp
@@ -8,9 +8,9 @@
 
 #include "clang-tidy/ClangTidyCheck.h"
 #if CLANG_VERSION_MAJOR > 23
-#include "clang-tidy/ClangTidyModule.h"
+#  include "clang-tidy/ClangTidyModule.h"
 #else
-#include "clang-tidy/ClangTidyModuleRegistry.h"
+#  include "clang-tidy/ClangTidyModuleRegistry.h"
 #endif
 #include "clang/ASTMatchers/ASTMatchers.h"
 #include "clang/Tooling/FixIt.h"
diff --git a/libcxx/test/tools/clang_tidy_checks/uglify_attributes.cpp b/libcxx/test/tools/clang_tidy_checks/uglify_attributes.cpp
index 1b98f187c7c49..7f86f815918cc 100644
--- a/libcxx/test/tools/clang_tidy_checks/uglify_attributes.cpp
+++ b/libcxx/test/tools/clang_tidy_checks/uglify_attributes.cpp
@@ -8,9 +8,9 @@
 
 #include "clang-tidy/ClangTidyCheck.h"
 #if CLANG_VERSION_MAJOR > 23
-#include "clang-tidy/ClangTidyModule.h"
+#  include "clang-tidy/ClangTidyModule.h"
 #else
-#include "clang-tidy/ClangTidyModuleRegistry.h"
+#  include "clang-tidy/ClangTidyModuleRegistry.h"
 #endif
 
 #include "uglify_attributes.hpp"

>From b9d3d989b98e5cd337a0cb08419979bbf1e34861 Mon Sep 17 00:00:00 2001
From: Aiden Grossman <aidengrossman at google.com>
Date: Mon, 13 Jul 2026 13:12:48 +0000
Subject: [PATCH 4/5] todo

---
 libcxx/test/tools/clang_tidy_checks/abi_tag_on_virtual.cpp       | 1 +
 libcxx/test/tools/clang_tidy_checks/empty_namespaces.cpp         | 1 +
 .../tools/clang_tidy_checks/header_exportable_declarations.cpp   | 1 +
 libcxx/test/tools/clang_tidy_checks/hide_from_abi.cpp            | 1 +
 libcxx/test/tools/clang_tidy_checks/libcpp_module.cpp            | 1 +
 libcxx/test/tools/clang_tidy_checks/robust_against_adl.cpp       | 1 +
 .../clang_tidy_checks/robust_against_operator_ampersand.cpp      | 1 +
 libcxx/test/tools/clang_tidy_checks/uglify_attributes.cpp        | 1 +
 8 files changed, 8 insertions(+)

diff --git a/libcxx/test/tools/clang_tidy_checks/abi_tag_on_virtual.cpp b/libcxx/test/tools/clang_tidy_checks/abi_tag_on_virtual.cpp
index 16445b3b86f23..f5f9ce6bee253 100644
--- a/libcxx/test/tools/clang_tidy_checks/abi_tag_on_virtual.cpp
+++ b/libcxx/test/tools/clang_tidy_checks/abi_tag_on_virtual.cpp
@@ -7,6 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang-tidy/ClangTidyCheck.h"
+// TODO(boomanaiden154): Remove this compatibility check when LLVM 25 branches.
 #if CLANG_VERSION_MAJOR > 23
 #  include "clang-tidy/ClangTidyModule.h"
 #else
diff --git a/libcxx/test/tools/clang_tidy_checks/empty_namespaces.cpp b/libcxx/test/tools/clang_tidy_checks/empty_namespaces.cpp
index 53dc4b74a965f..f28cb0ab40c62 100644
--- a/libcxx/test/tools/clang_tidy_checks/empty_namespaces.cpp
+++ b/libcxx/test/tools/clang_tidy_checks/empty_namespaces.cpp
@@ -7,6 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang-tidy/ClangTidyCheck.h"
+// TODO(boomanaiden154): Remove this compatibility check when LLVM 25 branches.
 #if CLANG_VERSION_MAJOR > 23
 #  include "clang-tidy/ClangTidyModule.h"
 #else
diff --git a/libcxx/test/tools/clang_tidy_checks/header_exportable_declarations.cpp b/libcxx/test/tools/clang_tidy_checks/header_exportable_declarations.cpp
index bec3c1d2cd120..86e3ce6af60d3 100644
--- a/libcxx/test/tools/clang_tidy_checks/header_exportable_declarations.cpp
+++ b/libcxx/test/tools/clang_tidy_checks/header_exportable_declarations.cpp
@@ -7,6 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang-tidy/ClangTidyCheck.h"
+// TODO(boomanaiden154): Remove this compatibility check when LLVM 25 branches.
 #if CLANG_VERSION_MAJOR > 23
 #  include "clang-tidy/ClangTidyModule.h"
 #else
diff --git a/libcxx/test/tools/clang_tidy_checks/hide_from_abi.cpp b/libcxx/test/tools/clang_tidy_checks/hide_from_abi.cpp
index b4b3f0b9cfa68..ab533d9b35f61 100644
--- a/libcxx/test/tools/clang_tidy_checks/hide_from_abi.cpp
+++ b/libcxx/test/tools/clang_tidy_checks/hide_from_abi.cpp
@@ -7,6 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang-tidy/ClangTidyCheck.h"
+// TODO(boomanaiden154): Remove this compatibility check when LLVM 25 branches.
 #if CLANG_VERSION_MAJOR > 23
 #  include "clang-tidy/ClangTidyModule.h"
 #else
diff --git a/libcxx/test/tools/clang_tidy_checks/libcpp_module.cpp b/libcxx/test/tools/clang_tidy_checks/libcpp_module.cpp
index 93d195ee89f27..bc4315aedaa1b 100644
--- a/libcxx/test/tools/clang_tidy_checks/libcpp_module.cpp
+++ b/libcxx/test/tools/clang_tidy_checks/libcpp_module.cpp
@@ -7,6 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang-tidy/ClangTidyModule.h"
+// TODO(boomanaiden154): Remove this compatibility check when LLVM 25 branches.
 #if CLANG_VERSION_MAJOR < 23
 #  include "clang-tidy/ClangTidyModuleRegistry.h"
 #endif
diff --git a/libcxx/test/tools/clang_tidy_checks/robust_against_adl.cpp b/libcxx/test/tools/clang_tidy_checks/robust_against_adl.cpp
index 4cdabf3de7c90..a5ab6684fd7b2 100644
--- a/libcxx/test/tools/clang_tidy_checks/robust_against_adl.cpp
+++ b/libcxx/test/tools/clang_tidy_checks/robust_against_adl.cpp
@@ -7,6 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang-tidy/ClangTidyCheck.h"
+// TODO(boomanaiden154): Remove this compatibility check when LLVM 25 branches.
 #if CLANG_VERSION_MAJOR > 23
 #  include "clang-tidy/ClangTidyModule.h"
 #else
diff --git a/libcxx/test/tools/clang_tidy_checks/robust_against_operator_ampersand.cpp b/libcxx/test/tools/clang_tidy_checks/robust_against_operator_ampersand.cpp
index 919838abba615..d470d8ad22d88 100644
--- a/libcxx/test/tools/clang_tidy_checks/robust_against_operator_ampersand.cpp
+++ b/libcxx/test/tools/clang_tidy_checks/robust_against_operator_ampersand.cpp
@@ -7,6 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang-tidy/ClangTidyCheck.h"
+// TODO(boomanaiden154): Remove this compatibility check when LLVM 25 branches.
 #if CLANG_VERSION_MAJOR > 23
 #  include "clang-tidy/ClangTidyModule.h"
 #else
diff --git a/libcxx/test/tools/clang_tidy_checks/uglify_attributes.cpp b/libcxx/test/tools/clang_tidy_checks/uglify_attributes.cpp
index 7f86f815918cc..d7d377845101a 100644
--- a/libcxx/test/tools/clang_tidy_checks/uglify_attributes.cpp
+++ b/libcxx/test/tools/clang_tidy_checks/uglify_attributes.cpp
@@ -7,6 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang-tidy/ClangTidyCheck.h"
+// TODO(boomanaiden154): Remove this compatibility check when LLVM 25 branches.
 #if CLANG_VERSION_MAJOR > 23
 #  include "clang-tidy/ClangTidyModule.h"
 #else

>From ac040ede0dff5d2a7341b4d9afce332962eb4ce8 Mon Sep 17 00:00:00 2001
From: Aiden Grossman <aidengrossman at google.com>
Date: Mon, 13 Jul 2026 13:41:13 +0000
Subject: [PATCH 5/5] format

---
 libcxx/test/tools/clang_tidy_checks/abi_tag_on_virtual.cpp      | 2 +-
 libcxx/test/tools/clang_tidy_checks/empty_namespaces.cpp        | 2 +-
 .../tools/clang_tidy_checks/header_exportable_declarations.cpp  | 2 +-
 libcxx/test/tools/clang_tidy_checks/hide_from_abi.cpp           | 2 +-
 libcxx/test/tools/clang_tidy_checks/libcpp_module.cpp           | 2 +-
 libcxx/test/tools/clang_tidy_checks/robust_against_adl.cpp      | 2 +-
 .../clang_tidy_checks/robust_against_operator_ampersand.cpp     | 2 +-
 libcxx/test/tools/clang_tidy_checks/uglify_attributes.cpp       | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/libcxx/test/tools/clang_tidy_checks/abi_tag_on_virtual.cpp b/libcxx/test/tools/clang_tidy_checks/abi_tag_on_virtual.cpp
index f5f9ce6bee253..0d03574af68e7 100644
--- a/libcxx/test/tools/clang_tidy_checks/abi_tag_on_virtual.cpp
+++ b/libcxx/test/tools/clang_tidy_checks/abi_tag_on_virtual.cpp
@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang-tidy/ClangTidyCheck.h"
-// TODO(boomanaiden154): Remove this compatibility check when LLVM 25 branches.
+// TODO(LLVM 25): Remove this compatibility check when LLVM 25 branches.
 #if CLANG_VERSION_MAJOR > 23
 #  include "clang-tidy/ClangTidyModule.h"
 #else
diff --git a/libcxx/test/tools/clang_tidy_checks/empty_namespaces.cpp b/libcxx/test/tools/clang_tidy_checks/empty_namespaces.cpp
index f28cb0ab40c62..d31c1da44b527 100644
--- a/libcxx/test/tools/clang_tidy_checks/empty_namespaces.cpp
+++ b/libcxx/test/tools/clang_tidy_checks/empty_namespaces.cpp
@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang-tidy/ClangTidyCheck.h"
-// TODO(boomanaiden154): Remove this compatibility check when LLVM 25 branches.
+// TODO(LLVM 25): Remove this compatibility check when LLVM 25 branches.
 #if CLANG_VERSION_MAJOR > 23
 #  include "clang-tidy/ClangTidyModule.h"
 #else
diff --git a/libcxx/test/tools/clang_tidy_checks/header_exportable_declarations.cpp b/libcxx/test/tools/clang_tidy_checks/header_exportable_declarations.cpp
index 86e3ce6af60d3..5273b1d7564ce 100644
--- a/libcxx/test/tools/clang_tidy_checks/header_exportable_declarations.cpp
+++ b/libcxx/test/tools/clang_tidy_checks/header_exportable_declarations.cpp
@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang-tidy/ClangTidyCheck.h"
-// TODO(boomanaiden154): Remove this compatibility check when LLVM 25 branches.
+// TODO(LLVM 25): Remove this compatibility check when LLVM 25 branches.
 #if CLANG_VERSION_MAJOR > 23
 #  include "clang-tidy/ClangTidyModule.h"
 #else
diff --git a/libcxx/test/tools/clang_tidy_checks/hide_from_abi.cpp b/libcxx/test/tools/clang_tidy_checks/hide_from_abi.cpp
index ab533d9b35f61..878290fde1271 100644
--- a/libcxx/test/tools/clang_tidy_checks/hide_from_abi.cpp
+++ b/libcxx/test/tools/clang_tidy_checks/hide_from_abi.cpp
@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang-tidy/ClangTidyCheck.h"
-// TODO(boomanaiden154): Remove this compatibility check when LLVM 25 branches.
+// TODO(LLVM 25): Remove this compatibility check when LLVM 25 branches.
 #if CLANG_VERSION_MAJOR > 23
 #  include "clang-tidy/ClangTidyModule.h"
 #else
diff --git a/libcxx/test/tools/clang_tidy_checks/libcpp_module.cpp b/libcxx/test/tools/clang_tidy_checks/libcpp_module.cpp
index bc4315aedaa1b..31415db2955b2 100644
--- a/libcxx/test/tools/clang_tidy_checks/libcpp_module.cpp
+++ b/libcxx/test/tools/clang_tidy_checks/libcpp_module.cpp
@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang-tidy/ClangTidyModule.h"
-// TODO(boomanaiden154): Remove this compatibility check when LLVM 25 branches.
+// TODO(LLVM 25): Remove this compatibility check when LLVM 25 branches.
 #if CLANG_VERSION_MAJOR < 23
 #  include "clang-tidy/ClangTidyModuleRegistry.h"
 #endif
diff --git a/libcxx/test/tools/clang_tidy_checks/robust_against_adl.cpp b/libcxx/test/tools/clang_tidy_checks/robust_against_adl.cpp
index a5ab6684fd7b2..72852625b12e9 100644
--- a/libcxx/test/tools/clang_tidy_checks/robust_against_adl.cpp
+++ b/libcxx/test/tools/clang_tidy_checks/robust_against_adl.cpp
@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang-tidy/ClangTidyCheck.h"
-// TODO(boomanaiden154): Remove this compatibility check when LLVM 25 branches.
+// TODO(LLVM 25): Remove this compatibility check when LLVM 25 branches.
 #if CLANG_VERSION_MAJOR > 23
 #  include "clang-tidy/ClangTidyModule.h"
 #else
diff --git a/libcxx/test/tools/clang_tidy_checks/robust_against_operator_ampersand.cpp b/libcxx/test/tools/clang_tidy_checks/robust_against_operator_ampersand.cpp
index d470d8ad22d88..777dd6fe11df5 100644
--- a/libcxx/test/tools/clang_tidy_checks/robust_against_operator_ampersand.cpp
+++ b/libcxx/test/tools/clang_tidy_checks/robust_against_operator_ampersand.cpp
@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang-tidy/ClangTidyCheck.h"
-// TODO(boomanaiden154): Remove this compatibility check when LLVM 25 branches.
+// TODO(LLVM 25): Remove this compatibility check when LLVM 25 branches.
 #if CLANG_VERSION_MAJOR > 23
 #  include "clang-tidy/ClangTidyModule.h"
 #else
diff --git a/libcxx/test/tools/clang_tidy_checks/uglify_attributes.cpp b/libcxx/test/tools/clang_tidy_checks/uglify_attributes.cpp
index d7d377845101a..803e877a68687 100644
--- a/libcxx/test/tools/clang_tidy_checks/uglify_attributes.cpp
+++ b/libcxx/test/tools/clang_tidy_checks/uglify_attributes.cpp
@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang-tidy/ClangTidyCheck.h"
-// TODO(boomanaiden154): Remove this compatibility check when LLVM 25 branches.
+// TODO(LLVM 25): Remove this compatibility check when LLVM 25 branches.
 #if CLANG_VERSION_MAJOR > 23
 #  include "clang-tidy/ClangTidyModule.h"
 #else

More information about the libcxx-commits mailing list