diff --git a/clang/lib/Index/USRGeneration.cpp b/clang/lib/Index/USRGeneration.cpp
--- a/clang/lib/Index/USRGeneration.cpp
+++ b/clang/lib/Index/USRGeneration.cpp
@@ -167,8 +167,7 @@
   void VisitTemplateName(TemplateName Name);
   void VisitTemplateArgument(const TemplateArgument &Arg);
 
-  /// Emit a Decl's name using NamedDecl::printName() and return true if
-  ///  the decl had no name.
+  /// Emit a Decl's name and return true if the decl had no name.
   bool EmitDeclName(const NamedDecl *D);
 };
 } // end anonymous namespace
@@ -179,7 +178,7 @@
 
 bool USRGenerator::EmitDeclName(const NamedDecl *D) {
   const unsigned startSize = Buf.size();
-  D->printName(Out);
+  Out << D->getDeclName();
   const unsigned endSize = Buf.size();
   return startSize == endSize;
 }