Merge pull request #21501 from jdmpapin/trivialInliningOnly

Make some minor improvements to tryToInlineTrivialMethod()

Author: vijaysun-omr

runtime/compiler/optimizer/InlinerTempForJ9.cpp

@@ -3054,24 +3054,51 @@ bool TR_J9InlinerPolicy::tryToInlineTrivialMethod (TR_CallStack* callStack, TR_C
    TR_VirtualGuardSelection *guard = calltarget->_guard;
    TR::ResolvedMethodSymbol * callerSymbol = callStack->_methodSymbol;
 
-   if (isInlineableJNI(calleeSymbol->getResolvedMethod(),callNode))
+   if (!isInlineableJNI(calleeSymbol->getResolvedMethod(), callNode))
       {
-      if (performTransformation(comp(), "%sInlining jni %s into %s\n", OPT_DETAILS, calleeSymbol->signature(comp()->trMemory()), callerSymbol->signature(comp()->trMemory())))
-         {
-         if (calltarget->_myCallSite->isIndirectCall())
-            return true;
+      return false;
+      }
 
-         if (inlineGetClassAccessFlags(calleeSymbol, callerSymbol, callNodeTreeTop, callNode))
-            guard->_kind = TR_NoGuard;
-         else if (inlineUnsafeCall(calleeSymbol, callerSymbol, callNodeTreeTop, callNode))
-            guard->_kind = TR_NoGuard;
-         }
+   if (calltarget->_myCallSite->isIndirectCall())
+      {
+      return false;
+      }
+
+   if (!performTransformation(
+         comp(),
+         "%sInlining jni %s into %s\n",
+         OPT_DETAILS,
+         calleeSymbol->signature(comp()->trMemory()),
+         callerSymbol->signature(comp()->trMemory())))
+      {
+      return false;
+      }
+
+   if (inlineGetClassAccessFlags(calleeSymbol, callerSymbol, callNodeTreeTop, callNode))
+      {
+      guard->_kind = TR_NoGuard;
       return true;
       }
 
+   if (inlineUnsafeCall(calleeSymbol, callerSymbol, callNodeTreeTop, callNode))
+      {
+      guard->_kind = TR_NoGuard;
+      return true;
+      }
+
+   dumpOptDetails(comp(), "JNI inlining failed\n");
    return false;
    }
 
+bool
+TR_J9InlinerPolicy::trivialInliningOnly(
+   TR_CallStack *callStack, TR_CallTarget *callTarget)
+   {
+   TR::Node *callNode = callTarget->_myCallSite->_callNode;
+   TR::ResolvedMethodSymbol *calleeSymbol = callTarget->_calleeSymbol;
+   return isInlineableJNI(calleeSymbol->getResolvedMethod(), callNode);
+   }
+
 bool
 TR_J9InlinerPolicy::adjustFanInSizeInExceedsSizeThreshold(int bytecodeSize,
                                                       uint32_t& calculatedSize,

runtime/compiler/optimizer/J9Inliner.hpp

@@ -194,6 +194,7 @@ class TR_J9InlinerPolicy : public OMR_InlinerPolicy
       TR_J9InlinerPolicy(TR::Compilation *comp);
       virtual bool inlineRecognizedMethod(TR::RecognizedMethod method);
       virtual bool tryToInlineTrivialMethod (TR_CallStack* callStack, TR_CallTarget* calltarget);
+      virtual bool trivialInliningOnly(TR_CallStack *callStack, TR_CallTarget *callTarget);
       bool isInlineableJNI(TR_ResolvedMethod *method,TR::Node *callNode);
       virtual bool alwaysWorthInlining(TR_ResolvedMethod * calleeMethod, TR::Node *callNode);
       bool adjustFanInSizeInExceedsSizeThreshold(int bytecodeSize,