diff options
| -rw-r--r-- | clang/lib/Sema/SemaInit.cpp | 8 | ||||
| -rw-r--r-- | clang/test/Sema/array-init.c | 6 |
2 files changed, 12 insertions, 2 deletions
diff --git a/clang/lib/Sema/SemaInit.cpp b/clang/lib/Sema/SemaInit.cpp index 6eb072eebaf..43adc2a82f9 100644 --- a/clang/lib/Sema/SemaInit.cpp +++ b/clang/lib/Sema/SemaInit.cpp @@ -38,9 +38,13 @@ int InitListChecker::numArrayElements(QualType DeclType) { int InitListChecker::numStructUnionElements(QualType DeclType) { RecordDecl *structDecl = DeclType->getAsRecordType()->getDecl(); + int InitializableMembers = 0; + for (int i = 0; i < structDecl->getNumMembers(); i++) + if (structDecl->getMember(i)->getIdentifier()) + ++InitializableMembers; if (structDecl->getKind() == Decl::Union) - return std::min(structDecl->getNumMembers(), 1); - return structDecl->getNumMembers() - structDecl->hasFlexibleArrayMember(); + return std::min(InitializableMembers, 1); + return InitializableMembers - structDecl->hasFlexibleArrayMember(); } void InitListChecker::CheckImplicitInitList(InitListExpr *ParentIList, diff --git a/clang/test/Sema/array-init.c b/clang/test/Sema/array-init.c index 69255569ddc..c1a789ea5b3 100644 --- a/clang/test/Sema/array-init.c +++ b/clang/test/Sema/array-init.c @@ -216,3 +216,9 @@ void varArray() { // PR2151 int emptyInit() {struct {} x[] = {6};} //expected-warning{{empty struct extension}} expected-error{{initializer for aggregate with no elements}} +int noNamedInit() { +struct {int:5;} x[] = {6}; //expected-error{{initializer for aggregate with no elements}} +} +struct {int a; int:5;} noNamedImplicit[] = {1,2,3}; +int noNamedImplicitCheck[sizeof(noNamedImplicit) == 3 * sizeof(*noNamedImplicit) ? 1 : -1]; + |
