Skip to content

JIT: Only process regular succs for end-of-block PHI insertions #94958

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

Closed
jakobbotsch wants to merge 2 commits into from
Closed

JIT: Only process regular succs for end-of-block PHI insertions #94958

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
e039700
JIT: Process all EH successors for "in-block" defs in SSA
jakobbotsch Nov 18, 2023
9116038
JIT: Only process regular succs for end-of-block PHI insertions
jakobbotsch Nov 18, 2023
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
3 changes: 3 additions & 0 deletions src/coreclr/jit/block.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1415,6 +1415,9 @@ struct BasicBlock : private LIR::Range
template <typename TFunc>
BasicBlockVisit VisitAllSuccs(Compiler* comp, TFunc func);

template <typename TFunc>
BasicBlockVisit VisitEHSuccs(Compiler* comp, TFunc func);

template <typename TFunc>
BasicBlockVisit VisitRegularSuccs(Compiler* comp, TFunc func);

Expand Down
24 changes: 12 additions & 12 deletions src/coreclr/jit/compiler.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,14 +504,14 @@ BasicBlockVisit BasicBlock::VisitEHSecondPassSuccs(Compiler* comp, TFunc func)
// block BB2 of the corresponding handler to be an "EH successor" of BB1.
//
template <typename TFunc>
static BasicBlockVisit VisitEHSuccessors(Compiler* comp, BasicBlock* block, TFunc func)
BasicBlockVisit BasicBlock::VisitEHSuccs(Compiler* comp, TFunc func)
{
if (!block->HasPotentialEHSuccs(comp))
if (!HasPotentialEHSuccs(comp))
{
return BasicBlockVisit::Continue;
}

EHblkDsc* eh = comp->ehGetBlockExnFlowDsc(block);
EHblkDsc* eh = comp->ehGetBlockExnFlowDsc(this);
if (eh != nullptr)
{
while (true)
Expand All @@ -521,7 +521,7 @@ static BasicBlockVisit VisitEHSuccessors(Compiler* comp, BasicBlock* block, TFun
// will be yielded as a normal successor. Don't also yield as
// an exceptional successor.
BasicBlock* flowBlock = eh->ExFlowBlock();
if (!block->KindIs(BBJ_CALLFINALLY) || !block->HasJumpTo(flowBlock))
if (!KindIs(BBJ_CALLFINALLY) || !HasJumpTo(flowBlock))
{
RETURN_ON_ABORT(func(flowBlock));
}
Expand All @@ -535,7 +535,7 @@ static BasicBlockVisit VisitEHSuccessors(Compiler* comp, BasicBlock* block, TFun
}
}

return block->VisitEHSecondPassSuccs(comp, func);
return VisitEHSecondPassSuccs(comp, func);
}

//------------------------------------------------------------------------------
Expand All @@ -559,14 +559,14 @@ BasicBlockVisit BasicBlock::VisitAllSuccs(Compiler* comp, TFunc func)
RETURN_ON_ABORT(func(bbJumpEhf->bbeSuccs[i]));
}

return VisitEHSuccessors(comp, this, func);
return VisitEHSuccs(comp, func);

case BBJ_CALLFINALLY:
case BBJ_EHCATCHRET:
case BBJ_EHFILTERRET:
case BBJ_LEAVE:
RETURN_ON_ABORT(func(bbJumpDest));
return VisitEHSuccessors(comp, this, func);
return VisitEHSuccs(comp, func);

case BBJ_ALWAYS:
RETURN_ON_ABORT(func(bbJumpDest));
Expand All @@ -577,14 +577,14 @@ BasicBlockVisit BasicBlock::VisitAllSuccs(Compiler* comp, TFunc func)
// and we skip its normal EH successors.
if (!isBBCallAlwaysPairTail())
{
RETURN_ON_ABORT(VisitEHSuccessors(comp, this, func));
RETURN_ON_ABORT(VisitEHSuccs(comp, func));
}

return BasicBlockVisit::Continue;

case BBJ_NONE:
RETURN_ON_ABORT(func(bbNext));
return VisitEHSuccessors(comp, this, func);
return VisitEHSuccs(comp, func);

case BBJ_COND:
RETURN_ON_ABORT(func(bbNext));
Expand All @@ -594,7 +594,7 @@ BasicBlockVisit BasicBlock::VisitAllSuccs(Compiler* comp, TFunc func)
RETURN_ON_ABORT(func(bbJumpDest));
}

return VisitEHSuccessors(comp, this, func);
return VisitEHSuccs(comp, func);

case BBJ_SWITCH:
{
Expand All @@ -604,13 +604,13 @@ BasicBlockVisit BasicBlock::VisitAllSuccs(Compiler* comp, TFunc func)
RETURN_ON_ABORT(func(sd.nonDuplicates[i]));
}

return VisitEHSuccessors(comp, this, func);
return VisitEHSuccs(comp, func);
}

case BBJ_THROW:
case BBJ_RETURN:
case BBJ_EHFAULTRET:
return VisitEHSuccessors(comp, this, func);
return VisitEHSuccs(comp, func);

default:
unreached();
Expand Down
Loading