make SI a reference

Author: optimisan

llvm/include/llvm/CodeGen/RegAllocPriorityAdvisor.h

@@ -89,7 +89,7 @@ class RegAllocPriorityAdvisorProvider {
 
   virtual std::unique_ptr<RegAllocPriorityAdvisor>
   getAdvisor(const MachineFunction &MF, const RAGreedy &RA,
-             SlotIndexes *SI) = 0;
+             SlotIndexes &SI) = 0;
 
   AdvisorMode getAdvisorMode() const { return Mode; }
 

llvm/lib/CodeGen/MLRegAllocPriorityAdvisor.cpp

@@ -128,7 +128,7 @@ class ReleaseModePriorityAdvisorProvider final
       : RegAllocPriorityAdvisorProvider(AdvisorMode::Release) {}
   std::unique_ptr<RegAllocPriorityAdvisor>
   getAdvisor(const MachineFunction &MF, const RAGreedy &RA,
-             SlotIndexes *SI) override {
+             SlotIndexes &SI) override {
     if (!Runner) {
       if (InteractiveChannelBaseName.empty())
         Runner = std::make_unique<ReleaseModeModelRunner<CompiledModelType>>(
@@ -139,8 +139,7 @@ class ReleaseModePriorityAdvisorProvider final
             InteractiveChannelBaseName + ".out",
             InteractiveChannelBaseName + ".in");
     }
-    assert(SI && "SlotIndexes result must be set");
-    return std::make_unique<MLPriorityAdvisor>(MF, RA, SI, Runner.get());
+    return std::make_unique<MLPriorityAdvisor>(MF, RA, &SI, Runner.get());
   }
 
 private:
@@ -259,15 +258,14 @@ class DevelopmentModePriorityAdvisorProvider final
 
   std::unique_ptr<RegAllocPriorityAdvisor>
   getAdvisor(const MachineFunction &MF, const RAGreedy &RA,
-             SlotIndexes *SI) override {
+             SlotIndexes &SI) override {
     if (!Runner)
       return nullptr;
     if (Log) {
       Log->switchContext(MF.getName());
     }
-    assert(SI && "SlotIndexes result must be set");
     return std::make_unique<DevelopmentModePriorityAdvisor>(
-        MF, RA, SI, Runner.get(), Log.get());
+        MF, RA, &SI, Runner.get(), Log.get());
   }
 
   std::unique_ptr<MLModelRunner> Runner;

llvm/lib/CodeGen/RegAllocGreedy.cpp

@@ -2772,7 +2772,7 @@ bool RAGreedy::runOnMachineFunction(MachineFunction &mf) {
 
   PriorityAdvisor = getAnalysis<RegAllocPriorityAdvisorAnalysisLegacy>()
                         .getProvider()
-                        .getAdvisor(*MF, *this, Indexes);
+                        .getAdvisor(*MF, *this, *Indexes);
 
   VRAI = std::make_unique<VirtRegAuxInfo>(*MF, *LIS, *VRM, *Loops, *MBFI);
   SpillerInstance.reset(

llvm/lib/CodeGen/RegAllocPriorityAdvisor.cpp

@@ -58,9 +58,8 @@ class DefaultPriorityAdvisorProvider final
 
   std::unique_ptr<RegAllocPriorityAdvisor>
   getAdvisor(const MachineFunction &MF, const RAGreedy &RA,
-             SlotIndexes *SI) override {
-    assert(SI && "SlotIndexes result must be set");
-    return std::make_unique<DefaultPriorityAdvisor>(MF, RA, SI);
+             SlotIndexes &SI) override {
+    return std::make_unique<DefaultPriorityAdvisor>(MF, RA, &SI);
   }
 };
 
@@ -76,9 +75,8 @@ class DummyPriorityAdvisorProvider final
 
   std::unique_ptr<RegAllocPriorityAdvisor>
   getAdvisor(const MachineFunction &MF, const RAGreedy &RA,
-             SlotIndexes *SI) override {
-    assert(SI && "SlotIndexes result must be set");
-    return std::make_unique<DummyPriorityAdvisor>(MF, RA, SI);
+             SlotIndexes &SI) override {
+    return std::make_unique<DummyPriorityAdvisor>(MF, RA, &SI);
   }
 };