JIT: Unify block successor iteration logic #117743
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
|
Tagging subscribers to this area: @JulieLeeMSFT, @jakobbotsch |
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR consolidates the successor‐iteration APIs by collapsing the two non‐templated lists into a single BBSuccList<IteratorType>, removes the old BasicBlock::NumSucc(Compiler*)/GetSucc(Compiler*) overloads, and updates all call sites accordingly. It also removes bbFallsThrough and its uses.
- Introduces a templated
BBSuccList<IteratorType>inblock.h/block.cpp - Deletes
Succs(this)/SuccEdges(this)and replaces them withSuccs()/SuccEdges() - Removes
BasicBlock::NumSucc(Compiler*), updates call sites toNumSucc()andGetSucc()
Reviewed Changes
Copilot reviewed 14 out of 14 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| src/coreclr/jit/promotion.cpp | Updated dspBlockHeader calls to drop the Compiler* |
| src/coreclr/jit/lsrabuild.cpp | Replaced NumSucc(compiler) with NumSucc() |
| src/coreclr/jit/lsra.cpp | Swapped NumSucc(compiler), Succs(compiler) to new APIs |
| src/coreclr/jit/importer.cpp | Replaced Succs(this) with Succs() |
| src/coreclr/jit/flowgraph.cpp | Removed bbFallsThrough assertion |
| src/coreclr/jit/fgprofilesynthesis.cpp | Updated SuccEdges(m_comp) and NumSucc() calls |
| src/coreclr/jit/fgprofile.cpp | Swapped NumSucc(this), GetSucc(i,this), SuccEdges |
| src/coreclr/jit/fgopt.cpp | Replaced Succs(this) iterations |
| src/coreclr/jit/fgdiagnostic.cpp | Updated dspSuccs and Succs(this) calls |
| src/coreclr/jit/fgbasic.cpp | Swapped Succs(this) uses |
| src/coreclr/jit/compiler.cpp | Updated debug comment and dspSuccs call |
| src/coreclr/jit/codegenlinear.cpp | Adjusted dspBlockHeader usage |
| src/coreclr/jit/block.h | Added templated BBSuccList, removed old overloads |
| src/coreclr/jit/block.cpp | Implemented BBSuccList constructor, removed old code |
Comments suppressed due to low confidence (1)
src/coreclr/jit/block.h:1929
- [nitpick] Consider marking
SuccEdges()as aconstmethod to matchSuccs()(which isconst) and allow iterating edges onconst BasicBlockinstances.
BBSuccList<FlowEdgeArrayIterator> SuccEdges()
This was referenced Jul 17, 2025
Open
Open
Contributor
Author
|
@dotnet/jit-contrib PTAL. No diffs. Thanks! |
AndyAyersMS
approved these changes
Jul 17, 2025
Member
AndyAyersMS
left a comment
There was a problem hiding this comment.
Nice to see this get cleaned up.
Contributor
Author
|
/ba-g build timeouts |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Follow-up to #117423.
BBSuccListandBBSuccEdgeListinto one templatized type, where the template specifies the iterator kindBasicBlock::NumSucc(Compiler*)et alBasicBlock::NumSucc()et al deal only with unique successors, now that they're always availableBasicBlock::bbFallsThrough