Cold callee heuristic should not override hot callsite heuristic in inliner.

[danielcdh]

Summary

This patch checks if hot callsite heuristic is applied. If yes, then cold caller heuristic should be backed out.

[danielcdh]

This change should not be necessary.

lib/Analysis/InlineCost.cpp

if (InlineHint && !Caller->optForMinSize())
     Threshold = MaxIfValid(Threshold, Params.HintThreshold);
 
   if (HotCallsite && !Caller->optForMinSize())
     Threshold = MaxIfValid(Threshold, Params.HotCallSiteThreshold);
 
   bool ColdCallee = PSI->isFunctionEntryCold(&Callee);
   // For cold callees, use the ColdThreshold knob if it is available and reduces
   // the threshold.
-  if (ColdCallee)
+  if (ColdCallee && !HotCallsite)
     Threshold = MinIfValid(Threshold, Params.ColdThreshold);
 
   // Finally, take the target-specific inlining threshold multiplier into
   // account.
   Threshold *= TTI.getInliningThresholdMultiplier();
 }
 
 bool CallAnalyzer::visitCmpInst(CmpInst &I) {