diff options
| author | Eli Friedman <eli.friedman@gmail.com> | 2008-08-09 23:45:45 +0000 |
|---|---|---|
| committer | Eli Friedman <eli.friedman@gmail.com> | 2008-08-09 23:45:45 +0000 |
| commit | 1bb516c8615714317c72ec8065cc3177714d336e (patch) | |
| tree | bea8d600cccdc3f132e23321f0e12ca5600b0c8d /lib/Sema/SemaInit.cpp | |
| parent | c34bcde8d2aa7430cb2f3abb003d9248842748b8 (diff) | |
Make sure to count the struct elements correctly; here, we want the
member count. The count returned by numStructUnionElements is the
number of initializers that will be consumed, not the number of members
to iterate through. Fixes PR2534.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@54601 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaInit.cpp')
| -rw-r--r-- | lib/Sema/SemaInit.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/Sema/SemaInit.cpp b/lib/Sema/SemaInit.cpp index 1889bafacb..bc38de3633 100644 --- a/lib/Sema/SemaInit.cpp +++ b/lib/Sema/SemaInit.cpp @@ -286,7 +286,8 @@ void InitListChecker::CheckStructUnionTypes(InitListExpr *IList, // If structDecl is a forward declaration, this loop won't do anything; // That's okay, because an error should get printed out elsewhere. It // might be worthwhile to skip over the rest of the initializer, though. - int numMembers = numStructUnionElements(DeclType); + int numMembers = DeclType->getAsRecordType()->getDecl()->getNumMembers() - + structDecl->hasFlexibleArrayMember(); for (int i = 0; i < numMembers; i++) { // Don't attempt to go past the end of the init list if (Index >= IList->getNumInits()) |