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.

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

Prevent OSR transitions from failed guards #6255

Merged
merged 1 commit into from
Nov 25, 2021
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 7 additions & 0 deletions compiler/optimizer/Inliner.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1871,6 +1871,13 @@ TR_InlinerBase::addGuardForVirtual(
else if (!disableHCRGuards && comp()->getHCRMode() != TR::none)
createdHCRGuard = true;

#if defined(J9VM_OPT_OPENJDK_METHODHANDLE)
// for inlined callee methods that do not have HCR guards, setting createdHCRGuard to false
// prevents creating an OSR transition point to be taken in cases such as a failed TR_ProfiledGuard
if (skipHCRGuardForCallee)
createdHCRGuard = false;
#endif

static const char *disableFSDGuard = feGetEnv("TR_DisableFSDGuard");
if ( !disableFSDGuard && comp()->getOption(TR_FullSpeedDebug) && guard->_kind != TR_BreakpointGuard)
{
Expand Down