JIT: use funclet iterator in genCodeForBBlist#126588
Open
AndyAyersMS wants to merge 2 commits intodotnet:mainfrom
Open
JIT: use funclet iterator in genCodeForBBlist#126588AndyAyersMS wants to merge 2 commits intodotnet:mainfrom
AndyAyersMS wants to merge 2 commits intodotnet:mainfrom
Conversation
Also remove the special case 'next block' handling for callfinallyret.
github-actions
bot
added
the
area-CodeGen-coreclr
Member
Author
|
@dotnet/jit-contrib PTAL This should make it a little easier to handle some funclet codegen issues in Wasm. |
Contributor
|
Tagging subscribers to this area: @JulieLeeMSFT, @jakobbotsch |
Contributor
There was a problem hiding this comment.
Pull request overview
This PR refactors CoreCLR JIT linear codegen to iterate over funclets using the existing Compiler::Funcs() / FuncInfoDsc::Blocks() ranges, and simplifies BBJ_CALLFINALLY handling by removing “skip-next-block” return mechanics (and instead skipping BBJ_CALLFINALLYRET blocks in block codegen).
Changes:
- Switch
genCodeForBBlistfrom a single basic-block walk to per-funclet iteration (genCodeForFunclet+genCodeForBlock). - Change
genCallFinallyandgenEmitEndBlockfrom returningBasicBlock*tovoid, removing special “next block” handling forBBJ_CALLFINALLY. - Skip
BBJ_CALLFINALLYRETblocks ingenCodeForBlocksince they contain no code.
Reviewed changes
Copilot reviewed 8 out of 8 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| src/coreclr/jit/codegenlinear.cpp | Refactors the main block iteration into funclet/block helpers; removes “skip-ahead” return flow. |
| src/coreclr/jit/codegen.h | Updates declarations for new helpers and changes return types of genEmitEndBlock/genCallFinally. |
| src/coreclr/jit/codegenxarch.cpp | Updates genCallFinally to void and removes skip-return logic. |
| src/coreclr/jit/codegenarm.cpp | Updates genCallFinally signature/returns to match new void contract. |
| src/coreclr/jit/codegenarm64.cpp | Updates genCallFinally signature/returns to match new void contract. |
| src/coreclr/jit/codegenloongarch64.cpp | Updates genCallFinally signature/returns to match new void contract. |
| src/coreclr/jit/codegenriscv64.cpp | Updates genCallFinally signature/returns to match new void contract. |
| src/coreclr/jit/codegenwasm.cpp | Updates genCallFinally signature to void (still NYI). |
EgorBo
approved these changes
Apr 7, 2026
Member
EgorBo
left a comment
EgorBo
left a comment
There was a problem hiding this comment.
LGTM if CI/diffs are happy (needs a rerun)
Member
Author
|
Should be no diff. |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Also remove the special case 'next block' handling for callfinallyret.