Skip to content

[release/6.0] Consider finally that jumps to itself as non-empty #58881

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
jeffschwMSFT merged 2 commits into from
Sep 10, 2021
Merged

[release/6.0] Consider finally that jumps to itself as non-empty #58881

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6677d5
decrement the reference of unreachable finally
kunalspathak Sep 7, 2021
304aa28
Proper fix
kunalspathak Sep 8, 2021
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
8 changes: 8 additions & 0 deletions src/coreclr/jit/fgehopt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,14 @@ PhaseStatus Compiler::fgRemoveEmptyFinally()
continue;
}

// If the finally's block jumps back to itself, then it is not empty.
if ((firstBlock->bbJumpKind == BBJ_ALWAYS) && firstBlock->bbJumpDest == firstBlock)
{
JITDUMP("EH#%u finally has basic block that jumps to itself; skipping.\n", XTnum);
XTnum++;
continue;
}

// Limit for now to finallys that contain only a GT_RETFILT.
bool isEmpty = true;

Expand Down
4 changes: 2 additions & 2 deletions src/coreclr/jit/jiteh.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4410,7 +4410,7 @@ void Compiler::fgExtendEHRegionBefore(BasicBlock* block)
#endif // DEBUG

// The first block of a handler has an artificial extra refcount. Transfer that to the new block.
assert(block->bbRefs > 0);
noway_assert(block->countOfInEdges() > 0);
block->bbRefs--;

HBtab->ebdHndBeg = bPrev;
Expand Down Expand Up @@ -4459,7 +4459,7 @@ void Compiler::fgExtendEHRegionBefore(BasicBlock* block)
#endif // DEBUG

// The first block of a filter has an artificial extra refcount. Transfer that to the new block.
assert(block->bbRefs > 0);
noway_assert(block->countOfInEdges() > 0);
block->bbRefs--;

HBtab->ebdFilter = bPrev;
Expand Down