Fix PR2017 and silence some bogus errors.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@49068 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp
index c958dd1..2d0251c 100644
--- a/lib/Sema/SemaDecl.cpp
+++ b/lib/Sema/SemaDecl.cpp
@@ -951,7 +951,7 @@
// Block scope. C99 6.7p7: If an identifier for an object is declared with
// no linkage (C99 6.2.2p6), the type for the object shall be complete...
if (BVD && IDecl->getStorageClass() != VarDecl::Extern) {
- if (T->isIncompleteType()) {
+ if (T->isIncompleteType() && !IDecl->isInvalidDecl()) {
Diag(IDecl->getLocation(), diag::err_typecheck_decl_incomplete_type,
T.getAsString());
IDecl->setInvalidDecl();
@@ -967,7 +967,7 @@
if (T->isIncompleteArrayType()) {
// C99 6.9.2 (p2, p5): Implicit initialization causes an incomplete
// array to be completed. Don't issue a diagnostic.
- } else if (T->isIncompleteType()) {
+ } else if (T->isIncompleteType() && !IDecl->isInvalidDecl()) {
// 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.
@@ -1100,7 +1100,8 @@
// C99 6.7.5.3p4: the parameters in a parameter type list in a function
// declarator that is part of a function definition of that function
// shall not have incomplete type.
- if (parmDecl->getType()->isIncompleteType()) {
+ if (parmDecl->getType()->isIncompleteType() &&
+ !parmDecl->isInvalidDecl()) {
Diag(parmDecl->getLocation(), diag::err_typecheck_decl_incomplete_type,
parmDecl->getType().getAsString());
parmDecl->setInvalidDecl();
diff --git a/lib/Sema/SemaType.cpp b/lib/Sema/SemaType.cpp
index d4cb979..ad9d138 100644
--- a/lib/Sema/SemaType.cpp
+++ b/lib/Sema/SemaType.cpp
@@ -203,7 +203,7 @@
DeclType.Ref.AttrList = ProcessTypeAttributes(T, AL);
break;
case DeclaratorChunk::Array: {
- const DeclaratorChunk::ArrayTypeInfo &ATI = DeclType.Arr;
+ DeclaratorChunk::ArrayTypeInfo &ATI = DeclType.Arr;
Expr *ArraySize = static_cast<Expr*>(ATI.NumElts);
ArrayType::ArraySizeModifier ASM;
if (ATI.isStar)
@@ -246,9 +246,11 @@
Diag(ArraySize->getLocStart(), diag::err_array_size_non_int,
ArraySize->getType().getAsString(), ArraySize->getSourceRange());
D.setInvalidType(true);
+ delete ArraySize;
+ ATI.NumElts = ArraySize = 0;
}
llvm::APSInt ConstVal(32);
- // If no expression was provided, we consider it a VLA.
+ // If no expression was provided, we consider it an incomplete array.
if (!ArraySize) {
T = Context.getIncompleteArrayType(T, ASM, ATI.TypeQuals);
} else if (!ArraySize->isIntegerConstantExpr(ConstVal, Context)) {