diff options
| author | Sebastian Redl <sebastian.redl@getdesigned.at> | 2010-07-30 17:25:10 +0000 |
|---|---|---|
| committer | Sebastian Redl <sebastian.redl@getdesigned.at> | 2010-07-30 17:25:10 +0000 |
| commit | 1450ef99896d66ba67e2ddd2798a29be1bf560b8 (patch) | |
| tree | 9f8604dcd59cf44df0cd9d67a46fc2bbf403647f /lib/Sema/IdentifierResolver.cpp | |
| parent | 9f339ba5b00256588d0d78786fff6d48ef073015 (diff) | |
Correctly deal with using names for both functions and structs in chained PCH.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@109871 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/IdentifierResolver.cpp')
| -rw-r--r-- | lib/Sema/IdentifierResolver.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/lib/Sema/IdentifierResolver.cpp b/lib/Sema/IdentifierResolver.cpp index b09526e097..62df1a7c2c 100644 --- a/lib/Sema/IdentifierResolver.cpp +++ b/lib/Sema/IdentifierResolver.cpp @@ -139,6 +139,9 @@ bool IdentifierResolver::isDeclInScope(Decl *D, DeclContext *Ctx, /// AddDecl - Link the decl to its shadowed decl chain. void IdentifierResolver::AddDecl(NamedDecl *D) { DeclarationName Name = D->getDeclName(); + if (IdentifierInfo *II = Name.getAsIdentifierInfo()) + II->setIsFromPCH(false); + void *Ptr = Name.getFETokenInfo<void>(); if (!Ptr) { @@ -164,6 +167,9 @@ void IdentifierResolver::AddDecl(NamedDecl *D) { void IdentifierResolver::RemoveDecl(NamedDecl *D) { assert(D && "null param passed"); DeclarationName Name = D->getDeclName(); + if (IdentifierInfo *II = Name.getAsIdentifierInfo()) + II->setIsFromPCH(false); + void *Ptr = Name.getFETokenInfo<void>(); assert(Ptr && "Didn't find this decl on its identifier's chain!"); @@ -182,6 +188,9 @@ bool IdentifierResolver::ReplaceDecl(NamedDecl *Old, NamedDecl *New) { "Cannot replace a decl with another decl of a different name"); DeclarationName Name = Old->getDeclName(); + if (IdentifierInfo *II = Name.getAsIdentifierInfo()) + II->setIsFromPCH(false); + void *Ptr = Name.getFETokenInfo<void>(); if (!Ptr) @@ -218,6 +227,7 @@ IdentifierResolver::begin(DeclarationName Name) { void IdentifierResolver::AddDeclToIdentifierChain(IdentifierInfo *II, NamedDecl *D) { + II->setIsFromPCH(false); void *Ptr = II->getFETokenInfo<void>(); if (!Ptr) { |