diff --git a/lib/CodeGen/AsmPrinter/AsmPrinter.cpp b/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
index b1957bb0da2..64f49c46922 100644
--- a/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
+++ b/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
@@ -1682,7 +1682,7 @@ MCSymbol *AsmPrinter::GetBlockAddressSymbol(const Function *F,
   SmallString<60> NameResult;
   raw_svector_ostream(NameResult) << MAI->getPrivateGlobalPrefix() << "BA"
     << FuncName.size() << '_' << FuncName << '_';
-  Mang->makeNameProper(NameResult, BB->getName());
+  Mang->getNameWithPrefix(NameResult, BB->getName());
   if (Suffix[0])
     NameResult += Suffix;