Count the number of initializable members correctly in structs/unions
with unnamed members.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@51557 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Sema/SemaInit.cpp b/lib/Sema/SemaInit.cpp
index 6eb072e..43adc2a 100644
--- a/lib/Sema/SemaInit.cpp
+++ b/lib/Sema/SemaInit.cpp
@@ -38,9 +38,13 @@
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/test/Sema/array-init.c b/test/Sema/array-init.c
index 6925556..c1a789e 100644
--- a/test/Sema/array-init.c
+++ b/test/Sema/array-init.c
@@ -216,3 +216,9 @@
// 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];
+