Add a new getLength() method to IdentifierInfo, which relies on a newly added

method to StringMapEntry.  Steve, please use this to remove the
strlen calls in selector processing.

llvm-svn: 42481

1 files changed, 11 insertions, 2 deletions

diff --git a/clang/include/clang/Lex/IdentifierTable.h b/clang/include/clang/Lex/IdentifierTable.h
index b98cd9517a0..878f23788e8 100644
--- a/clang/include/clang/Lex/IdentifierTable.h
+++ b/clang/include/clang/Lex/IdentifierTable.h
@@ -53,8 +53,17 @@ public:
   /// string is properly null terminated.
   ///
   const char *getName() const {
-    // String data is stored immediately after the IdentifierInfo object.
-    return (const char*)(this+1);
+    // We know that this is embedded into a StringMapEntry, and it knows how to
+    // efficiently find the string.
+    return llvm::StringMapEntry<IdentifierInfo>::
+                  GetStringMapEntryFromValue(*this).getKeyData();
+  }
+  
+  /// getLength - Efficiently return the length of this identifier info.
+  ///
+  unsigned getLength() const {
+    return llvm::StringMapEntry<IdentifierInfo>::
+                    GetStringMapEntryFromValue(*this).getKeyLength();
   }
   
   /// getMacroInfo - Return macro information about this identifier, or null if