[llvm] [PassManager] Make PassInfoMixin/AnalysisInfoMixin inherit from detail::InfoMixin (PR #196130)

[Arthur Eubanks via llvm-commits]

https://github.com/aeubanks created https://github.com/llvm/llvm-project/pull/196130

AnalysisInfoMixin just needs `name()`, not the other pass-specific stuff.

Fix one pass that accidentally inherited from AnalysisInfoMixin.

>From 9f9857a20ec2b0da6b180d6e542aacedf74508fe Mon Sep 17 00:00:00 2001
From: Arthur Eubanks <aeubanks at google.com>
Date: Wed, 6 May 2026 17:29:37 +0000
Subject: [PATCH] [PassManager] Make PassInfoMixin/AnalysisInfoMixin inherit
 from detail::InfoMixin

AnalysisInfoMixin just needs `name()`, not the other pass-specific stuff.

Fix one pass that accidentally inherited from AnalysisInfoMixin.
---
 .../llvm/CodeGen/RegUsageInfoCollector.h      |  2 +-
 llvm/include/llvm/IR/PassManager.h            | 27 +++++++++++--------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/llvm/include/llvm/CodeGen/RegUsageInfoCollector.h b/llvm/include/llvm/CodeGen/RegUsageInfoCollector.h
index 6b88cc4f99089..b4ac0384a7d62 100644
--- a/llvm/include/llvm/CodeGen/RegUsageInfoCollector.h
+++ b/llvm/include/llvm/CodeGen/RegUsageInfoCollector.h
@@ -14,7 +14,7 @@
 namespace llvm {
 
 class RegUsageInfoCollectorPass
-    : public AnalysisInfoMixin<RegUsageInfoCollectorPass> {
+    : public RequiredPassInfoMixin<RegUsageInfoCollectorPass> {
 public:
   PreservedAnalyses run(MachineFunction &MF,
                         MachineFunctionAnalysisManager &MFAM);
diff --git a/llvm/include/llvm/IR/PassManager.h b/llvm/include/llvm/IR/PassManager.h
index 3dd8440c9961b..7d9254e7d8e98 100644
--- a/llvm/include/llvm/IR/PassManager.h
+++ b/llvm/include/llvm/IR/PassManager.h
@@ -57,6 +57,19 @@
 
 namespace llvm {
 
+namespace detail {
+template <typename DerivedT> struct InfoMixin {
+  /// Gets the name of the pass we are mixed into.
+  static StringRef name() {
+    static_assert(std::is_base_of<InfoMixin, DerivedT>::value,
+                  "Must pass the derived type as the template argument!");
+    StringRef Name = getTypeName<DerivedT>();
+    Name.consume_front("llvm::");
+    return Name;
+  }
+};
+} // namespace detail
+
 class Function;
 class Module;
 
@@ -72,16 +85,8 @@ template <typename IRUnitT, typename... ExtraArgTs> class AnalysisManager;
 /// OptionalPassInfoMixin.
 ///
 /// TODO: move to a detail namespace once we've branched for LLVM 23.
-template <typename DerivedT> struct PassInfoMixin {
-  /// Gets the name of the pass we are mixed into.
-  static StringRef name() {
-    static_assert(std::is_base_of<PassInfoMixin, DerivedT>::value,
-                  "Must pass the derived type as the template argument!");
-    StringRef Name = getTypeName<DerivedT>();
-    Name.consume_front("llvm::");
-    return Name;
-  }
-
+template <typename DerivedT>
+struct PassInfoMixin : detail::InfoMixin<DerivedT> {
   void printPipeline(raw_ostream &OS,
                      function_ref<StringRef(StringRef)> MapClassName2PassName) {
     StringRef ClassName = DerivedT::name();
@@ -110,7 +115,7 @@ struct OptionalPassInfoMixin : PassInfoMixin<DerivedT> {
 /// This provides some boilerplate for types that are analysis passes. It
 /// automatically mixes in \c PassInfoMixin.
 template <typename DerivedT>
-struct AnalysisInfoMixin : OptionalPassInfoMixin<DerivedT> {
+struct AnalysisInfoMixin : detail::InfoMixin<DerivedT> {
   /// Returns an opaque, unique ID for this analysis type.
   ///
   /// This ID is a pointer type that is guaranteed to be 8-byte aligned and thus