diff --git a/clang/lib/Parse/ParsePragma.cpp b/clang/lib/Parse/ParsePragma.cpp
index 60d19536070b..d7ecbfa2b955 100644
--- a/clang/lib/Parse/ParsePragma.cpp
+++ b/clang/lib/Parse/ParsePragma.cpp
@@ -76,8 +76,7 @@ void PragmaPackHandler::HandlePragma(Preprocessor &PP, Token &PackTok) {
             PP.Lex(Tok);
             
             if (Tok.isNot(tok::numeric_constant)) {
-              PP.Diag(Tok.getLocation(), diag::warn_pragma_pack_malformed)
-                << II->getName();
+              PP.Diag(Tok.getLocation(), diag::warn_pragma_pack_malformed)<<II;
               return;
             }
             
@@ -88,8 +87,7 @@ void PragmaPackHandler::HandlePragma(Preprocessor &PP, Token &PackTok) {
             PP.Lex(Tok);
           }
         } else {
-          PP.Diag(Tok.getLocation(), diag::warn_pragma_pack_malformed)
-            << II->getName();
+          PP.Diag(Tok.getLocation(), diag::warn_pragma_pack_malformed) << II;
           return;
         }
       }
diff --git a/clang/lib/Parse/Parser.cpp b/clang/lib/Parse/Parser.cpp
index 168e2f556f72..86526cc158cb 100644
--- a/clang/lib/Parse/Parser.cpp
+++ b/clang/lib/Parse/Parser.cpp
@@ -600,7 +600,7 @@ void Parser::ParseKNRParamDeclarations(Declarator &D) {
           // the identifier list.
           if (i == FTI.NumArgs) {
             Diag(ParmDeclarator.getIdentifierLoc(), diag::err_no_matching_param)
-              << ParmDeclarator.getIdentifier()->getName();
+              << ParmDeclarator.getIdentifier();
             break;
           }
 
@@ -609,7 +609,7 @@ void Parser::ParseKNRParamDeclarations(Declarator &D) {
             if (FTI.ArgInfo[i].Param) {
               Diag(ParmDeclarator.getIdentifierLoc(),
                    diag::err_param_redefinition)
-                 << ParmDeclarator.getIdentifier()->getName();
+                 << ParmDeclarator.getIdentifier();
             } else {
               FTI.ArgInfo[i].Param = Param;
             }