Sema::CheckInitializerTypes(). Start simpliying and cleaning up...
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@46234 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/Sema/SemaDecl.cpp b/Sema/SemaDecl.cpp
index b1753e1..44eb70b 100644
--- a/Sema/SemaDecl.cpp
+++ b/Sema/SemaDecl.cpp
@@ -513,6 +513,13 @@
bool Sema::CheckInitializerTypes(Expr *&Init, QualType &DeclType) {
bool hadError = false;
+ // C99 6.7.8p3: The type of the entity to be initialized shall be an array
+ // of unknown size ("[]") or an object type that is not a variable array type.
+ if (const VariableArrayType *VAT = DeclType->getAsVariablyModifiedType())
+ return Diag(VAT->getSizeExpr()->getLocStart(),
+ diag::err_variable_object_no_init,
+ VAT->getSizeExpr()->getSourceRange());
+
InitListExpr *InitList = dyn_cast<InitListExpr>(Init);
if (!InitList) {
if (StringLiteral *strLiteral = dyn_cast<StringLiteral>(Init)) {
@@ -550,10 +557,7 @@
// C99 6.7.8p3: The type of the entity to be initialized shall be an array
// of unknown size ("[]") or an object type that is not a variable array type.
- if (const VariableArrayType *VAT = DeclType->getAsVariableArrayType()) {
- if (const Expr *expr = VAT->getSizeExpr())
- return Diag(expr->getLocStart(), diag::err_variable_object_no_init,
- expr->getSourceRange());
+ if (const VariableArrayType *VAT = DeclType->getAsIncompleteArrayType()) {
// We have a VariableArrayType with unknown size. Note that only the first
// array can have unknown size. For example, "int [][]" is illegal.