Use unique_ptr for VTableBuilder::VFTableLayouts map.

[jlebar]

https://github.com/llvm-mirror/clang/commit/be96a853a5dd33cce210617fb11575d388883df7

clang/include/clang/AST/VTableBuilder.h

typedef llvm::DenseMap<GlobalDecl, MethodVFTableLocation>
     MethodVFTableLocationsTy;
   MethodVFTableLocationsTy MethodVFTableLocations;
 
   typedef llvm::DenseMap<const CXXRecordDecl *, VPtrInfoVector>
       VFPtrLocationsMapTy;
   VFPtrLocationsMapTy VFPtrLocations;
 
   typedef std::pair<const CXXRecordDecl *, CharUnits> VFTableIdTy;
-  typedef llvm::DenseMap<VFTableIdTy, const VTableLayout *> VFTableLayoutMapTy;
+  typedef llvm::DenseMap<VFTableIdTy, std::unique_ptr<const VTableLayout>>
+      VFTableLayoutMapTy;
   VFTableLayoutMapTy VFTableLayouts;
 
   llvm::DenseMap<const CXXRecordDecl *, VirtualBaseInfo *> VBaseInfo;
 
   void enumerateVFPtrs(const CXXRecordDecl *ForClass, VPtrInfoVector &Result);
 
   void computeVTableRelatedInformation(const CXXRecordDecl *RD) override;
 

clang/lib/AST/VTableBuilder.cpp

if (I - BucketStart > 1) {
         Changed |= extendPath(PathsSorted[II]);
       assert(Changed && "no paths were extended to fix ambiguity");
     }
   }
   return Changed;
 }
 
 MicrosoftVTableContext::~MicrosoftVTableContext() {
-  llvm::DeleteContainerSeconds(VFTableLayouts);
   llvm::DeleteContainerSeconds(VBaseInfo);
 }
 
 namespace {
 typedef llvm::SetVector<BaseSubobject, std::vector<BaseSubobject>,
                         llvm::DenseSet<BaseSubobject>> FullPathTy;
 }
 
void MicrosoftVTableContext::computeVTableRelatedInformation(
   MethodVFTableLocationsTy NewMethodLocations;
   for (const std::unique_ptr<VPtrInfo> &VFPtr : VFPtrLocations[RD]) {
     VFTableBuilder Builder(*this, RD, *VFPtr);
 
     VFTableIdTy id(RD, VFPtr->FullOffsetInMDC);
     assert(VFTableLayouts.count(id) == 0);
     SmallVector<VTableLayout::VTableThunkTy, 1> VTableThunks(
         Builder.vtable_thunks_begin(), Builder.vtable_thunks_end());
-    VFTableLayouts[id] = new VTableLayout(
+    VFTableLayouts[id] = llvm::make_unique<VTableLayout>(
         Builder.getNumVTableComponents(), Builder.vtable_component_begin(),
         VTableThunks.size(), VTableThunks.data(), EmptyAddressPointsMap, true);
     Thunks.insert(Builder.thunks_begin(), Builder.thunks_end());
 
     for (const auto &Loc : Builder.vtable_locations()) {
       GlobalDecl GD = Loc.first;
       MethodVFTableLocation NewLoc = Loc.second;
       auto M = NewMethodLocations.find(GD);