[cfe-commits] r108930 - in /cfe/trunk: include/clang/Frontend/PCHReader.h lib/Frontend/PCHReader.cpp
Sebastian Redl
sebastian.redl at getdesigned.at
Tue Jul 20 14:20:32 PDT 2010
Author: cornedbee
Date: Tue Jul 20 16:20:32 2010
New Revision: 108930
URL: http://llvm.org/viewvc/llvm-project?rev=108930&view=rev
Log:
More work on getting PCHReader to handle multiple files. Promote SLocOffsets to per-file data. WIP
Modified:
cfe/trunk/include/clang/Frontend/PCHReader.h
cfe/trunk/lib/Frontend/PCHReader.cpp
Modified: cfe/trunk/include/clang/Frontend/PCHReader.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Frontend/PCHReader.h?rev=108930&r1=108929&r2=108930&view=diff
==============================================================================
--- cfe/trunk/include/clang/Frontend/PCHReader.h (original)
+++ cfe/trunk/include/clang/Frontend/PCHReader.h Tue Jul 20 16:20:32 2010
@@ -230,6 +230,10 @@
/// \brief The number of source location entries in this PCH file.
unsigned LocalNumSLocEntries;
+ /// \brief Offsets for all of the source location entries in the
+ /// PCH file.
+ const uint32_t *SLocOffsets;
+
/// \brief The number of types in this PCH file.
unsigned LocalNumTypes;
@@ -269,14 +273,6 @@
/// user, the last one is the one that doesn't depend on anything further.
llvm::SmallVector<PerFileData*, 2> Chain;
- /// \brief Offsets for all of the source location entries in the
- /// PCH files. The offsets are relative to a particular file; the correct
- /// file is chosen using their IDs.
- const uint32_t *SLocOffsets;
-
- /// \brief The number of source location entries in all PCH files.
- unsigned TotalNumSLocEntries;
-
/// \brief Types that have already been loaded from the PCH file.
///
/// When the pointer at index I is non-NULL, the type with
@@ -415,6 +411,9 @@
/// the PCH file.
unsigned NumSLocEntriesRead;
+ /// \brief The number of source location entries in all PCH files.
+ unsigned TotalNumSLocEntries;
+
/// \brief The number of statements (and expressions) de-serialized
/// from the PCH file.
unsigned NumStatementsRead;
@@ -537,7 +536,7 @@
PCHReadResult ReadPCHCore(llvm::StringRef FileName);
PCHReadResult ReadPCHBlock(PerFileData &F);
bool CheckPredefinesBuffers();
- bool ParseLineTable(PerFileData &F, llvm::SmallVectorImpl<uint64_t> &Record);
+ bool ParseLineTable(llvm::SmallVectorImpl<uint64_t> &Record);
PCHReadResult ReadSourceManagerBlock(PerFileData &F);
PCHReadResult ReadSLocEntryRecord(unsigned ID);
Modified: cfe/trunk/lib/Frontend/PCHReader.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/PCHReader.cpp?rev=108930&r1=108929&r2=108930&view=diff
==============================================================================
--- cfe/trunk/lib/Frontend/PCHReader.cpp (original)
+++ cfe/trunk/lib/Frontend/PCHReader.cpp Tue Jul 20 16:20:32 2010
@@ -423,10 +423,11 @@
TotalNumSelectors(0), MacroDefinitionOffsets(0),
NumPreallocatedPreprocessingEntities(0),
isysroot(isysroot), NumStatHits(0), NumStatMisses(0),
- NumSLocEntriesRead(0), NumStatementsRead(0),
- NumMacrosRead(0), NumMethodPoolSelectorsRead(0), NumMethodPoolMisses(0),
- NumLexicalDeclContextsRead(0), NumVisibleDeclContextsRead(0),
- CurrentlyLoadingTypeOrDecl(0) {
+ NumSLocEntriesRead(0), TotalNumSLocEntries(0), NumStatementsRead(0),
+ TotalNumStatements(0), NumMacrosRead(0), NumMethodPoolSelectorsRead(0),
+ NumMethodPoolMisses(0), TotalNumMacros(0), NumLexicalDeclContextsRead(0),
+ TotalLexicalDeclContexts(0), NumVisibleDeclContextsRead(0),
+ TotalVisibleDeclContexts(0), CurrentlyLoadingTypeOrDecl(0) {
RelocatablePCH = false;
}
@@ -439,10 +440,11 @@
TotalNumSelectors(0), MacroDefinitionOffsets(0),
NumPreallocatedPreprocessingEntities(0),
isysroot(isysroot), NumStatHits(0), NumStatMisses(0),
- NumSLocEntriesRead(0), NumStatementsRead(0),
- NumMacrosRead(0), NumMethodPoolSelectorsRead(0), NumMethodPoolMisses(0),
- NumLexicalDeclContextsRead(0), NumVisibleDeclContextsRead(0),
- CurrentlyLoadingTypeOrDecl(0) {
+ NumSLocEntriesRead(0), TotalNumSLocEntries(0), NumStatementsRead(0),
+ TotalNumStatements(0), NumMacrosRead(0), NumMethodPoolSelectorsRead(0),
+ NumMethodPoolMisses(0), TotalNumMacros(0), NumLexicalDeclContextsRead(0),
+ TotalLexicalDeclContexts(0), NumVisibleDeclContextsRead(0),
+ TotalVisibleDeclContexts(0), CurrentlyLoadingTypeOrDecl(0) {
RelocatablePCH = false;
}
@@ -728,14 +730,10 @@
/// \brief Read the line table in the source manager block.
/// \returns true if ther was an error.
-bool PCHReader::ParseLineTable(PerFileData &F,
- llvm::SmallVectorImpl<uint64_t> &Record) {
+bool PCHReader::ParseLineTable(llvm::SmallVectorImpl<uint64_t> &Record) {
unsigned Idx = 0;
LineTableInfo &LineTable = SourceMgr.getLineTable();
- // FIXME: Handle multiple tables!
- (void)F;
-
// Parse the file names
std::map<int, int> FileIDs;
for (int I = 0, N = Record[Idx++]; I != N; ++I) {
@@ -942,7 +940,7 @@
break;
case pch::SM_LINE_TABLE:
- if (ParseLineTable(F, Record))
+ if (ParseLineTable(Record))
return Failure;
break;
@@ -968,7 +966,7 @@
llvm::BitstreamCursor &SLocEntryCursor = Chain[0]->SLocEntryCursor;
++NumSLocEntriesRead;
- SLocEntryCursor.JumpToBit(SLocOffsets[ID - 1]);
+ SLocEntryCursor.JumpToBit(Chain[0]->SLocOffsets[ID - 1]);
unsigned Code = SLocEntryCursor.ReadCode();
if (Code == llvm::bitc::END_BLOCK ||
Code == llvm::bitc::ENTER_SUBBLOCK ||
@@ -1534,46 +1532,54 @@
break;
case pch::EXTERNAL_DEFINITIONS:
- if (!ExternalDefinitions.empty()) {
- Error("duplicate EXTERNAL_DEFINITIONS record in PCH file");
- return Failure;
- }
- ExternalDefinitions.swap(Record);
+ // Optimization for the first block.
+ if (ExternalDefinitions.empty())
+ ExternalDefinitions.swap(Record);
+ else
+ ExternalDefinitions.insert(ExternalDefinitions.end(),
+ Record.begin(), Record.end());
break;
case pch::SPECIAL_TYPES:
- SpecialTypes.swap(Record);
+ // Optimization for the first block
+ if (SpecialTypes.empty())
+ SpecialTypes.swap(Record);
+ else
+ SpecialTypes.insert(SpecialTypes.end(), Record.begin(), Record.end());
break;
case pch::STATISTICS:
- TotalNumStatements = Record[0];
- TotalNumMacros = Record[1];
- TotalLexicalDeclContexts = Record[2];
- TotalVisibleDeclContexts = Record[3];
+ TotalNumStatements += Record[0];
+ TotalNumMacros += Record[1];
+ TotalLexicalDeclContexts += Record[2];
+ TotalVisibleDeclContexts += Record[3];
break;
case pch::TENTATIVE_DEFINITIONS:
- if (!TentativeDefinitions.empty()) {
- Error("duplicate TENTATIVE_DEFINITIONS record in PCH file");
- return Failure;
- }
- TentativeDefinitions.swap(Record);
+ // Optimization for the first block.
+ if (TentativeDefinitions.empty())
+ TentativeDefinitions.swap(Record);
+ else
+ TentativeDefinitions.insert(TentativeDefinitions.end(),
+ Record.begin(), Record.end());
break;
case pch::UNUSED_STATIC_FUNCS:
- if (!UnusedStaticFuncs.empty()) {
- Error("duplicate UNUSED_STATIC_FUNCS record in PCH file");
- return Failure;
- }
- UnusedStaticFuncs.swap(Record);
+ // Optimization for the first block.
+ if (UnusedStaticFuncs.empty())
+ UnusedStaticFuncs.swap(Record);
+ else
+ UnusedStaticFuncs.insert(UnusedStaticFuncs.end(),
+ Record.begin(), Record.end());
break;
case pch::LOCALLY_SCOPED_EXTERNAL_DECLS:
- if (!LocallyScopedExternalDecls.empty()) {
- Error("duplicate LOCALLY_SCOPED_EXTERNAL_DECLS record in PCH file");
- return Failure;
- }
- LocallyScopedExternalDecls.swap(Record);
+ // Optimization for the first block.
+ if (LocallyScopedExternalDecls.empty())
+ LocallyScopedExternalDecls.swap(Record);
+ else
+ LocallyScopedExternalDecls.insert(LocallyScopedExternalDecls.end(),
+ Record.begin(), Record.end());
break;
case pch::SELECTOR_OFFSETS:
@@ -1599,8 +1605,11 @@
break;
case pch::SOURCE_LOCATION_OFFSETS:
- SLocOffsets = (const uint32_t *)BlobStart;
- TotalNumSLocEntries = Record[0];
+ F.SLocOffsets = (const uint32_t *)BlobStart;
+ F.LocalNumSLocEntries = Record[0];
+ // We cannot delay this until all PCHs are loaded, because then source
+ // location preloads would also have to be delayed.
+ TotalNumSLocEntries += F.LocalNumSLocEntries;
SourceMgr.PreallocateSLocEntries(this, TotalNumSLocEntries, Record[1]);
break;
@@ -1647,6 +1656,8 @@
break;
case pch::ORIGINAL_FILE_NAME:
+ // The primary PCH will be the last to get here, so it will be the one
+ // that's used.
ActualOriginalFileName.assign(BlobStart, BlobLen);
OriginalFileName = ActualOriginalFileName;
MaybeAddSystemRootToFilename(OriginalFileName);
@@ -1690,7 +1701,7 @@
// Here comes stuff that we only do once the entire chain is loaded.
- // Allocate space for loaded decls and types.
+ // Allocate space for loaded identifiers, decls and types.
unsigned TotalNumIdentifiers = 0, TotalNumTypes = 0, TotalNumDecls = 0;
for (unsigned I = 0, N = Chain.size(); I != N; ++I) {
TotalNumIdentifiers += Chain[I]->LocalNumIdentifiers;
@@ -1725,20 +1736,27 @@
IdEnd = PP->getIdentifierTable().end();
Id != IdEnd; ++Id)
Identifiers.push_back(Id->second);
- PCHIdentifierLookupTable *IdTable
- = (PCHIdentifierLookupTable *)Chain[0]->IdentifierLookupTable;
+ // FIXME: The loop order here is very cache-inefficient. Loop over files
+ // should probably be the outer loop.
for (unsigned I = 0, N = Identifiers.size(); I != N; ++I) {
IdentifierInfo *II = Identifiers[I];
- // Look in the on-disk hash table for an entry for
+ // Look in the on-disk hash tables for an entry for this identifier
PCHIdentifierLookupTrait Info(*this, II);
std::pair<const char*, unsigned> Key(II->getNameStart(), II->getLength());
- PCHIdentifierLookupTable::iterator Pos = IdTable->find(Key, &Info);
- if (Pos == IdTable->end())
- continue;
-
- // Dereferencing the iterator has the effect of populating the
- // IdentifierInfo node with the various declarations it needs.
- (void)*Pos;
+ // We need to search the tables in all files.
+ // FIXME: What happens if this stuff changes between files, e.g. the
+ // dependent PCH undefs a macro from the core file?
+ for (unsigned J = 0, M = Chain.size(); J != M; ++J) {
+ PCHIdentifierLookupTable *IdTable
+ = (PCHIdentifierLookupTable *)Chain[J]->IdentifierLookupTable;
+ PCHIdentifierLookupTable::iterator Pos = IdTable->find(Key, &Info);
+ if (Pos == IdTable->end())
+ continue;
+
+ // Dereferencing the iterator has the effect of populating the
+ // IdentifierInfo node with the various declarations it needs.
+ (void)*Pos;
+ }
}
}
More information about the cfe-commits
mailing list