rearrange GetIdentifierInfo so that the fast path can be partially inlined into PTHLexer::Lex. This speeds up the user time of PTH -Eonly by another 2ms (4.4%)
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@62454 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Lex/PTHLexer.cpp b/lib/Lex/PTHLexer.cpp
index a1d7f57..7df8e35 100644
--- a/lib/Lex/PTHLexer.cpp
+++ b/lib/Lex/PTHLexer.cpp
@@ -596,15 +596,9 @@
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 @@
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;
}