Skip to content

JIT: Remove implicit fallthrough assumption in fgExpandRarelyRunBlocks #107350

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
Sep 5, 2024
Merged

JIT: Remove implicit fallthrough assumption in fgExpandRarelyRunBlocks #107350

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
16 changes: 4 additions & 12 deletions src/coreclr/jit/fgopt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3126,7 +3126,7 @@ bool Compiler::fgExpandRarelyRunBlocks()
break;

case BBJ_COND:
if (block->isRunRarely() && bPrev->GetTrueTarget()->isRunRarely())
if (bPrev->GetTrueTarget()->isRunRarely() && bPrev->GetFalseTarget()->isRunRarely())
{
INDEBUG(reason = "Both sides of a conditional jump are rarely run");
setRarelyRun = true;
Expand Down Expand Up @@ -3230,21 +3230,13 @@ bool Compiler::fgExpandRarelyRunBlocks()
}
}

/* COMPACT blocks if possible */
if (fgCanCompactBlock(bPrev))
{
fgCompactBlock(bPrev);

block = bPrev;
continue;
}
//
// if bPrev->bbWeight is not based upon profile data we can adjust
// the weights of bPrev and block
//
else if (bPrev->isBBCallFinallyPair() && // we must have a BBJ_CALLFINALLY and BBJ_CALLFINALLYRET pair
(bPrev->bbWeight != block->bbWeight) && // the weights are currently different
!bPrev->hasProfileWeight()) // and the BBJ_CALLFINALLY block is not using profiled weights
if (bPrev->isBBCallFinallyPair() && // we must have a BBJ_CALLFINALLY and BBJ_CALLFINALLYRET pair
(bPrev->bbWeight != block->bbWeight) && // the weights are currently different
!bPrev->hasProfileWeight()) // and the BBJ_CALLFINALLY block is not using profiled weights
{
if (block->isRunRarely())
{
Expand Down