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

If we get a TU_CONTEXT update from a chained PCH file before we 

actually have an ASTContext, delay the processing of that
update. Patch by Sebastian Redl! Fixes <rdar://problem/8499034>.

llvm-svn: 115263
This commit is contained in:
Douglas Gregor 2010-10-01 01:18:02 +00:00
parent 1f4e15c56f
commit aa43301842
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1768,7 +1768,8 @@ ASTReader::ReadASTBlock(PerFileData &F) {
reinterpret_cast<const DeclID *>(BlobStart),
BlobLen / sizeof(DeclID)
};
DeclContextOffsets[Context->getTranslationUnitDecl()].push_back(Info);
DeclContextOffsets[Context ? Context->getTranslationUnitDecl() : 0]
.push_back(Info);
break;
}
@ -1778,7 +1779,7 @@ ASTReader::ReadASTBlock(PerFileData &F) {
(const unsigned char *)BlobStart + Record[1],
(const unsigned char *)BlobStart,
ASTDeclContextNameLookupTrait(*this));
if (ID == 1) { // Is it the TU?
if (ID == 1 && Context) { // Is it the TU?
DeclContextInfo Info = {
Table, /* No lexical inforamtion */ 0, 0
};
@ -2229,6 +2230,17 @@ void ASTReader::InitializeContext(ASTContext &Ctx) {
PP->getHeaderSearchInfo().SetExternalLookup(this);
PP->setExternalSource(this);
// If we have an update block for the TU waiting, we have to add it before
// deserializing the decl.
DeclContextOffsetsMap::iterator DCU = DeclContextOffsets.find(0);
if (DCU != DeclContextOffsets.end()) {
// Insertion could invalidate map, so grab vector.
DeclContextInfos T;
T.swap(DCU->second);
DeclContextOffsets.erase(DCU);
DeclContextOffsets[Ctx.getTranslationUnitDecl()].swap(T);
}
// Load the translation unit declaration
GetTranslationUnitDecl();