[PartialInlining] Replace delete with unique_ptr in computeCallsiteToProfCountMap

[vsk]

lib/Transforms/IPO/PartialInlining.cpp

576 ↗

(On Diff #99079)

IMHO the code that uses the BFI should be moved into a separate function which accepts a BFI reference. On the "!GetBFI" path, you'd make_unique a BFI and pass it into a helper. Else, you'd pass in "&(*GetBFI)(*Caller)".

(On an unrelated note, I find "&(*GetBFI)(*Caller)" pretty hard to read...)

[vitalybuka]

Should I abandon it?

[davidxl]

The code will be simplified (with related code removed) once the new PM is the default, but I don't see harm to change this way. lgtm

llvm/trunk/lib/Transforms/IPO/PartialInlining.cpp

 // used to update the original function's entry count,
 // after the function is partially inlined into the callsite.
 void PartialInlinerImpl::computeCallsiteToProfCountMap(
     Function *DuplicateFunction,
     DenseMap<User *, uint64_t> &CallSiteToProfCountMap) {
   std::vector<User *> Users(DuplicateFunction->user_begin(),
                             DuplicateFunction->user_end());
   Function *CurrentCaller = nullptr;
+  std::unique_ptr<BlockFrequencyInfo> TempBFI;
   BlockFrequencyInfo *CurrentCallerBFI = nullptr;
 
   auto ComputeCurrBFI = [&,this](Function *Caller) {
       // For the old pass manager:
       if (!GetBFI) {
-        if (CurrentCallerBFI)
-          delete CurrentCallerBFI;
         DominatorTree DT(*Caller);
         LoopInfo LI(DT);
         BranchProbabilityInfo BPI(*Caller, LI);
-        CurrentCallerBFI = new BlockFrequencyInfo(*Caller, BPI, LI);
+        TempBFI.reset(new BlockFrequencyInfo(*Caller, BPI, LI));
+        CurrentCallerBFI = TempBFI.get();
       } else {
         // New pass manager:
         CurrentCallerBFI = &(*GetBFI)(*Caller);
       }
   };
 
   for (User *User : Users) {
     CallSite CS = getCallSite(User);
     Function *Caller = CS.getCaller();
     if (CurrentCaller != Caller) {
       CurrentCaller = Caller;
       ComputeCurrBFI(Caller);
     } else {
       assert(CurrentCallerBFI && "CallerBFI is not set");
     }
     BasicBlock *CallBB = CS.getInstruction()->getParent();
     auto Count = CurrentCallerBFI->getBlockProfileCount(CallBB);
     if (Count)
       CallSiteToProfCountMap[User] = *Count;
     else
       CallSiteToProfCountMap[User] = 0;
   }
-  if (!GetBFI) {
-    if (CurrentCallerBFI)
-      delete CurrentCallerBFI;
-  }
 }
 
 Function *PartialInlinerImpl::unswitchFunction(Function *F) {
 
   if (F->hasAddressTaken())
     return nullptr;
 
   // Let inliner handle it