Address review commnets

Author: smanna12

clang/include/clang/Basic/ABI.h

@@ -31,10 +31,10 @@ enum CXXCtorType {
 
 /// C++ destructor types.
 enum CXXDtorType {
-  Dtor_Deleting, ///< Deleting dtor
-  Dtor_Complete, ///< Complete object dtor
-  Dtor_Base,     ///< Base object dtor
-  Dtor_Comdat,   ///< The COMDAT used for dtors
+  Dtor_Deleting,      ///< Deleting dtor
+  Dtor_Complete,      ///< Complete object dtor
+  Dtor_Base,          ///< Base object dtor
+  Dtor_Comdat,        ///< The COMDAT used for dtors
   Dtor_VectorDeleting ///< Vector deleting dtor
 };
 

clang/lib/AST/MicrosoftMangle.cpp

@@ -1484,9 +1484,7 @@ void MicrosoftCXXNameMangler::mangleCXXDtorType(CXXDtorType T) {
   // <operator-name> ::= ?_G # scalar deleting destructor
   case Dtor_Deleting: Out << "?_G"; return;
   // <operator-name> ::= ?_E # vector deleting destructor
-  case Dtor_VectorDeleting:
-    Out << "?_E";
-    return;
+  case Dtor_VectorDeleting: Out << "?_E"; return;
   case Dtor_Comdat:
     llvm_unreachable("not expecting a COMDAT");
   }
@@ -2918,11 +2916,12 @@ void MicrosoftCXXNameMangler::mangleFunctionType(const FunctionType *T,
   //               ::= @ # structors (they have no declared return type)
   if (IsStructor) {
     if (isa<CXXDestructorDecl>(D) && isStructorDecl(D)) {
-      // The scalar deleting destructor takes an extra int argument which is not
+      // The deleting destructors take an extra argument of type int that indicates
+      // whether the storage for the object should be deleted and whether a single
+      // object or an array of objects is being destroyed. This extra argument is not
       // reflected in the AST.
       if (StructorType == Dtor_Deleting ||
           StructorType == Dtor_VectorDeleting) {
-	 // The deleting destructors take an extra int arguments.
         Out << (PointersAre64Bit ? "PEAXI@Z" : "PAXI@Z");
         return;
       }

clang/lib/AST/VTableBuilder.cpp

@@ -1341,14 +1341,9 @@ void ItaniumVTableBuilder::AddMethod(const CXXMethodDecl *MD,
   if (const CXXDestructorDecl *DD = dyn_cast<CXXDestructorDecl>(MD)) {
     assert(ReturnAdjustment.isEmpty() &&
            "Destructor can't have return adjustment!");
-    if (!Context.getTargetInfo().getCXXABI().isMicrosoft()) {
-      // Add both the complete destructor and the deleting destructor.
-      Components.push_back(VTableComponent::MakeCompleteDtor(DD));
-      Components.push_back(VTableComponent::MakeDeletingDtor(DD));
-    } else {
-      // Add the vector deleting destructor.
-      Components.push_back(VTableComponent::MakeDeletingDtor(DD));
-    }
+    // Add both the complete destructor and the deleting destructor.
+    Components.push_back(VTableComponent::MakeCompleteDtor(DD));
+    Components.push_back(VTableComponent::MakeDeletingDtor(DD));
   } else {
     // Add the return adjustment if necessary.
     if (!ReturnAdjustment.isEmpty())
@@ -1737,15 +1732,10 @@ void ItaniumVTableBuilder::LayoutPrimaryAndSecondaryVTables(
       const CXXMethodDecl *MD = I.first;
       const MethodInfo &MI = I.second;
       if (const CXXDestructorDecl *DD = dyn_cast<CXXDestructorDecl>(MD)) {
-	if (!Context.getTargetInfo().getCXXABI().isMicrosoft()) {
-	  MethodVTableIndices[GlobalDecl(DD, Dtor_Complete)] =
-	      MI.VTableIndex - AddressPoint;
-	  MethodVTableIndices[GlobalDecl(DD, Dtor_Deleting)] =
-              MI.VTableIndex + 1 - AddressPoint;
-        } else {
-          MethodVTableIndices[GlobalDecl(DD, Dtor_VectorDeleting)] =
-              MI.VTableIndex + 1 - AddressPoint;
-	}
+	MethodVTableIndices[GlobalDecl(DD, Dtor_Complete)]
+            = MI.VTableIndex - AddressPoint;
+        MethodVTableIndices[GlobalDecl(DD, Dtor_Deleting)]
+            = MI.VTableIndex + 1 - AddressPoint;
       } else {
         MethodVTableIndices[MD] = MI.VTableIndex - AddressPoint;
       }
@@ -2080,8 +2070,6 @@ void ItaniumVTableBuilder::dumpLayout(raw_ostream &Out) {
       DD->printQualifiedName(Out);
       if (IsComplete)
         Out << "() [complete]";
-      else if (Context.getTargetInfo().getCXXABI().isMicrosoft())
-        Out << "() [vector deleting]";
       else
         Out << "() [deleting]";
 
@@ -2257,28 +2245,12 @@ void ItaniumVTableBuilder::dumpLayout(raw_ostream &Out) {
         PredefinedIdentKind::PrettyFunctionNoVirtual, MD);
 
     if (const CXXDestructorDecl *DD = dyn_cast<CXXDestructorDecl>(MD)) {
-      if (!Context.getTargetInfo().getCXXABI().isMicrosoft()) {
-	// For Itanium ABI, add entries for both complete and deleting
-	// destructors.
-        GlobalDecl CompleteGD(DD, Dtor_Complete);
-	assert(MethodVTableIndices.count(CompleteGD));
-        uint64_t CompleteIndex = MethodVTableIndices[CompleteGD];
-        IndicesMap[CompleteIndex] = MethodName + " [complete]";
-
-        GlobalDecl DeletingGD(DD, Dtor_Deleting);
-        assert(MethodVTableIndices.count(DeletingGD));
-        uint64_t DeletingIndex = MethodVTableIndices[DeletingGD];
-        IndicesMap[DeletingIndex] = MethodName + " [deleting]";
-      } else {
-	// For Microsoft ABI, add an entry for the vector deleting destructor.
-        // Ensure that the index calculation is correct for the Microsoft ABI.
-	GlobalDecl VectorDeletingGD(DD, Dtor_VectorDeleting);
-        assert(MethodVTableIndices.count(VectorDeletingGD));
-        uint64_t VectorDeletingIndex = MethodVTableIndices[VectorDeletingGD];
-        IndicesMap[VectorDeletingIndex] = MethodName + " [vector deleting]";
-      }
+      GlobalDecl GD(DD, Dtor_Complete);
+      assert(MethodVTableIndices.count(GD));
+      uint64_t VTableIndex = MethodVTableIndices[GD];
+      IndicesMap[VTableIndex] = MethodName + " [complete]";
+      IndicesMap[VTableIndex + 1] = MethodName + " [deleting]";
     } else {
-      // For other virtual member functions, add an entry with the method name.
       assert(MethodVTableIndices.count(MD));
       IndicesMap[MethodVTableIndices[MD]] = MethodName;
     }
@@ -3790,7 +3762,7 @@ void MicrosoftVTableContext::dumpMethodLocations(
         PredefinedIdentKind::PrettyFunctionNoVirtual, MD);
 
     if (isa<CXXDestructorDecl>(MD)) {
-      IndicesMap[I.second] = MethodName + " [vector deleting]";
+      IndicesMap[I.second] = MethodName + " [deleting]";
     } else {
       IndicesMap[I.second] = MethodName;
     }

clang/lib/CodeGen/CGCXX.cpp

@@ -175,10 +175,6 @@ bool CodeGenModule::TryEmitBaseDestructorAsAlias(const CXXDestructorDecl *D) {
   // requires explicit comdat support in the IL.
   if (llvm::GlobalValue::isWeakForLinker(TargetLinkage))
     return true;
-/*
-  EmitDefinitionAsAlias(AliasDecl, TargetDecl);
-  return false;
-*/
   // Create the alias with no name.
   auto *Alias = llvm::GlobalAlias::create(AliasValueType, 0, Linkage, "",
                                           Aliasee, &getModule());