Remove MachineFunctionAnalysisInfoMixin

Author: paperchalice

llvm/include/llvm/CodeGen/MachinePassManager.h

@@ -55,19 +55,6 @@ struct MachinePassInfoMixin : public PassInfoMixin<DerivedT> {
   }
 };
 
-/// A CRTP mix-in that provides informational APIs needed for MachineFunction
-/// analysis passes. See also \c PassInfoMixin.
-template <typename DerivedT>
-struct MachineFunctionAnalysisInfoMixin
-    : public MachinePassInfoMixin<DerivedT> {
-  static AnalysisKey *ID() {
-    static_assert(
-        std::is_base_of<MachineFunctionAnalysisInfoMixin, DerivedT>::value,
-        "Must pass the derived type as the template argument!");
-    return &DerivedT::Key;
-  }
-};
-
 /// An AnalysisManager<MachineFunction> that also exposes IR analysis results.
 class MachineFunctionAnalysisManager : public AnalysisManager<MachineFunction> {
 public:
@@ -192,7 +179,8 @@ class MachineFunctionPassManager
     addRunOnModule<PassT>(P);
   }
 
-  // Avoid diamond problem.
+  // Avoid diamond problem. Both MachinePassInfoMixin and PassManager inherit
+  // PassInfoMixin.
   static MachineFunctionProperties getRequiredProperties() {
     return MachineFunctionProperties();
   }

llvm/include/llvm/CodeGen/MachinePassManagerInternal.h

@@ -41,9 +41,9 @@ struct PassConcept<MachineFunction, MachineFunctionAnalysisManager>
       : RequiredProperties(RequiredProperties), SetProperties(SetProperties),
         ClearedProperties(ClearedProperties) {}
 
-  MachineFunctionProperties RequiredProperties;
-  MachineFunctionProperties SetProperties;
-  MachineFunctionProperties ClearedProperties;
+  MachineFunctionProperties RequiredProperties = MachineFunctionProperties();
+  MachineFunctionProperties SetProperties = MachineFunctionProperties();
+  MachineFunctionProperties ClearedProperties = MachineFunctionProperties();
 };
 
 template <typename IRUnitT, typename PassT, typename PreservedAnalysesT,

llvm/include/llvm/IR/PassManager.h

@@ -1299,7 +1299,7 @@ struct RequireAnalysisPass
   }
   static bool isRequired() { return true; }
 
-  // MachineFunctionPass interface, define Define these separately to prevent
+  // MachineFunctionPass interface, define them separately to prevent
   // dependency on CodeGen
   template <typename MachineFunctionT = IRUnitT,
             typename MachineFunctionPropertiesT = MachineFunctionProperties,
@@ -1352,31 +1352,19 @@ struct InvalidateAnalysisPass
     OS << "invalidate<" << PassName << '>';
   }
 
-  // MachineFunctionPass interface, define Define these separately to prevent
+  // MachineFunctionPass interface, define them separately to prevent
   // dependency on CodeGen
-  template <typename MachineFunctionPropertiesT = MachineFunctionProperties,
-            typename MachineFunctionAnalysisT = AnalysisT,
-            typename = std::enable_if_t<std::is_base_of_v<
-                MachineFunctionAnalysisInfoMixin<MachineFunctionAnalysisT>,
-                MachineFunctionAnalysisT>>>
+  template <typename MachineFunctionPropertiesT = MachineFunctionProperties>
   static MachineFunctionPropertiesT getRequiredProperties() {
     return MachineFunctionPropertiesT();
   }
 
-  template <typename MachineFunctionPropertiesT = MachineFunctionProperties,
-            typename MachineFunctionAnalysisT = AnalysisT,
-            typename = std::enable_if_t<std::is_base_of_v<
-                MachineFunctionAnalysisInfoMixin<MachineFunctionAnalysisT>,
-                MachineFunctionAnalysisT>>>
+  template <typename MachineFunctionPropertiesT = MachineFunctionProperties>
   static MachineFunctionPropertiesT getSetProperties() {
     return MachineFunctionPropertiesT();
   }
 
-  template <typename MachineFunctionPropertiesT = MachineFunctionProperties,
-            typename MachineFunctionAnalysisT = AnalysisT,
-            typename = std::enable_if_t<std::is_base_of_v<
-                MachineFunctionAnalysisInfoMixin<MachineFunctionAnalysisT>,
-                MachineFunctionAnalysisT>>>
+  template <typename MachineFunctionPropertiesT = MachineFunctionProperties>
   static MachineFunctionPropertiesT getClearedProperties() {
     return MachineFunctionPropertiesT();
   }

llvm/unittests/CodeGen/PassManagerTest.cpp

@@ -52,7 +52,7 @@ class TestFunctionAnalysis : public AnalysisInfoMixin<TestFunctionAnalysis> {
 AnalysisKey TestFunctionAnalysis::Key;
 
 class TestMachineFunctionAnalysis
-    : public MachineFunctionAnalysisInfoMixin<TestMachineFunctionAnalysis> {
+    : public AnalysisInfoMixin<TestMachineFunctionAnalysis> {
 public:
   struct Result {
     Result(int Count) : InstructionCount(Count) {}
@@ -70,7 +70,7 @@ class TestMachineFunctionAnalysis
   }
 
 private:
-  friend MachineFunctionAnalysisInfoMixin<TestMachineFunctionAnalysis>;
+  friend AnalysisInfoMixin<TestMachineFunctionAnalysis>;
   static AnalysisKey Key;
 };
 

llvm/unittests/MIR/PassBuilderCallbacksTest.cpp

@@ -174,8 +174,8 @@ struct MockPassInstrumentationCallbacks {
 
 template <typename DerivedT> class MockAnalysisHandleBase {
 public:
-  class Analysis : public MachineFunctionAnalysisInfoMixin<Analysis> {
-    friend MachineFunctionAnalysisInfoMixin<Analysis>;
+  class Analysis : public AnalysisInfoMixin<Analysis> {
+    friend AnalysisInfoMixin<Analysis>;
     friend MockAnalysisHandleBase;
     static AnalysisKey Key;