replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bug #: 

Submitted by:
Reviewed by:
Finish up fixes to Sema::GetTypeForDeclarator(). The typechecking should
now conform to the standard.

llvm-svn: 39366
This commit is contained in:
Steve Naroff 2007-03-27 21:40:41 +00:00
parent 06deba91d1
commit bc57d0fe19
3 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
clang/AST/SemaType.cpp
View File

@ -133,23 +133,26 @@ TypeRef Sema::GetTypeForDeclarator(Declarator &D, Scope *S) {
Type *CanonicalT = T->getCanonicalType();
// If the element type is a struct or union that contains a variadic
// array, reject it: C99 6.7.2.1p2.
if (RecordType *EltTy = dyn_cast<RecordType>(CanonicalT)) {
// C99 6.7.5.2p1: If the element type is an incomplete or function type,
// reject it (e.g. void ary[7], struct foo ary[7], void ary[7]())
if (T->isIncompleteType()) {
Diag(D.getIdentifierLoc(), diag::err_illegal_decl_array_incomplete_type,
D.getIdentifier()->getName());
return TypeRef();
} else if (isa<FunctionType>(CanonicalT)) {
Diag(D.getIdentifierLoc(), diag::err_illegal_decl_array_of_functions,
D.getIdentifier()->getName());
return TypeRef();
} else if (RecordType *EltTy = dyn_cast<RecordType>(CanonicalT)) {
// If the element type is a struct or union that contains a variadic
// array, reject it: C99 6.7.2.1p2.
if (EltTy->getDecl()->hasFlexibleArrayMember()) {
std::string Name;
T->getAsString(Name);
Diag(DeclType.Loc, diag::err_flexible_array_in_array, Name);
return TypeRef();
}
} else if (isa<FunctionType>(CanonicalT)) {// reject "void aryOfFunc[3]()"
Diag(D.getIdentifierLoc(), diag::err_illegal_decl_array_of_functions,
D.getIdentifier()->getName());
} else if (CanonicalT->isVoidType()) { // reject "void aryOfVoids[3]"
Diag(D.getIdentifierLoc(), diag::err_illegal_decl_array_of_voids,
D.getIdentifier()->getName());
}
T = Context.getArrayType(T, ASM, ATI.TypeQuals,
static_cast<Expr *>(ATI.NumElts));
break;

23
clang/Sema/SemaType.cpp
View File

@ -133,23 +133,26 @@ TypeRef Sema::GetTypeForDeclarator(Declarator &D, Scope *S) {
Type *CanonicalT = T->getCanonicalType();
// If the element type is a struct or union that contains a variadic
// array, reject it: C99 6.7.2.1p2.
if (RecordType *EltTy = dyn_cast<RecordType>(CanonicalT)) {
// C99 6.7.5.2p1: If the element type is an incomplete or function type,
// reject it (e.g. void ary[7], struct foo ary[7], void ary[7]())
if (T->isIncompleteType()) {
Diag(D.getIdentifierLoc(), diag::err_illegal_decl_array_incomplete_type,
D.getIdentifier()->getName());
return TypeRef();
} else if (isa<FunctionType>(CanonicalT)) {
Diag(D.getIdentifierLoc(), diag::err_illegal_decl_array_of_functions,
D.getIdentifier()->getName());
return TypeRef();
} else if (RecordType *EltTy = dyn_cast<RecordType>(CanonicalT)) {
// If the element type is a struct or union that contains a variadic
// array, reject it: C99 6.7.2.1p2.
if (EltTy->getDecl()->hasFlexibleArrayMember()) {
std::string Name;
T->getAsString(Name);
Diag(DeclType.Loc, diag::err_flexible_array_in_array, Name);
return TypeRef();
}
} else if (isa<FunctionType>(CanonicalT)) {// reject "void aryOfFunc[3]()"
Diag(D.getIdentifierLoc(), diag::err_illegal_decl_array_of_functions,
D.getIdentifier()->getName());
} else if (CanonicalT->isVoidType()) { // reject "void aryOfVoids[3]"
Diag(D.getIdentifierLoc(), diag::err_illegal_decl_array_of_voids,
D.getIdentifier()->getName());
}
T = Context.getArrayType(T, ASM, ATI.TypeQuals,
static_cast<Expr *>(ATI.NumElts));
break;

4
clang/include/clang/Basic/DiagnosticKinds.def
View File

@ -464,8 +464,8 @@ DIAG(err_flexible_array_in_array, ERROR,
"'%s' may not be used as an array element due to flexible array member")
DIAG(err_illegal_decl_array_of_functions, ERROR,
"'%s' declared as array of functions")
DIAG(err_illegal_decl_array_of_voids, ERROR,
"'%s' declared as array of voids")
DIAG(err_illegal_decl_array_incomplete_type, ERROR,
"array type for '%s' has incomplete element type")
// Expressions.
DIAG(ext_sizeof_function_type, EXTENSION,