Skip to content

JIT: fix issue with EH clause class types for fault/filters from C++/CLI #118870

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
merged 3 commits into from
Aug 19, 2025
+16 −9
Merged

JIT: fix issue with EH clause class types for fault/filters from C++/CLI #118870

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
03b7941
JIT: fix issue with EH clause class types for fault/filters from C++/CLI
AndyAyersMS Aug 18, 2025
402b850
review feedback
AndyAyersMS Aug 19, 2025
f6cfe73
zero eh table on alloc/realloc
AndyAyersMS Aug 19, 2025
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
13 changes: 7 additions & 6 deletions src/coreclr/jit/fgbasic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3741,31 +3741,32 @@ void Compiler::fgFindBasicBlocks()
}
else
{
HBtab->ebdTyp = clause.ClassToken;

/* Set bbCatchTyp as appropriate */

// Set ebdTyp and bbCatchTyp as appropriate
//
if (clause.Flags & CORINFO_EH_CLAUSE_FINALLY)
{
hndBegBB->bbCatchTyp = BBCT_FINALLY;
HBtab->ebdTyp = 0;
}
else
{
if (clause.Flags & CORINFO_EH_CLAUSE_FAULT)
{
hndBegBB->bbCatchTyp = BBCT_FAULT;
HBtab->ebdTyp = 0;
}
else
{
hndBegBB->bbCatchTyp = clause.ClassToken;

// These values should be non-zero value that will
// not collide with real tokens for bbCatchTyp
if (clause.ClassToken == 0)
{
BADCODE("Exception catch type is Null");
}

hndBegBB->bbCatchTyp = clause.ClassToken;
HBtab->ebdTyp = clause.ClassToken;

noway_assert(clause.ClassToken != BBCT_FAULT);
noway_assert(clause.ClassToken != BBCT_FINALLY);
noway_assert(clause.ClassToken != BBCT_FILTER);
Expand Down
4 changes: 2 additions & 2 deletions src/coreclr/tools/aot/ILCompiler.ReadyToRun/JitInterface/CorInfoImpl.ReadyToRun.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3117,8 +3117,8 @@ private void setEHcount(uint cEH)

private void setEHinfo(uint EHnumber, ref CORINFO_EH_CLAUSE clause)
{
// Filters don't have class token in the clause.ClassTokenOrOffset
if ((clause.Flags & CORINFO_EH_CLAUSE_FLAGS.CORINFO_EH_CLAUSE_FILTER) == 0)
// Filters, finallys, and faults don't have class token in the clause.ClassTokenOrOffset
if ((clause.Flags & (CORINFO_EH_CLAUSE_FLAGS.CORINFO_EH_CLAUSE_FILTER | CORINFO_EH_CLAUSE_FLAGS.CORINFO_EH_CLAUSE_FINALLY | CORINFO_EH_CLAUSE_FLAGS.CORINFO_EH_CLAUSE_FAULT)) == 0)
{
if (clause.ClassTokenOrOffset != 0)
{
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/vm/jitinterface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12734,7 +12734,7 @@ void CEECodeGenInfo::setEHinfoWorker(
LOG((LF_EH, LL_INFO1000000, " FilterOffset : 0x%08lx -> 0x%08lx\n", clause->FilterOffset, pEHClause->FilterOffset));

if (IsDynamicScope(m_MethodInfo.scope) &&
((pEHClause->Flags & COR_ILEXCEPTION_CLAUSE_FILTER) == 0) &&
((pEHClause->Flags & (COR_ILEXCEPTION_CLAUSE_FILTER | COR_ILEXCEPTION_CLAUSE_FINALLY | COR_ILEXCEPTION_CLAUSE_FAULT)) == 0) &&
(clause->ClassToken != mdTokenNil))
{
ResolvedToken resolved{};
Expand Down
Loading