review feedback

dotnet · May 4, 2023 · 32b9a30 · 32b9a30
1 parent e4f20c0
commit 32b9a30
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 30 deletions.
diff --git a/src/coreclr/jit/lsra.cpp b/src/coreclr/jit/lsra.cpp
@@ -1299,7 +1299,14 @@ PhaseStatus LinearScan::doLinearScan()
     nextConsecutiveRefPositionMap = nullptr;
 #endif
 
-    buildIntervals();
+    if (enregisterLocalVars)
+    {
+        buildIntervals<true>();
+    }
+    else
+    {
+        buildIntervals<false>();
+    }
 
     DBEXEC(VERBOSE, TupleStyleDump(LSRA_DUMP_REFPOS));
     compiler->EndPhase(PHASE_LINEAR_SCAN_BUILD);
@@ -1650,17 +1657,8 @@ bool LinearScan::isRegCandidate(LclVarDsc* varDsc)
     return true;
 }
 
-void LinearScan::identifyCandidates()
-{
-    if (enregisterLocalVars)
-    {
-        identifyCandidates<true>();
-    }
-    else
-    {
-        identifyCandidates<false>();
-    }
-}
+template void LinearScan::identifyCandidates<true>();
+template void LinearScan::identifyCandidates<false>();
 
 // Identify locals & compiler temps that are register candidates
 // TODO-Cleanup: This was cloned from Compiler::lvaSortByRefCount() in lclvars.cpp in order

diff --git a/src/coreclr/jit/lsra.h b/src/coreclr/jit/lsra.h
@@ -644,7 +644,6 @@ class LinearScan : public LinearScanInterface
     // This does the dataflow analysis and builds the intervals
     template <bool localVarsEnregistered>
     void           buildIntervals();
-    void           buildIntervals();
 
 // This is where the actual assignment is done
 #ifdef TARGET_ARM64
@@ -990,7 +989,6 @@ class LinearScan : public LinearScanInterface
     // Determine which locals are candidates for allocation
     template <bool localVarsEnregistered>
     void           identifyCandidates();
-    void           identifyCandidates();
 
     // determine which locals are used in EH constructs we don't want to deal with
     void identifyCandidatesExceptionDataflow();

diff --git a/src/coreclr/jit/lsrabuild.cpp b/src/coreclr/jit/lsrabuild.cpp
@@ -2126,21 +2126,8 @@ void LinearScan::updateRegStateForArg(LclVarDsc* argDsc)
     }
 }
 
-//------------------------------------------------------------------------
-// buildIntervals: The main entry point for building the data structures over
-//                 which we will do register allocation.
-//
-void LinearScan::buildIntervals()
-{
-    if (enregisterLocalVars)
-    {
-        buildIntervals<true>();
-    }
-    else
-    {
-        buildIntervals<false>();
-    }
-}
+template void LinearScan::buildIntervals<true>();
+template void LinearScan::buildIntervals<false>();
 
 //------------------------------------------------------------------------
 // buildIntervals: The main entry point for building the data structures over
@@ -2185,7 +2172,7 @@ void           LinearScan::buildIntervals()
     doDoubleAlign = false;
 #endif
 
-    identifyCandidates();
+    identifyCandidates<localVarsEnregistered>();
 
     // Figure out if we're going to use a frame pointer. We need to do this before building
     // the ref positions, because those objects will embed the frame register in various register masks