rearrange GetIdentifierInfo so that the fast path can be partially inlined into PTHLe...

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@62454 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang/Lex/PTHManager.h b/include/clang/Lex/PTHManager.h
index b9d2493327239337c8fc1c160a58244abb9e8c09..09cd9e9e3c92b1ada05d4001b7fd4a81af510239 100644 (file)
--- a/include/clang/Lex/PTHManager.h
+++ b/include/clang/Lex/PTHManager.h
@@ -109,7 +109,13 @@ class PTHManager : public IdentifierInfoLookup {
   
   /// GetIdentifierInfo - Used to reconstruct IdentifierInfo objects from the
   ///  PTH file.
-  IdentifierInfo* GetIdentifierInfo(unsigned);
+  inline IdentifierInfo* GetIdentifierInfo(unsigned PersistentID) {
+    // Check if the IdentifierInfo has already been resolved.
+    if (IdentifierInfo* II = PerIDCache[PersistentID])
+      return II;
+    return LazilyCreateIdentifierInfo(PersistentID);
+  }
+  IdentifierInfo* LazilyCreateIdentifierInfo(unsigned PersistentID);
   
 public:  
   ~PTHManager();

diff --git a/lib/Lex/PTHLexer.cpp b/lib/Lex/PTHLexer.cpp
index a1d7f5735ea1454ab3c441aa0f912525e32ffdbe..7df8e35986e184cf92096bacd3aea7d2523618d7 100644 (file)
--- a/lib/Lex/PTHLexer.cpp
+++ b/lib/Lex/PTHLexer.cpp
@@ -596,15 +596,9 @@ PTHManager* PTHManager::Create(const std::string& file) {
   return new PTHManager(File.take(), FL.take(), IData, PerIDCache,
                         SortedIdTable, NumIds);
 }
-
-IdentifierInfo* PTHManager::GetIdentifierInfo(unsigned persistentID) {
-    
-  // Check if the IdentifierInfo has already been resolved.
-  IdentifierInfo* II = PerIDCache[persistentID];
-  if (II) return II;
-  
+IdentifierInfo* PTHManager::LazilyCreateIdentifierInfo(unsigned PersistentID) {
   // Look in the PTH file for the string data for the IdentifierInfo object.
-  const unsigned char* TableEntry = IdDataTable + sizeof(uint32_t)*persistentID;
+  const unsigned char* TableEntry = IdDataTable + sizeof(uint32_t)*PersistentID;
   const unsigned char* IDData =
     (const unsigned char*)Buf->getBufferStart() + Read32(TableEntry);
   assert(IDData < (const unsigned char*)Buf->getBufferEnd());
@@ -614,10 +608,10 @@ IdentifierInfo* PTHManager::GetIdentifierInfo(unsigned persistentID) {
     Alloc.Allocate<std::pair<IdentifierInfo,const unsigned char*> >();
 
   Mem->second = IDData;
-  II = new ((void*) Mem) IdentifierInfo(true);
+  IdentifierInfo *II = new ((void*) Mem) IdentifierInfo(true);
   
   // Store the new IdentifierInfo in the cache.
-  PerIDCache[persistentID] = II;
+  PerIDCache[PersistentID] = II;
   return II;
 }