PR5218: Replace IdentifierInfo::getName with StringRef version, now that clients
are updated.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@84447 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Basic/Diagnostic.cpp b/lib/Basic/Diagnostic.cpp
index f964423..d3bb9d5 100644
--- a/lib/Basic/Diagnostic.cpp
+++ b/lib/Basic/Diagnostic.cpp
@@ -794,7 +794,7 @@
         continue;
       }
 
-      llvm::raw_svector_ostream(OutStr) << '\'' << II->getNameStr() << '\'';
+      llvm::raw_svector_ostream(OutStr) << '\'' << II->getName() << '\'';
       break;
     }
     case Diagnostic::ak_qualtype:
diff --git a/lib/Basic/IdentifierTable.cpp b/lib/Basic/IdentifierTable.cpp
index a3c5c4a..16aa0c5 100644
--- a/lib/Basic/IdentifierTable.cpp
+++ b/lib/Basic/IdentifierTable.cpp
@@ -306,7 +306,7 @@
   llvm::raw_svector_ostream OS(Str);
   for (keyword_iterator I = keyword_begin(), E = keyword_end(); I != E; ++I) {
     if (*I)
-      OS << (*I)->getNameStr();
+      OS << (*I)->getName();
     OS << ':';
   }
 
@@ -322,12 +322,12 @@
 
     // If the number of arguments is 0 then II is guaranteed to not be null.
     if (getNumArgs() == 0)
-      return II->getNameStr();
+      return II->getName();
 
     if (!II)
       return ":";
 
-    return II->getNameStr().str() + ":";
+    return II->getName().str() + ":";
   }
 
   // We have a multiple keyword selector (no embedded flags).