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

[PCH] When loading fields from external storage make sure to also 

load in the IndirectField declarations as well.

Field designators in initializer lists depend on traversing the fields
decl chain to find the indirect fields.

Fixes rdar://12239321

llvm-svn: 163552
This commit is contained in:
Argyrios Kyrtzidis 2012-09-10 22:04:22 +00:00
parent c6fcbf06a6
commit f89a92702f
2 changed files with 42 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
clang/lib/AST/Decl.cpp
View File

@ -2762,6 +2762,10 @@ void RecordDecl::completeDefinition() {
TagDecl::completeDefinition();
}
static bool isFieldOrIndirectField(Decl::Kind K) {
return FieldDecl::classofKind(K) || IndirectFieldDecl::classofKind(K);
}
void RecordDecl::LoadFieldsFromExternalStorage() const {
ExternalASTSource *Source = getASTContext().getExternalSource();
assert(hasExternalLexicalStorage() && Source && "No external storage?");
@ -2771,7 +2775,8 @@ void RecordDecl::LoadFieldsFromExternalStorage() const {
SmallVector<Decl*, 64> Decls;
LoadedFieldsFromExternalStorage = true;
switch (Source->FindExternalLexicalDeclsBy<FieldDecl>(this, Decls)) {
switch (Source->FindExternalLexicalDecls(this, isFieldOrIndirectField,
Decls)) {
case ELR_Success:
break;
@ -2783,7 +2788,7 @@ void RecordDecl::LoadFieldsFromExternalStorage() const {
#ifndef NDEBUG
// Check that all decls we got were FieldDecls.
for (unsigned i=0, e=Decls.size(); i != e; ++i)
assert(isa<FieldDecl>(Decls[i]));
assert(isa<FieldDecl>(Decls[i]) || isa<IndirectFieldDecl>(Decls[i]));
#endif
if (Decls.empty())

35
clang/test/PCH/field-designator.c Normal file
View File

@ -0,0 +1,35 @@
// RUN: %clang_cc1 -cc1 %s -include %s
// RUN: %clang_cc1 -cc1 %s -emit-pch -o %t.pch
// RUN: %clang_cc1 -cc1 %s -include-pch %t.pch
// rdar://12239321 Make sure we don't emit a bogus
// error: field designator 'e' does not refer to a non-static data member
#ifndef HEADER
#define HEADER
//===----------------------------------------------------------------------===//
struct U {
union {
struct {
int e;
int f;
};
int a;
};
};
//===----------------------------------------------------------------------===//
#else
#if !defined(HEADER)
# error Header inclusion order messed up
#endif
//===----------------------------------------------------------------------===//
void bar() {
static const struct U plan = { .e = 1 };
}
//===----------------------------------------------------------------------===//
#endif