[Wasm RyuJit]: don't skip top-level catchrets when marking try resumption#129205
Open
AndyAyersMS wants to merge 1 commit into
Open
[Wasm RyuJit]: don't skip top-level catchrets when marking try resumption#129205AndyAyersMS wants to merge 1 commit into
AndyAyersMS wants to merge 1 commit into
Conversation
In FlowGraphTryRegions::Build, the BBJ_EHCATCHRET check sat below the early bailout on hasTryIndex, so the catchret of an outer catch was never marking its try region as requiring runtime resumption. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
github-actions
Bot
added
the
area-CodeGen-coreclr
Member
Author
|
@dotnet/jit-contrib PTAL Fixes a dumb logic bug. With this and #129197 I'm able to resume after catch in simple R2R methods. Haven't tested more widely yet. |
Contributor
There was a problem hiding this comment.
Pull request overview
Adjusts FlowGraphTryRegions::Build so BBJ_EHCATCHRET blocks always mark their associated “dispatching try” region as requiring runtime resumption, even when the catchret block itself has no TryIndex (e.g., outermost catch).
Changes:
- Move the
BBJ_EHCATCHREThandling before the early!block->hasTryIndex()bailout. - Preserve existing behavior for try-region membership/entry-edge discovery while ensuring top-level catchrets are no longer skipped.
Comment on lines
+7747
to
+7758
| // If this block is a BBJ_EHCATCHRET, mark the "dispatching try" region | ||
| // as requiring runtime resumption. | ||
| // | ||
| if (block->KindIs(BBJ_EHCATCHRET)) | ||
| { | ||
| assert(block->hasHndIndex()); | ||
| unsigned const ehRegionIndex = block->getHndIndex(); | ||
| BasicBlock* const dispatchingTryBlock = comp->ehGetDsc(ehRegionIndex)->ebdTryBeg; | ||
| FlowGraphTryRegion* const dispatchingTryRegion = regions->GetTryRegionByHeader(dispatchingTryBlock); | ||
|
|
||
| dispatchingTryRegion->SetRequiresRuntimeResumption(); | ||
| } |
kg
approved these changes
Jun 10, 2026
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.
In FlowGraphTryRegions::Build, the BBJ_EHCATCHRET check sat below the early bailout on hasTryIndex, so the catchret of an outer catch was never marking its try region as requiring runtime resumption.