Sema::FinalizeDeclaratorGroup(): Tighten up the tentative definition rule when dealing with arrays.
Bug submitted by Eli.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@46179 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/Sema/SemaDecl.cpp b/Sema/SemaDecl.cpp
index c2c66a2..b1753e1 100644
--- a/Sema/SemaDecl.cpp
+++ b/Sema/SemaDecl.cpp
@@ -855,10 +855,15 @@
// external linkage is valid (C99 6.2.2p5).
if (FVD && !FVD->getInit() && (FVD->getStorageClass() == VarDecl::Static ||
FVD->getStorageClass() == VarDecl::None)) {
- // C99 6.9.2p3: If the declaration of an identifier for an object is
- // a tentative definition and has internal linkage (C99 6.2.2p3), the
- // declared type shall not be an incomplete type.
- if (T->isIncompleteType()) {
+ const VariableArrayType *VAT = T->getAsVariableArrayType();
+
+ if (VAT && VAT->getSizeExpr() == 0) {
+ // C99 6.9.2 (p2, p5): Implicit initialization causes an incomplete
+ // array to be completed. Don't issue a diagnostic.
+ } else if (T->isIncompleteType()) {
+ // C99 6.9.2p3: If the declaration of an identifier for an object is
+ // a tentative definition and has internal linkage (C99 6.2.2p3), the
+ // declared type shall not be an incomplete type.
Diag(IDecl->getLocation(), diag::err_typecheck_decl_incomplete_type,
T.getAsString());
IDecl->setInvalidDecl();
diff --git a/test/Sema/array-constraint.c b/test/Sema/array-constraint.c
index 8b2ce5e..3ed5215 100644
--- a/test/Sema/array-constraint.c
+++ b/test/Sema/array-constraint.c
@@ -24,7 +24,7 @@
return a;
}
-int foo[](void); // expected-error {{variable has incomplete type 'int (*[])(void)'}} expected-error {{'foo' declared as array of functions}}
+int foo[](void); // expected-error {{'foo' declared as array of functions}}
int foo2[1](void); // expected-error {{'foo2' declared as array of functions}}
typedef int (*pfunc)(void);
diff --git a/test/Sema/incomplete-decl.c b/test/Sema/incomplete-decl.c
index e342ab8..047c242 100644
--- a/test/Sema/incomplete-decl.c
+++ b/test/Sema/incomplete-decl.c
@@ -9,7 +9,11 @@
extern void d;
extern struct foo e;
+int ary[];
+struct foo bary[]; // expected-error {{array has incomplete element type 'struct foo'}}
+
void func() {
+ int ary[]; // expected-error{{variable has incomplete type 'int []'}}
void b; // expected-error {{variable has incomplete type 'void'}}
struct foo f; // expected-error {{variable has incomplete type 'struct foo'}}
}