From a3b09590e6b9fd34735363ddff457797c599eaef Mon Sep 17 00:00:00 2001
From: Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com>
Date: Fri, 12 Mar 2010 10:32:27 +0000
Subject: [PATCH] Add IdentifierTable::get() overload and start using it

llvm-svn: 98343
---
 clang/include/clang/Basic/IdentifierTable.h | 12 ++++++++----
 clang/lib/Frontend/PCHReader.cpp            |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/clang/include/clang/Basic/IdentifierTable.h b/clang/include/clang/Basic/IdentifierTable.h
index 7e9a7e3b63c9..75a1cabf0b95 100644
--- a/clang/include/clang/Basic/IdentifierTable.h
+++ b/clang/include/clang/Basic/IdentifierTable.h
@@ -311,6 +311,14 @@ public:
     return *II;
   }
 
+  IdentifierInfo &get(llvm::StringRef Name) {
+    return get(Name.begin(), Name.end());
+  }
+
+  IdentifierInfo &get(const char *Name, size_t NameLen) {
+    return get(llvm::StringRef(Name, NameLen));
+  }
+
   /// \brief Creates a new IdentifierInfo from the given string.
   ///
   /// This is a lower-level version of get() that requires that this
@@ -342,10 +350,6 @@ public:
     return CreateIdentifierInfo(Name.begin(), Name.end());
   }
 
-  IdentifierInfo &get(llvm::StringRef Name) {
-    return get(Name.begin(), Name.end());
-  }
-
   typedef HashTableTy::const_iterator iterator;
   typedef HashTableTy::const_iterator const_iterator;
 
diff --git a/clang/lib/Frontend/PCHReader.cpp b/clang/lib/Frontend/PCHReader.cpp
index 267f4c158508..49eb2a0e600d 100644
--- a/clang/lib/Frontend/PCHReader.cpp
+++ b/clang/lib/Frontend/PCHReader.cpp
@@ -2628,7 +2628,7 @@ IdentifierInfo *PCHReader::DecodeIdentifierInfo(unsigned ID) {
     unsigned StrLen = (((unsigned) StrLenPtr[0])
                        | (((unsigned) StrLenPtr[1]) << 8)) - 1;
     IdentifiersLoaded[ID - 1]
-      = &PP->getIdentifierTable().get(Str, Str + StrLen);
+      = &PP->getIdentifierTable().get(Str, StrLen);
   }
 
   return IdentifiersLoaded[ID - 1];