Skip to content

JIT: stop copying EH tab info into inlinee compiler #83622

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
wants to merge 1 commit into from
Closed

JIT: stop copying EH tab info into inlinee compiler #83622

Show file tree
Hide file tree
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
10 changes: 6 additions & 4 deletions src/coreclr/jit/compiler.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,8 +341,9 @@ inline bool Compiler::jitIsBetweenInclusive(unsigned value, unsigned start, unsi
*/
inline EHblkDsc* Compiler::ehGetDsc(unsigned regionIndex)
{
assert(regionIndex < compHndBBtabCount);
return &compHndBBtab[regionIndex];
Compiler* const comp = impInlineRoot();
assert(regionIndex < comp->compHndBBtabCount);
return &comp->compHndBBtab[regionIndex];
}

/******************************************************************************************
Expand All @@ -366,8 +367,9 @@ inline unsigned Compiler::ehGetEnclosingHndIndex(unsigned regionIndex)
*/
inline unsigned Compiler::ehGetIndex(EHblkDsc* ehDsc)
{
assert(compHndBBtab <= ehDsc && ehDsc < compHndBBtab + compHndBBtabCount);
return (unsigned)(ehDsc - compHndBBtab);
Compiler* const comp = impInlineRoot();
assert(comp->compHndBBtab <= ehDsc && ehDsc < comp->compHndBBtab + comp->compHndBBtabCount);
return (unsigned)(ehDsc - comp->compHndBBtab);
}

/******************************************************************************************
Expand Down
7 changes: 0 additions & 7 deletions src/coreclr/jit/fgbasic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3457,13 +3457,6 @@ void Compiler::fgFindBasicBlocks()
return;
}

noway_assert(info.compXcptnsCount == 0);
compHndBBtab = impInlineInfo->InlinerCompiler->compHndBBtab;
compHndBBtabAllocCount =
impInlineInfo->InlinerCompiler->compHndBBtabAllocCount; // we probably only use the table, not add to it.
compHndBBtabCount = impInlineInfo->InlinerCompiler->compHndBBtabCount;
info.compXcptnsCount = impInlineInfo->InlinerCompiler->info.compXcptnsCount;

// Use a spill temp for the return value if there are multiple return blocks,
// or if the inlinee has GC ref locals.
if ((info.compRetNativeType != TYP_VOID) && ((fgReturnCount > 1) || impInlineInfo->HasGcRefLocals()))
Expand Down