[CodeGen] Align pass manager ownership

3 files changed, 14 insertions, 14 deletions

diff --git a/backend/unittests/CodeGen/GlobalISel/InstructionSelectTest.cpp b/backend/unittests/CodeGen/GlobalISel/InstructionSelectTest.cpp
index e98f121..30c2b89 100644
--- a/backend/unittests/CodeGen/GlobalISel/InstructionSelectTest.cpp
+++ b/backend/unittests/CodeGen/GlobalISel/InstructionSelectTest.cpp
@@ -120,7 +120,7 @@ void testPipeline(TestContext &Context) {
   Fixture.Function->properties() = {rcc::MachineFunctionProperty::IsSSA,
                                     rcc::MachineFunctionProperty::TracksLiveness};
   const rcc::riscv::RISCVSubtarget Subtarget(rcc::riscv::RISCVSubtargetFeatures::rv64gc());
-  rcc::MachinePassManager Pipeline;
+  rcc::MachineFunctionPassManager Pipeline;
   Context.expect(
       Pipeline.addPass(std::make_unique<rcc::Legalizer>(Subtarget.getLegalizerInfo())).has_value(),
       "legalizer must be accepted by the pass manager");
@@ -131,7 +131,7 @@ void testPipeline(TestContext &Context) {
       Pipeline.addPass(std::make_unique<rcc::InstructionSelect>(Subtarget.getInstructionSelector()))
           .has_value(),
       "instruction selector must be accepted by the pass manager");
-  rcc::MachineAnalysisManager Analyses;
+  rcc::MachineFunctionAnalysisManager Analyses;
   auto Run = Pipeline.run(*Fixture.Function, *Target, Analyses);
   Context.expect(Run.has_value(), "RV64GC generic pipeline must complete");
   Context.expect(Fixture.Function->properties().has(rcc::MachineFunctionProperty::Selected),
@@ -167,7 +167,7 @@ void testInstructionSelectionTransaction(TestContext &Context) {
                                     rcc::MachineFunctionProperty::RegBankSelected};
   MutatingFailingSelector Selector;
   rcc::InstructionSelect Pass(Selector);
-  rcc::MachineAnalysisManager Analyses;
+  rcc::MachineFunctionAnalysisManager Analyses;
   auto Run = Pass.run(*Fixture.Function, *Target, Analyses);
   Context.expect(!Run && Run.error().code() == rcc::ErrorCode::Unsupported,
                  "a renderer failure must be reported before publication");
@@ -203,7 +203,7 @@ void testInstructionSelectionOrder(TestContext &Context) {
   const rcc::riscv::RISCVSubtarget Subtarget(rcc::riscv::RISCVSubtargetFeatures::rv64gc());
   RecordingSelector Selector(*Subtarget.getInstructionSelector());
   rcc::InstructionSelect Pass(Selector);
-  rcc::MachineAnalysisManager Analyses;
+  rcc::MachineFunctionAnalysisManager Analyses;
   auto Run = Pass.run(*Fixture.Function, *Target, Analyses);
   Context.expect(Run.has_value(), "recorded instruction selection must complete");
   std::ranges::reverse(LayoutIDs);
@@ -233,7 +233,7 @@ void testInstructionSelectionWorklist(TestContext &Context) {
                                     rcc::MachineFunctionProperty::RegBankSelected};
   TwoStepSelector Selector;
   rcc::InstructionSelect Pass(Selector);
-  rcc::MachineAnalysisManager Analyses;
+  rcc::MachineFunctionAnalysisManager Analyses;
   auto Run = Pass.run(*Fixture.Function, *Target, Analyses);
   Context.expect(Run.has_value(), "a progressing multi-step selection must complete");
   Context.expect(Selector.selections() == 4,
@@ -326,7 +326,7 @@ void testExtendedRV64GCPipeline(TestContext &Context) {
   Fixture.Function->properties() = {rcc::MachineFunctionProperty::IsSSA,
                                     rcc::MachineFunctionProperty::TracksLiveness};
   const rcc::riscv::RISCVSubtarget Subtarget(rcc::riscv::RISCVSubtargetFeatures::rv64gc());
-  rcc::MachinePassManager Pipeline;
+  rcc::MachineFunctionPassManager Pipeline;
   if (!Pipeline.addPass(std::make_unique<rcc::Legalizer>(Subtarget.getLegalizerInfo())) ||
       !Pipeline.addPass(std::make_unique<rcc::RegBankSelect>(Subtarget.getRegBankInfo())) ||
       !Pipeline.addPass(
@@ -334,7 +334,7 @@ void testExtendedRV64GCPipeline(TestContext &Context) {
     Context.expect(false, "extended RV64GC pipeline construction must succeed");
     return;
   }
-  rcc::MachineAnalysisManager Analyses;
+  rcc::MachineFunctionAnalysisManager Analyses;
   auto Run = Pipeline.run(*Fixture.Function, *Target, Analyses);
   Context.expect(Run.has_value(), "extended RV64GC pipeline must complete");
   Context.expect(Run && Fixture.Function->properties().has(rcc::MachineFunctionProperty::Selected),
diff --git a/backend/unittests/CodeGen/GlobalISel/LegalizerTest.cpp b/backend/unittests/CodeGen/GlobalISel/LegalizerTest.cpp
index 9cb8a67..b191a3f 100644
--- a/backend/unittests/CodeGen/GlobalISel/LegalizerTest.cpp
+++ b/backend/unittests/CodeGen/GlobalISel/LegalizerTest.cpp
@@ -73,7 +73,7 @@ void testNullAndMissingContracts(TestContext &Context) {
     return;
 
   rcc::Legalizer NullPass(nullptr);
-  rcc::MachineAnalysisManager Analyses;
+  rcc::MachineFunctionAnalysisManager Analyses;
   auto NullResult = NullPass.run(*Fixture.Function, *Target, Analyses);
   Context.expect(!NullResult && NullResult.error().code() == rcc::ErrorCode::InvalidArgument,
                  "a null legalizer interface must be rejected");
@@ -117,12 +117,12 @@ void testUnsupportedRollback(TestContext &Context) {
   Unsupported.Function->properties() = {rcc::MachineFunctionProperty::IsSSA,
                                         rcc::MachineFunctionProperty::TracksLiveness};
   const rcc::riscv::RISCVSubtarget Subtarget(rcc::riscv::RISCVSubtargetFeatures::rv64gc());
-  rcc::MachinePassManager OnlyLegalizer;
+  rcc::MachineFunctionPassManager OnlyLegalizer;
   Context.expect(
       OnlyLegalizer.addPass(std::make_unique<rcc::Legalizer>(Subtarget.getLegalizerInfo()))
           .has_value(),
       "standalone legalizer must be accepted");
-  rcc::MachineAnalysisManager UnsupportedAnalyses;
+  rcc::MachineFunctionAnalysisManager UnsupportedAnalyses;
   auto Failure = OnlyLegalizer.run(*Unsupported.Function, *Target, UnsupportedAnalyses);
   Context.expect(!Failure && Failure.error().code() == rcc::ErrorCode::Unsupported,
                  "unsupported generic instructions must produce a target diagnostic");
@@ -152,7 +152,7 @@ void testLegalizerCycleDiagnostic(TestContext &Context) {
                                     rcc::MachineFunctionProperty::TracksLiveness};
   TogglingLegalizer Legalizer;
   rcc::Legalizer StablePass(Legalizer);
-  rcc::MachineAnalysisManager Analyses;
+  rcc::MachineFunctionAnalysisManager Analyses;
   auto ResultRun = StablePass.run(*Fixture.Function, *Target, Analyses);
   Context.expect(!ResultRun && ResultRun.error().code() == rcc::ErrorCode::InternalError,
                  "repeated legalization states must report InternalError");
@@ -188,7 +188,7 @@ void testLegalizerRevisitsInvalidatedInstructions(TestContext &Context) {
                                     rcc::MachineFunctionProperty::TracksLiveness};
   BackwardInvalidatingLegalizer Legalizer;
   rcc::Legalizer Pass(Legalizer);
-  rcc::MachineAnalysisManager Analyses;
+  rcc::MachineFunctionAnalysisManager Analyses;
   auto Run = Pass.run(*Fixture.Function, *Target, Analyses);
   const rcc::Opcode LegalOpcode =
       rcc::Opcode::fromValue(static_cast<std::uint32_t>(rcc::riscv::InstructionOpcode::ADD));
diff --git a/backend/unittests/CodeGen/GlobalISel/RegBankSelectTest.cpp b/backend/unittests/CodeGen/GlobalISel/RegBankSelectTest.cpp
index d4925eb..833435f 100644
--- a/backend/unittests/CodeGen/GlobalISel/RegBankSelectTest.cpp
+++ b/backend/unittests/CodeGen/GlobalISel/RegBankSelectTest.cpp
@@ -33,7 +33,7 @@ void testBankConflict(TestContext &Context) {
   Fixture.Function->properties() = {rcc::MachineFunctionProperty::Legalized};
   const rcc::riscv::RISCVSubtarget Subtarget(rcc::riscv::RISCVSubtargetFeatures::rv64gc());
   rcc::RegBankSelect Pass(Subtarget.getRegBankInfo());
-  rcc::MachineAnalysisManager Analyses;
+  rcc::MachineFunctionAnalysisManager Analyses;
   auto Result = Pass.run(*Fixture.Function, *Target, Analyses);
   Context.expect(!Result && Result.error().code() == rcc::ErrorCode::VerificationError,
                  "bank selection must reject a conflicting pre-existing bank");
@@ -66,7 +66,7 @@ void testBankClassOnlyChange(TestContext &Context) {
   Fixture.Function->properties() = {rcc::MachineFunctionProperty::Legalized};
   const rcc::riscv::RISCVSubtarget Subtarget(rcc::riscv::RISCVSubtargetFeatures::rv64gc());
   rcc::RegBankSelect Pass(Subtarget.getRegBankInfo());
-  rcc::MachineAnalysisManager Analyses;
+  rcc::MachineFunctionAnalysisManager Analyses;
   auto Result = Pass.run(*Fixture.Function, *Target, Analyses);
   Context.expect(Result.has_value() && Result->Changed &&
                      Result->Changes.has(rcc::MachinePassChange::Registers),