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/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)) {