aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/clang/Basic/IdentifierTable.h12
-rw-r--r--lib/Frontend/PCHReader.cpp2
2 files changed, 9 insertions, 5 deletions
diff --git a/include/clang/Basic/IdentifierTable.h b/include/clang/Basic/IdentifierTable.h
index 7e9a7e3b63..75a1cabf0b 100644
--- a/include/clang/Basic/IdentifierTable.h
+++ b/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/lib/Frontend/PCHReader.cpp b/lib/Frontend/PCHReader.cpp
index 267f4c1585..49eb2a0e60 100644
--- a/lib/Frontend/PCHReader.cpp
+++ b/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];