Address remaining comments:

- avoid duplicating densemap insertion
- remove virtual

Author: Fznamznon

clang/lib/AST/VTableBuilder.cpp

@@ -2657,10 +2657,11 @@ class VFTableBuilder {
       MethodVFTableLocation Loc(MI.VBTableIndex, WhichVFPtr.getVBaseWithVPtr(),
                                 WhichVFPtr.NonVirtualOffset, MI.VFTableIndex);
       if (const CXXDestructorDecl *DD = dyn_cast<CXXDestructorDecl>(MD)) {
-        if (!Context.getTargetInfo().getCXXABI().isMicrosoft())
-          MethodVFTableLocations[GlobalDecl(DD, Dtor_Deleting)] = Loc;
-        else
-          MethodVFTableLocations[GlobalDecl(DD, Dtor_VectorDeleting)] = Loc;
+        // In Microsoft ABI vftable always references vector deleting dtor.
+        CXXDtorType DtorTy = Context.getTargetInfo().getCXXABI().isMicrosoft()
+                                 ? Dtor_VectorDeleting
+                                 : Dtor_Deleting;
+        MethodVFTableLocations[GlobalDecl(DD, DtorTy)] = Loc;
       } else {
         MethodVFTableLocations[MD] = Loc;
       }

clang/lib/CodeGen/CGCXXABI.h

@@ -578,9 +578,9 @@ class CGCXXABI {
 
   /// Reads the array cookie associated with the given pointer,
   /// that should have one.
-  virtual void ReadArrayCookie(CodeGenFunction &CGF, Address Ptr,
-                               QualType ElementType, llvm::Value *&NumElements,
-                               llvm::Value *&AllocPtr, CharUnits &CookieSize);
+  void ReadArrayCookie(CodeGenFunction &CGF, Address Ptr, QualType ElementType,
+                       llvm::Value *&NumElements, llvm::Value *&AllocPtr,
+                       CharUnits &CookieSize);
 
   /// Return whether the given global decl needs a VTT parameter.
   virtual bool NeedsVTTParameter(GlobalDecl GD);