From 2781deb126663ca1bd412044a1e66577585987b3 Mon Sep 17 00:00:00 2001
From: Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com>
Date: Fri, 12 Mar 2010 09:33:31 +0000
Subject: [PATCH] Cleanup using StringRef

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@98339 91177308-0d34-0410-b5e6-96231b3b80d8
---
 include/clang/Basic/IdentifierTable.h | 4 +---
 lib/Index/Entity.cpp                  | 8 ++------
 lib/Index/GlobalSelector.cpp          | 8 ++------
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/include/clang/Basic/IdentifierTable.h b/include/clang/Basic/IdentifierTable.h
index edbfeccea3..7e9a7e3b63 100644
--- a/include/clang/Basic/IdentifierTable.h
+++ b/include/clang/Basic/IdentifierTable.h
@@ -473,9 +473,7 @@ public:
     SelectorName = "set";
     SelectorName += Name->getName();
     SelectorName[3] = toupper(SelectorName[3]);
-    IdentifierInfo *SetterName =
-      &Idents.get(SelectorName.data(),
-                  SelectorName.data() + SelectorName.size());
+    IdentifierInfo *SetterName = &Idents.get(SelectorName);
     return SelTable.getUnarySelector(SetterName);
   }
 };
diff --git a/lib/Index/Entity.cpp b/lib/Index/Entity.cpp
index 03fe9f73af..cd9d277bb6 100644
--- a/lib/Index/Entity.cpp
+++ b/lib/Index/Entity.cpp
@@ -71,9 +71,7 @@ Entity EntityGetter::VisitNamedDecl(NamedDecl *D) {
   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 @@ Decl *EntityImpl::getDecl(ASTContext &AST) {
   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();
diff --git a/lib/Index/GlobalSelector.cpp b/lib/Index/GlobalSelector.cpp
index 2b2ca6d3b1..34679185b1 100644
--- a/lib/Index/GlobalSelector.cpp
+++ b/lib/Index/GlobalSelector.cpp
@@ -29,9 +29,7 @@ Selector GlobalSelector::getSelector(ASTContext &AST) const {
   for (unsigned i = 0, e = GlobSel.isUnarySelector() ? 1 : GlobSel.getNumArgs();
          i != e; ++i) {
     IdentifierInfo *GlobII = GlobSel.getIdentifierInfoForSlot(i);
-    IdentifierInfo *II =
-      &AST.Idents.get(GlobII->getNameStart(),
-                      GlobII->getNameStart() + GlobII->getLength());
+    IdentifierInfo *II = &AST.Idents.get(GlobII->getName());
     Ids.push_back(II);
   }
 
@@ -58,9 +56,7 @@ GlobalSelector GlobalSelector::get(Selector Sel, Program &Prog) {
   for (unsigned i = 0, e = Sel.isUnarySelector() ? 1 : Sel.getNumArgs();
          i != e; ++i) {
     IdentifierInfo *II = Sel.getIdentifierInfoForSlot(i);
-    IdentifierInfo *GlobII =
-      &ProgImpl.getIdents().get(II->getNameStart(),
-                                II->getNameStart() + II->getLength());
+    IdentifierInfo *GlobII = &ProgImpl.getIdents().get(II->getName());
     Ids.push_back(GlobII);
   }
 
-- 
2.40.0