Don't reorder blocks too early in helper call expansion (#84765)

dotnet · Apr 13, 2023 · 51c0342 · 51c0342
1 parent 20de7f0
commit 51c0342
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/src/coreclr/jit/helperexpansion.cpp b/src/coreclr/jit/helperexpansion.cpp
@@ -391,12 +391,6 @@ bool Compiler::fgExpandRuntimeLookupsForCall(BasicBlock* block, Statement* stmt,
     {
         assert(BasicBlock::sameEHRegion(prevBb, sizeCheckBb));
     }
-
-    if (opts.OptimizationEnabled())
-    {
-        fgReorderBlocks(/* useProfileData */ false);
-        fgUpdateChangedFlowGraph(FlowGraphUpdates::COMPUTE_BASICS);
-    }
     return true;
 }
 
@@ -674,9 +668,6 @@ bool Compiler::fgExpandThreadLocalAccessForCall(BasicBlock* block, Statement* st
     assert(BasicBlock::sameEHRegion(prevBb, threadStaticBlockNullCondBB));
     assert(BasicBlock::sameEHRegion(prevBb, fastPathBb));
 
-    fgReorderBlocks(/* useProfileData */ false);
-    fgUpdateChangedFlowGraph(FlowGraphUpdates::COMPUTE_BASICS);
-
     return true;
 }
 
@@ -704,6 +695,13 @@ PhaseStatus Compiler::fgExpandHelper(bool skipRarelyRunBlocks)
             result = PhaseStatus::MODIFIED_EVERYTHING;
         }
     }
+
+    if ((result == PhaseStatus::MODIFIED_EVERYTHING) && opts.OptimizationEnabled())
+    {
+        fgReorderBlocks(/* useProfileData */ false);
+        fgUpdateChangedFlowGraph(FlowGraphUpdates::COMPUTE_BASICS);
+    }
+
     return result;
 }