Get rid of getMangledCXXCtorName and getMangledCXXDtorName.

llvm-svn: 105673

3 files changed, 8 insertions, 24 deletions

diff --git a/clang/lib/CodeGen/CGCXX.cpp b/clang/lib/CodeGen/CGCXX.cpp
index 137fbc0e876..ea5017d7d08 100644
--- a/clang/lib/CodeGen/CGCXX.cpp
+++ b/clang/lib/CodeGen/CGCXX.cpp
@@ -232,16 +232,6 @@ CodeGenModule::GetAddrOfCXXConstructor(const CXXConstructorDecl *D,
   return cast<llvm::Function>(GetOrCreateLLVMFunction(Name, FTy, GD));
 }
 
-void CodeGenModule::getMangledName(MangleBuffer &Buffer, const BlockDecl *BD) {
-  getMangleContext().mangleBlock(BD, Buffer.getBuffer());
-}
-
-void CodeGenModule::getMangledCXXCtorName(MangleBuffer &Name,
-                                          const CXXConstructorDecl *D,
-                                          CXXCtorType Type) {
-  getMangleContext().mangleCXXCtor(D, Type, Name.getBuffer());
-}
-
 void CodeGenModule::EmitCXXDestructors(const CXXDestructorDecl *D) {
   // The destructor in a virtual table is always a 'deleting'
   // destructor, which calls the complete destructor and then uses the
@@ -300,12 +290,6 @@ CodeGenModule::GetAddrOfCXXDestructor(const CXXDestructorDecl *D,
   return cast<llvm::Function>(GetOrCreateLLVMFunction(Name, FTy, GD));
 }
 
-void CodeGenModule::getMangledCXXDtorName(MangleBuffer &Name,
-                                          const CXXDestructorDecl *D,
-                                          CXXDtorType Type) {
-  getMangleContext().mangleCXXDtor(D, Type, Name.getBuffer());
-}
-
 llvm::Constant *
 CodeGenModule::GetCXXMemberFunctionPointerValue(const CXXMethodDecl *MD) {
   assert(MD->isInstance() && "Member function must not be static!");
diff --git a/clang/lib/CodeGen/CodeGenModule.cpp b/clang/lib/CodeGen/CodeGenModule.cpp
index c82642eb6cf..90abd439b12 100644
--- a/clang/lib/CodeGen/CodeGenModule.cpp
+++ b/clang/lib/CodeGen/CodeGenModule.cpp
@@ -180,9 +180,11 @@ void CodeGenModule::getMangledName(MangleBuffer &Buffer, GlobalDecl GD) {
   const NamedDecl *ND = cast<NamedDecl>(GD.getDecl());
 
   if (const CXXConstructorDecl *D = dyn_cast<CXXConstructorDecl>(ND))
-    return getMangledCXXCtorName(Buffer, D, GD.getCtorType());
+    return getMangleContext().mangleCXXCtor(D, GD.getCtorType(), 
+                                            Buffer.getBuffer());
   if (const CXXDestructorDecl *D = dyn_cast<CXXDestructorDecl>(ND))
-    return getMangledCXXDtorName(Buffer, D, GD.getDtorType());
+    return getMangleContext().mangleCXXDtor(D, GD.getDtorType(), 
+                                            Buffer.getBuffer());
 
   if (!getMangleContext().shouldMangleDeclName(ND)) {
     assert(ND->getIdentifier() && "Attempt to mangle unnamed decl.");
@@ -193,6 +195,10 @@ void CodeGenModule::getMangledName(MangleBuffer &Buffer, GlobalDecl GD) {
   getMangleContext().mangleName(ND, Buffer.getBuffer());
 }
 
+void CodeGenModule::getMangledName(MangleBuffer &Buffer, const BlockDecl *BD) {
+  getMangleContext().mangleBlock(BD, Buffer.getBuffer());
+}
+
 llvm::GlobalValue *CodeGenModule::GetGlobalValue(llvm::StringRef Name) {
   return getModule().getNamedValue(Name);
 }
diff --git a/clang/lib/CodeGen/CodeGenModule.h b/clang/lib/CodeGen/CodeGenModule.h
index 2083cd04dba..45931ce0fd3 100644
--- a/clang/lib/CodeGen/CodeGenModule.h
+++ b/clang/lib/CodeGen/CodeGenModule.h
@@ -433,12 +433,6 @@ public:
 
   void getMangledName(MangleBuffer &Buffer, GlobalDecl D);
   void getMangledName(MangleBuffer &Buffer, const BlockDecl *BD);
-  void getMangledCXXCtorName(MangleBuffer &Buffer,
-                             const CXXConstructorDecl *D,
-                             CXXCtorType Type);
-  void getMangledCXXDtorName(MangleBuffer &Buffer,
-                             const CXXDestructorDecl *D,
-                             CXXDtorType Type);
 
   void EmitTentativeDefinition(const VarDecl *D);