Update llvm/test/tools/llc/new-pm/machine-function-properties.mir

Co-authored-by: Matt Arsenault <[email protected]>

Author: paperchalice

llvm/include/llvm/CodeGen/MachinePassManager.h

@@ -87,6 +87,12 @@ struct MachinePassInfoMixin : public PassInfoMixin<DerivedT> {
         MF.getProperties().reset(DerivedT::getClearedProperties());
     }
   };
+
+  PreservedAnalyses run(MachineFunction &MF,
+                        MachineFunctionAnalysisManager &MFAM) {
+    PropertyChanger PC(MF);
+    return static_cast<DerivedT *>(this)->run(MF, MFAM);
+  }
 };
 
 using MachineFunctionAnalysisManagerModuleProxy =
@@ -210,6 +216,27 @@ createModuleToMachineFunctionPassAdaptor(MachineFunctionPassT &&Pass) {
           new PassModelT(std::forward<MachineFunctionPassT>(Pass))));
 }
 
+template <>
+template <typename PassT>
+std::enable_if_t<!std::is_same<PassT, PassManager<MachineFunction>>::value>
+PassManager<MachineFunction>::addPass(PassT &&Pass) {
+  using PassModelT =
+      detail::PassModel<MachineFunction, PassT, MachineFunctionAnalysisManager>;
+  using MachineFunctionPassModelT =
+      detail::PassModel<MachineFunction, MachinePassInfoMixin<PassT>,
+                        MachineFunctionAnalysisManager>;
+  // Do not use make_unique or emplace_back, they cause too many template
+  // instantiations, causing terrible compile times.
+  if constexpr (std::is_base_of_v<MachinePassInfoMixin<PassT>, PassT>) {
+    Passes.push_back(
+        std::unique_ptr<PassConceptT>(new MachineFunctionPassModelT(
+            std::forward<MachinePassInfoMixin<PassT>>(Pass))));
+  } else {
+    Passes.push_back(
+        std::unique_ptr<PassConceptT>(new PassModelT(std::forward(Pass))));
+  }
+}
+
 template <>
 PreservedAnalyses
 PassManager<MachineFunction>::run(MachineFunction &,

llvm/lib/Passes/PassBuilder.cpp

@@ -371,7 +371,6 @@ class RequireAllMachineFunctionPropertiesPass
     : public MachinePassInfoMixin<RequireAllMachineFunctionPropertiesPass> {
 public:
   PreservedAnalyses run(MachineFunction &MF, MachineFunctionAnalysisManager &) {
-    PropertyChanger PC(MF);
     return PreservedAnalyses::none();
   }
 

llvm/test/tools/llc/new-pm/machine-function-properties.mir

@@ -1,5 +1,5 @@
 # REQUIRES: asserts
-# RUN: not --crash llc -mtriple=x86_64-pc-linux-gnu -x mir -passes=require-all-machine-function-properties -filetype=null < %s 2>&1 | FileCheck %s
+# RUN: not --crash llc -mtriple=x86_64-pc-linux-gnu -passes=require-all-machine-function-properties -filetype=null %s 2>&1 | FileCheck %s
 
 # CHECK: MachineFunctionProperties required by RequireAllMachineFunctionPropertiesPass pass are not met by function f.