Skip to content
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

Jump to bottom

Fix unwind info for cold EH funclets on ARM64 #1930

Merged
merged 1 commit into from
Jul 13, 2022
Merged

Fix unwind info for cold EH funclets on ARM64 #1930

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
30 changes: 25 additions & 5 deletions src/coreclr/jit/unwindarm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,14 +572,28 @@ void Compiler::unwindReserveFunc(FuncInfoDsc* func)
}
#endif // DEBUG

#ifdef FEATURE_EH_FUNCLETS
// If hot/cold splitting occurred at fgFirstFuncletBB, then the main body is not split.
const bool splitAtFirstFunclet = (funcHasColdSection && (fgFirstColdBlock == fgFirstFuncletBB));

if (!isFunclet && splitAtFirstFunclet)
{
funcHasColdSection = false;
}
#endif // FEATURE_EH_FUNCLETS

#if defined(FEATURE_CFI_SUPPORT)
if (generateCFIUnwindCodes())
{
// Report zero-sized unwind info for cold part of main function
// so the EE chains unwind info.
// TODO: Support cold EH funclets.
DWORD unwindCodeBytes = 0;
if (funcHasColdSection)
{
eeReserveUnwindInfo(isFunclet, true /*isColdCode*/, unwindCodeBytes);
}

unwindCodeBytes = (DWORD)(func->cfiCodes->size() * sizeof(CFI_CODE));
eeReserveUnwindInfo(isFunclet, false /*isColdCode*/, unwindCodeBytes);

Expand Down Expand Up @@ -607,7 +621,11 @@ void Compiler::unwindReserveFunc(FuncInfoDsc* func)
// The ARM Exception Data specification "Function Fragments" section describes this.
func->uwi.Split();

func->uwi.Reserve(isFunclet, true);
// If the function is split, EH funclets are always cold; skip this call for cold funclets.
if (!isFunclet || !funcHasColdSection)
{
func->uwi.Reserve(isFunclet, true);
}

// After the hot section, split and reserve the cold section

Expand Down Expand Up @@ -644,12 +662,17 @@ void Compiler::unwindEmitFunc(FuncInfoDsc* func, void* pHotCode, void* pColdCode
#if defined(FEATURE_CFI_SUPPORT)
if (generateCFIUnwindCodes())
{
// TODO: Support cold EH funclets.
unwindEmitFuncCFI(func, pHotCode, pColdCode);
return;
}
#endif // FEATURE_CFI_SUPPORT

func->uwi.Allocate((CorJitFuncKind)func->funKind, pHotCode, pColdCode, true);
// If the function is split, EH funclets are always cold; skip this call for cold funclets.
if ((func->funKind == FUNC_ROOT) || (func->uwiCold == NULL))
{
func->uwi.Allocate((CorJitFuncKind)func->funKind, pHotCode, pColdCode, true);
}

if (func->uwiCold != NULL)
{
Expand Down Expand Up @@ -1572,8 +1595,6 @@ void UnwindFragmentInfo::Finalize(UNATIVE_OFFSET functionLength)

void UnwindFragmentInfo::Reserve(bool isFunclet, bool isHotCode)
{
assert(isHotCode || !isFunclet); // TODO-CQ: support hot/cold splitting in functions with EH

MergeCodes();

bool isColdCode = !isHotCode;
Expand Down Expand Up @@ -1925,7 +1946,6 @@ void UnwindInfo::Split()
void UnwindInfo::Reserve(bool isFunclet, bool isHotCode)
{
assert(uwiInitialized == UWI_INITIALIZED_PATTERN);
assert(isHotCode || !isFunclet);

for (UnwindFragmentInfo* pFrag = &uwiFragmentFirst; pFrag != NULL; pFrag = pFrag->ufiNext)
{
Expand Down