Skip to content

Allow instrumentation for methods with explicit tail calls #58632

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
EgorBo merged 7 commits into from
Sep 6, 2021
Merged

Allow instrumentation for methods with explicit tail calls #58632

Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9efc4ab
Allow instrumentation for methods with explicit tail calls
EgorBo Sep 3, 2021
9475446
clean up
EgorBo Sep 3, 2021
2b9ec22
Update fgbasic.cpp
EgorBo Sep 3, 2021
b3697b0
Update fgbasic.cpp
EgorBo Sep 3, 2021
617e6e3
Update fgbasic.cpp
EgorBo Sep 3, 2021
e217a09
Merge branch 'main' of https://github.com/dotnet/runtime into tailcal…
EgorBo Sep 6, 2021
247b6eb
Address feedback
EgorBo Sep 6, 2021
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
6 changes: 3 additions & 3 deletions src/coreclr/jit/fgbasic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2719,11 +2719,11 @@ unsigned Compiler::fgMakeBasicBlocks(const BYTE* codeAddr, IL_OFFSET codeSize, F
BADCODE3("tail call not followed by ret", " at offset %04X", (IL_OFFSET)(codeAddr - codeBegp));
}

if (fgCanSwitchToOptimized() && fgMayExplicitTailCall())
if (fgCanSwitchToOptimized() && fgMayExplicitTailCall() &&
((info.compFlags & CORINFO_FLG_DISABLE_TIER0_FOR_LOOPS) != 0))
{
// Method has an explicit tail call that may run like a loop or may not be generated as a tail
// call in tier 0, switch to optimized to avoid spending too much time running slower code and
// to avoid stack overflow from recursion
// call in tier 0, switch to optimized to avoid spending too much time running slower code
fgSwitchToOptimized();
Copy link
Member

@jakobbotsch jakobbotsch Sep 3, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On second thought it might be a good idea to go back to what you had before -- jitting these requires creating up to two IL stubs for each explicit tailcall in the function, and those stubs are not currently shared, so the rejit will always recreate them.

}
}
Expand Down