diff options
| -rw-r--r-- | lib/AST/ASTContext.cpp | 3 | ||||
| -rw-r--r-- | lib/Sema/SemaInit.cpp | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp index b230edb93d..00eaa361a3 100644 --- a/lib/AST/ASTContext.cpp +++ b/lib/AST/ASTContext.cpp @@ -1063,6 +1063,9 @@ QualType ASTContext::getConstantArrayType(QualType EltTy, const llvm::APInt &ArySizeIn, ArrayType::ArraySizeModifier ASM, unsigned EltTypeQuals) { + assert((EltTy->isDependentType() || EltTy->isConstantSizeType()) && + "Constant array of VLAs is illegal!"); + // Convert the array size into a canonical width matching the pointer size for // the target. llvm::APInt ArySize(ArySizeIn); diff --git a/lib/Sema/SemaInit.cpp b/lib/Sema/SemaInit.cpp index 6608e120f3..fada7fe0ad 100644 --- a/lib/Sema/SemaInit.cpp +++ b/lib/Sema/SemaInit.cpp @@ -909,7 +909,7 @@ void InitListChecker::CheckArrayType(InitListExpr *IList, QualType &DeclType, if (!maxElementsKnown && elementIndex > maxElements) maxElements = elementIndex; } - if (DeclType->isIncompleteArrayType()) { + if (!hadError && DeclType->isIncompleteArrayType()) { // If this is an incomplete array type, the actual type needs to // be calculated here. llvm::APSInt Zero(maxElements.getBitWidth(), maxElements.isUnsigned()); |