Skip to content

[clr-interp] Fix EH logic edge case #122993

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
davidwrighton merged 2 commits into from
Jan 9, 2026
Merged

[clr-interp] Fix EH logic edge case #122993

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
77f2d83
[clr-interp] Fix EH logic edge case
davidwrighton Jan 8, 2026
544776d
Adjust the iloffset of the leave chain island to avoid needing to mod…
davidwrighton Jan 8, 2026
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
24 changes: 23 additions & 1 deletion src/coreclr/interpreter/compiler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1097,13 +1097,21 @@ void InterpCompiler::EmitCode()
getEHinfo(m_methodInfo, i, &clause);
for (InterpBasicBlock *bb = m_pEntryBB; bb != NULL; bb = bb->pNextBB)
{
if (bb->isLeaveChainIsland && clause.HandlerOffset == (uint32_t)bb->ilOffset)
{
// Leave chain islands are not part of any EH clause, but their IL offset may be
continue;
}

if (clause.HandlerOffset <= (uint32_t)bb->ilOffset && (clause.HandlerOffset + clause.HandlerLength) > (uint32_t)bb->ilOffset)
{
INTERP_DUMP("BB %d with ilOffset %x overlaps EH clause %d (handler)\n", bb->index, bb->ilOffset, i);
bb->overlappingEHClauseCount++;
}

if (clause.Flags == CORINFO_EH_CLAUSE_FILTER && clause.FilterOffset <= (uint32_t)bb->ilOffset && clause.HandlerOffset > (uint32_t)bb->ilOffset)
{
INTERP_DUMP("BB %d with ilOffset %x overlaps EH clause %d (filter)\n", bb->index, bb->ilOffset, i);
bb->overlappingEHClauseCount++;
}
}
Expand Down Expand Up @@ -1569,6 +1577,7 @@ void InterpCompiler::GetNativeRangeForClause(uint32_t startILOffset, uint32_t en
assert(pStartBB != NULL);

InterpBasicBlock* pEndBB = pStartBB;

for (InterpBasicBlock* pBB = pStartBB->pNextBB; (pBB != NULL) && ((uint32_t)pBB->ilOffset < endILOffset); pBB = pBB->pNextBB)
{
if (pBB->overlappingEHClauseCount == pStartBB->overlappingEHClauseCount)
Expand Down Expand Up @@ -1682,6 +1691,18 @@ void InterpCompiler::BuildEHInfo()
m_compHnd->setEHcount(nativeEHCount);

unsigned int nativeEHIndex = 0;

#ifdef DEBUG
INTERP_DUMP(" BB overlapping EH clause counts:\n");
if (t_interpDump)
{
for (InterpBasicBlock* pBB = GetBB(0); (pBB != NULL); pBB = pBB->pNextBB)
{
INTERP_DUMP("BB:%d has overlappingEHClauseCount=%d and ilOffset=%x\n", pBB->index, pBB->overlappingEHClauseCount, pBB->ilOffset);
}
}
#endif

for (unsigned int i = 0; i < getEHcount(m_methodInfo); i++)
{
CORINFO_EH_CLAUSE clause;
Expand Down Expand Up @@ -2272,8 +2293,9 @@ void InterpCompiler::CreateLeaveChainIslandBasicBlocks(CORINFO_METHOD_INFO* meth

if (pLeaveChainIslandBB == NULL)
{
pLeaveChainIslandBB = AllocBB(clause.HandlerOffset + clause.HandlerLength);
pLeaveChainIslandBB = AllocBB(clause.HandlerOffset);
pLeaveChainIslandBB->pLeaveTargetBB = pLeaveTargetBB;
pLeaveChainIslandBB->isLeaveChainIsland = true;
*ppLastBBNext = pLeaveChainIslandBB;
}

Expand Down
4 changes: 4 additions & 0 deletions src/coreclr/interpreter/compiler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,9 @@ struct InterpBasicBlock
// Valid only for BBs of call islands. It is set to true if it is a finally call island, false if is is a catch leave island.
bool isFinallyCallIsland;

// Is a leave chain island basic block
bool isLeaveChainIsland;

// If this basic block is a catch or filter funclet entry, this is the index of the variable
// that holds the exception object.
int clauseVarIndex;
Expand Down Expand Up @@ -366,6 +369,7 @@ struct InterpBasicBlock
clauseType = BBClauseNone;
isFilterOrCatchFuncletEntry = false;
isFinallyCallIsland = false;
isLeaveChainIsland = false;
clauseVarIndex = -1;
overlappingEHClauseCount = 0;
enclosingTryBlockCount = -1;
Expand Down
Loading