Skip to content

Suggested perf improvements in DataFlowAnalysis #50310

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Alex-Sob wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Suggested perf improvements in DataFlowAnalysis #50310

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3f112fc
Suggested perf improvements
Aug 17, 2025
a09639c
Merge branch 'main' into dev/alex-sob/dataflowanalysis-perf-improvements
Alex-Sob Aug 20, 2025
2ab3790
Merge branch 'main' into dev/alex-sob/dataflowanalysis-perf-improvements
Alex-Sob Aug 21, 2025
73b6fa6
Merge branch 'main' into dev/alex-sob/dataflowanalysis-perf-improvements
Alex-Sob Aug 28, 2025
9942423
Merge branch 'main' into dev/alex-sob/dataflowanalysis-perf-improvements
Alex-Sob Sep 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 22 additions & 12 deletions ...tAnalyzers/src/Utilities/FlowAnalysis/FlowAnalysis/Framework/DataFlow/DataFlowAnalysis.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ private void RunCore(
var block = cfg.Blocks[blockOrdinal];

// Ensure that we execute potential nested catch blocks before the finally region.
if (pendingBlocksNeedingAtLeastOnePass.Any())
if (pendingBlocksNeedingAtLeastOnePass.Count > 0)
{
var finallyRegion = block.GetInnermostRegionStartedByBlock(ControlFlowRegionKind.Finally);
if (finallyRegion?.EnclosingRegion!.Kind == ControlFlowRegionKind.TryAndFinally)
Expand All @@ -229,17 +229,20 @@ private void RunCore(
var tryRegion = finallyRegion.EnclosingRegion.NestedRegions[0];
Debug.Assert(tryRegion.Kind == ControlFlowRegionKind.Try);

var nestedCatchBlockOrdinals = pendingBlocksNeedingAtLeastOnePass.Where(
p => p >= tryRegion.FirstBlockOrdinal &&
p <= tryRegion.LastBlockOrdinal &&
cfg.Blocks[p].GetInnermostRegionStartedByBlock(ControlFlowRegionKind.Catch) != null);
if (nestedCatchBlockOrdinals.Any())
var hasNestedCatchBlockOrdinals = false;
foreach (var ordinal in pendingBlocksNeedingAtLeastOnePass)
{
foreach (var catchBlockOrdinal in nestedCatchBlockOrdinals)
if (ordinal >= tryRegion.FirstBlockOrdinal &&
ordinal <= tryRegion.LastBlockOrdinal &&
cfg.Blocks[ordinal].GetInnermostRegionStartedByBlock(ControlFlowRegionKind.Catch) != null)
{
worklist.Add(catchBlockOrdinal);
worklist.Add(ordinal);
hasNestedCatchBlockOrdinals = true;
}
}

if (hasNestedCatchBlockOrdinals)
{
// Also add back the finally start block to be processed after catch blocks.
worklist.Add(blockOrdinal);
continue;
Expand Down Expand Up @@ -580,9 +583,16 @@ bool IsValidWorklistState()
bool HasUnprocessedPredecessorBlock(BasicBlock block)
{
var predecessorsWithBranches = block.GetPredecessorsWithBranches(cfg);
return predecessorsWithBranches.Any(predecessorWithBranch =>
predecessorWithBranch.predecessorBlock.Ordinal < block.Ordinal &&
pendingBlocksNeedingAtLeastOnePass.Contains(predecessorWithBranch.predecessorBlock.Ordinal));

foreach (var (predecessorBlock, _) in predecessorsWithBranches)
{
if (predecessorBlock.Ordinal < block.Ordinal && pendingBlocksNeedingAtLeastOnePass.Contains(predecessorBlock.Ordinal))
{
return true;
}
}

return false;
}

// If this block starts a catch/filter region, return the enclosing TryAndCatch region.
Expand Down Expand Up @@ -825,4 +835,4 @@ void HandleBranch(ControlFlowBranch? branch)
}
}
}
}
}