replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Only preload SLocEntries after the entire PCH chain was loaded. 

llvm-svn: 114518
This commit is contained in:
Sebastian Redl 2010-09-22 00:42:30 +00:00
parent 949fe9e03b
commit 96371b446e
2 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
clang/include/clang/Serialization/ASTReader.h
View File

@ -228,6 +228,9 @@ private:
/// AST file.
const uint32_t *SLocOffsets;
/// \brief The next SourceLocation offset after reading this file.
unsigned NextOffset;
// === Identifiers ===
/// \brief The number of identifiers in this AST file.
@ -326,6 +329,9 @@ private:
/// That is, the entry I was created with -include-pch I+1.
llvm::SmallVector<PerFileData*, 2> Chain;
/// \brief SLocEntries that we're going to preload.
llvm::SmallVector<uint64_t, 64> PreloadSLocEntries;
/// \brief Types that have already been loaded from the chain.
///
/// When the pointer at index I is non-NULL, the type with

37
clang/lib/Serialization/ASTReader.cpp
View File

@ -1863,11 +1863,13 @@ ASTReader::ReadASTBlock(PerFileData &F) {
TotalNumMethodPoolEntries += Record[1];
break;
case REFERENCED_SELECTOR_POOL: {
ReferencedSelectorsData.insert(ReferencedSelectorsData.end(),
Record.begin(), Record.end());
case REFERENCED_SELECTOR_POOL:
if (ReferencedSelectorsData.empty())
ReferencedSelectorsData.swap(Record);
else
ReferencedSelectorsData.insert(ReferencedSelectorsData.end(),
Record.begin(), Record.end());
break;
}
case PP_COUNTER_VALUE:
if (!Record.empty() && Listener)
@ -1877,19 +1879,15 @@ ASTReader::ReadASTBlock(PerFileData &F) {
case SOURCE_LOCATION_OFFSETS:
F.SLocOffsets = (const uint32_t *)BlobStart;
F.LocalNumSLocEntries = Record[0];
// We cannot delay this until the entire chain is loaded, because then
// source location preloads would also have to be delayed.
// FIXME: Is there a reason not to do that?
TotalNumSLocEntries += F.LocalNumSLocEntries;
SourceMgr.PreallocateSLocEntries(this, TotalNumSLocEntries, Record[1]);
F.NextOffset = Record[1];
break;
case SOURCE_LOCATION_PRELOADS:
for (unsigned I = 0, N = Record.size(); I != N; ++I) {
ASTReadResult Result = ReadSLocEntryRecord(Record[I]);
if (Result != Success)
return Result;
}
if (PreloadSLocEntries.empty())
PreloadSLocEntries.swap(Record);
else
PreloadSLocEntries.insert(PreloadSLocEntries.end(),
Record.begin(), Record.end());
break;
case STAT_CACHE: {
@ -1996,11 +1994,12 @@ ASTReader::ASTReadResult ASTReader::ReadAST(const std::string &FileName) {
// Here comes stuff that we only do once the entire chain is loaded.
// Allocate space for loaded identifiers, decls and types.
// Allocate space for loaded slocentries, identifiers, decls and types.
unsigned TotalNumIdentifiers = 0, TotalNumTypes = 0, TotalNumDecls = 0,
TotalNumPreallocatedPreprocessingEntities = 0, TotalNumMacroDefs = 0,
TotalNumSelectors = 0;
for (unsigned I = 0, N = Chain.size(); I != N; ++I) {
TotalNumSLocEntries += Chain[I]->LocalNumSLocEntries;
TotalNumIdentifiers += Chain[I]->LocalNumIdentifiers;
TotalNumTypes += Chain[I]->LocalNumTypes;
TotalNumDecls += Chain[I]->LocalNumDecls;
@ -2009,6 +2008,8 @@ ASTReader::ASTReadResult ASTReader::ReadAST(const std::string &FileName) {
TotalNumMacroDefs += Chain[I]->LocalNumMacroDefinitions;
TotalNumSelectors += Chain[I]->LocalNumSelectors;
}
SourceMgr.PreallocateSLocEntries(this, TotalNumSLocEntries,
Chain.front()->NextOffset);
IdentifiersLoaded.resize(TotalNumIdentifiers);
TypesLoaded.resize(TotalNumTypes);
DeclsLoaded.resize(TotalNumDecls);
@ -2024,6 +2025,12 @@ ASTReader::ASTReadResult ASTReader::ReadAST(const std::string &FileName) {
}
}
SelectorsLoaded.resize(TotalNumSelectors);
// Preload SLocEntries.
for (unsigned I = 0, N = PreloadSLocEntries.size(); I != N; ++I) {
ASTReadResult Result = ReadSLocEntryRecord(PreloadSLocEntries[I]);
if (Result != Success)
return Result;
}
// Check the predefines buffers.
if (!DisableValidation && CheckPredefinesBuffers())