Be a bit more defensive in SemaInit.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@51301 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Sema/SemaInit.cpp b/lib/Sema/SemaInit.cpp
index d5378d3..20fa507 100644
--- a/lib/Sema/SemaInit.cpp
+++ b/lib/Sema/SemaInit.cpp
@@ -111,7 +111,8 @@
diag::err_excess_initializers_in_char_array_initializer,
IList->getInit(Index)->getSourceRange());
hadError = true;
- } else {
+ } else if (!T->isIncompleteType()) {
+ // Don't warn for incomplete types, since we'll get an error elsewhere
SemaRef->Diag(IList->getInit(Index)->getLocStart(),
diag::warn_excess_initializers,
IList->getInit(Index)->getSourceRange());
@@ -137,6 +138,11 @@
CheckArrayType(IList, DeclType, Index);
else
assert(0 && "Aggregate that isn't a function or array?!");
+ } else if (DeclType->isVoidType()) {
+ // This is clearly invalid, so not much we can do here. Don't bother
+ // with a diagnostic; we'll give an error elsewhere.
+ Index++;
+ hadError = true;
} else {
// In C, all types are either scalars or aggregates, but
// additional handling is needed here for C++ (and possibly others?).