1 files changed, 8 insertions, 2 deletions
diff --git a/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp
index c82642eb6c..90abd439b1 100644
--- a/lib/CodeGen/CodeGenModule.cpp
+++ b/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);
 }