Merge pull request #130 from nbhuiyan/osr-fix-v0.29.1

(0.29.1) Prevent OSR transitions from failed guards
eclipse-openj9 · Nov 30, 2021 · e30892e · e30892e
2 parents 3f2734d + 13f966d
commit e30892e
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/compiler/optimizer/Inliner.cpp b/compiler/optimizer/Inliner.cpp
@@ -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)
       {