From a1a9c28d30d6e471a24e8fbf272bde736574f7b4 Mon Sep 17 00:00:00 2001 From: Anders Carlsson Date: Sun, 7 Dec 2008 00:49:48 +0000 Subject: Pass the VLA size expr range to the VLA diags llvm-svn: 60645 --- clang/lib/Sema/SemaDecl.cpp | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'clang/lib/Sema/SemaDecl.cpp') diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp index 4d01a2d52c6..f125cb270e2 100644 --- a/clang/lib/Sema/SemaDecl.cpp +++ b/clang/lib/Sema/SemaDecl.cpp @@ -1928,17 +1928,27 @@ Sema::DeclTy *Sema::FinalizeDeclaratorGroup(Scope *S, DeclTy *group) { QualType T = IDecl->getType(); if (T->isVariableArrayType()) { + const VariableArrayType *VAT = + cast(T.getUnqualifiedType()); + + // FIXME: This won't give the correct result for + // int a[10][n]; + SourceRange SizeRange = VAT->getSizeExpr()->getSourceRange(); if (IDecl->isFileVarDecl()) { - Diag(IDecl->getLocation(), diag::err_vla_decl_in_file_scope); + Diag(IDecl->getLocation(), diag::err_vla_decl_in_file_scope) << + SizeRange; + IDecl->setInvalidDecl(); } else { // C99 6.7.5.2p2: If an identifier is declared to be an object with // static storage duration, it shall not have a variable length array. if (IDecl->getStorageClass() == VarDecl::Static) { - Diag(IDecl->getLocation(), diag::err_vla_decl_has_static_storage); + Diag(IDecl->getLocation(), diag::err_vla_decl_has_static_storage) + << SizeRange; IDecl->setInvalidDecl(); } else if (IDecl->getStorageClass() == VarDecl::Extern) { - Diag(IDecl->getLocation(), diag::err_vla_decl_has_extern_linkage); + Diag(IDecl->getLocation(), diag::err_vla_decl_has_extern_linkage) + << SizeRange; IDecl->setInvalidDecl(); } } -- cgit v1.2.3