2 files changed, 7 insertions, 1 deletions
diff --git a/clang/lib/Basic/Diagnostic.cpp b/clang/lib/Basic/Diagnostic.cpp
index 9428b218e54..a25a790352e 100644
--- a/clang/lib/Basic/Diagnostic.cpp
+++ b/clang/lib/Basic/Diagnostic.cpp
@@ -12,6 +12,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang/Basic/Diagnostic.h"
+#include "clang/Basic/IdentifierTable.h"
 #include "clang/Basic/SourceLocation.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/StringExtras.h"
@@ -292,6 +293,11 @@ FormatDiagnostic(llvm::SmallVectorImpl<char> &OutStr) const {
         OutStr.append(S.begin(), S.end());
         break;
       }
+      case DiagnosticInfo::ak_identifierinfo: {
+        const IdentifierInfo *II = getArgIdentifier(StrNo);
+        OutStr.append(II->getName(), II->getName() + II->getLength());
+        break;
+      }
       }
       DiagStr += 2;
     }
diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp
index 90d3730f1e9..b62aa9a9d7f 100644
--- a/clang/lib/Sema/SemaDeclCXX.cpp
+++ b/clang/lib/Sema/SemaDeclCXX.cpp
@@ -234,7 +234,7 @@ void Sema::CheckCXXDefaultArguments(FunctionDecl *FD) {
       if (Param->getIdentifier())
         Diag(Param->getLocation(), 
              diag::err_param_default_argument_missing_name)
-          << Param->getIdentifier()->getName();
+          << Param->getIdentifier();
       else
         Diag(Param->getLocation(), 
              diag::err_param_default_argument_missing);