Fix inliner size scaling based on number of calls

When scaling the estimated size of a candidate for inlining based on
frequency and the number of estimated calls nested in the candidate, the
calculation inadvertently ignores the number of estimated calls and uses
a value derived from the frequency twice. This doesn't appear to be the
intention of the code at all.

Signed-off-by: Younes Manton <ymanton@ca.ibm.com>

Author: ymanton

runtime/compiler/optimizer/InlinerTempForJ9.cpp

@@ -4147,9 +4147,11 @@ int32_t TR_MultipleCallTargetInliner::scaleBasedOnFrequency(TR_CallTarget *callt
         float factor = (float)(maxFrequency - frequency) / (float)maxFrequency;
         factor = std::max(factor, 0.4f);
 
-        float avgMethodSize = (float)size / (float)ecs->getNumOfEstimatedCalls();
+        // getNumOfEstimatedCalls is 0 if the the call target doesn't have any nested calls and
+        // avgMethodSize should equal size in that case, so we add 1.
+        float avgMethodSize = (float)size / (float)(1 + ecs->getNumOfEstimatedCalls());
         float numCallsFactor = (float)(avgMethodSize) / 110.0f;
-        numCallsFactor = std::max(factor, 0.1f);
+        numCallsFactor = std::max(numCallsFactor, 0.1f);
 
         if (size > 100) {
             size = (int)((float)size * factor * numCallsFactor);