diff --git a/clang/lib/Index/Entity.cpp b/clang/lib/Index/Entity.cpp
index 03fe9f7..cd9d277 100644
--- a/clang/lib/Index/Entity.cpp
+++ b/clang/lib/Index/Entity.cpp
@@ -71,9 +71,7 @@
   DeclarationName GlobName;
 
   if (IdentifierInfo *II = LocalName.getAsIdentifierInfo()) {
-    IdentifierInfo *GlobII =
-      &ProgImpl.getIdents().get(II->getNameStart(),
-                                II->getNameStart() + II->getLength());
+    IdentifierInfo *GlobII = &ProgImpl.getIdents().get(II->getName());
     GlobName = DeclarationName(GlobII);
   } else {
     Selector LocalSel = LocalName.getObjCSelector();
@@ -140,9 +138,7 @@
   DeclarationName LocalName;
 
   if (IdentifierInfo *GlobII = Name.getAsIdentifierInfo()) {
-    IdentifierInfo &II =
-      AST.Idents.get(GlobII->getNameStart(),
-                     GlobII->getNameStart() + GlobII->getLength());
+    IdentifierInfo &II = AST.Idents.get(GlobII->getName());
     LocalName = DeclarationName(&II);
   } else {
     Selector GlobSel = Name.getObjCSelector();