maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

On reading DeclContexts from PCH, check for visible updates even if the context was empty in the original version. Also, if there are any, tell the context that it has external visible decls. This fixes the problem that a namespace that was empty in the initial PCH (could also happen if the initial PCH didn't include any std header but caused implicit creation of namespace std, e.g. due to implicit declaration of a virtual destructor) never found any declaration declared in *any* chained PCH. Very ugly when the chained PCH includes all that std stuff, as the errors were effectively the same as not including std headers. 

llvm-svn: 130102
This commit is contained in:
Sebastian Redl 2011-04-24 16:27:54 +00:00
parent 83f3b859ab
commit f830df4e9d
2 changed files with 42 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
clang/lib/Serialization/ASTReaderDecl.cpp
View File

@ -1661,13 +1661,18 @@ Decl *ASTReader::ReadDeclRecord(unsigned Index, DeclID ID) {
// so we need to make sure we insert in front. For all other contexts,
// the vector is empty here anyway, so there's no loss in efficiency.
Infos.insert(Infos.begin(), Info);
}
// Now add the pending visible updates for this decl context, if it has
// any.
// Now add the pending visible updates for this decl context, if it has any.
DeclContextVisibleUpdatesPending::iterator I =
PendingVisibleUpdates.find(ID);
if (I != PendingVisibleUpdates.end()) {
// There are updates. This means the context has external visible
// storage, even if the original stored version didn't.
DC->setHasExternalVisibleStorage(true);
DeclContextVisibleUpdates &U = I->second;
DeclContextInfos &Infos = DeclContextOffsets[DC];
DeclContextInfo Info;
Info.LexicalDecls = 0;
Info.NumLexicalDecls = 0;
for (DeclContextVisibleUpdates::iterator UI = U.begin(), UE = U.end();
@ -1678,7 +1683,6 @@ Decl *ASTReader::ReadDeclRecord(unsigned Index, DeclID ID) {
PendingVisibleUpdates.erase(I);
}
}
}
assert(Idx == Record.size());
// The declaration may have been modified by files later in the chain.

24
clang/test/PCH/chain-empty-initial-namespace.cpp Normal file
View File

@ -0,0 +1,24 @@
// no PCH
// RUN: %clang_cc1 -include %s -include %s -fsyntax-only %s
// full PCH
// RUN: %clang_cc1 -chain-include %s -chain-include %s -fsyntax-only %s
#if !defined(PASS1)
#define PASS1
namespace foo {} // no external storage
#elif !defined(PASS2)
#define PASS2
namespace foo {
void bar();
}
#else
// PASS3
void test() {
foo::bar(); // no-error
}
#endif