Skip to content

JIT: Don't convert unreachable BBJ_CALLFINALLYRET blocks to BBJ_THROW during morph #109519

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

Merged
amanasifkhalid merged 1 commit into from
Nov 5, 2024
Merged

JIT: Don't convert unreachable BBJ_CALLFINALLYRET blocks to BBJ_THROW during morph #109519

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 2 additions & 3 deletions src/coreclr/jit/morph.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13379,12 +13379,11 @@ void Compiler::fgMorphBlock(BasicBlock* block, MorphUnreachableInfo* unreachable
unreachableInfo->SetUnreachable(block);

// Remove the block's IR and flow edges but don't mark the block as removed.
// Convert to BBJ_THROW. But leave CALLFINALLY alone.
// Convert to BBJ_THROW. But leave CALLFINALLY(RET) alone.
//
// If we clear out the block, there is nothing to morph, so just return.
//
bool const isCallFinally = block->KindIs(BBJ_CALLFINALLY);
if (!isCallFinally)
if (!block->KindIs(BBJ_CALLFINALLY, BBJ_CALLFINALLYRET))
{
fgUnreachableBlock(block);
block->RemoveFlags(BBF_REMOVED);
Expand Down