maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Improve Sema of the cleanup attribute somewhat. 

llvm-svn: 64047
This commit is contained in:
Anders Carlsson 2009-02-07 23:16:50 +00:00
parent 0509d9635b
commit 723f55d697
3 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -385,8 +385,10 @@ DIAG(err_attribute_cleanup_arg_not_found, ERROR,
"'cleanup' argument %0 not found")
DIAG(err_attribute_cleanup_arg_not_function, ERROR,
"'cleanup' argument %0 is not a function")
DIAG(err_attribute_cleanup_arg_must_take_one_arg, ERROR,
DIAG(err_attribute_cleanup_func_must_take_one_arg, ERROR,
"'cleanup' function %0 must take 1 parameter")
DIAG(err_attribute_cleanup_func_arg_incompatible_type, ERROR,
"'cleanup' function %0 parameter has type %1, expected type %2")
// Clang-Specific Attributes
DIAG(err_attribute_iboutlet_non_ivar, ERROR,

23
clang/lib/Sema/SemaDeclAttr.cpp
View File

@ -847,6 +847,10 @@ static void HandlePureAttr(Decl *d, const AttributeList &Attr, Sema &S) {
}
static void HandleCleanupAttr(Decl *d, const AttributeList &Attr, Sema &S) {
// Match gcc which ignores cleanup attrs when compiling C++.
if (S.getLangOptions().CPlusPlus)
return;
if (!Attr.getParameterName()) {
S.Diag(Attr.getLoc(), diag::err_attribute_wrong_number_arguments) << 1;
return;
@ -868,26 +872,35 @@ static void HandleCleanupAttr(Decl *d, const AttributeList &Attr, Sema &S) {
NamedDecl *CleanupDecl = S.LookupName(S.TUScope, Attr.getParameterName(),
Sema::LookupOrdinaryName);
if (!CleanupDecl) {
S.Diag(Attr.getLoc(), diag::err_attribute_cleanup_arg_not_found) <<
S.Diag(Attr.getLoc(), diag::err_attribute_cleanup_arg_not_found) <<
Attr.getParameterName();
return;
}
FunctionDecl *FD = dyn_cast<FunctionDecl>(CleanupDecl);
if (!FD) {
S.Diag(Attr.getLoc(), diag::err_attribute_cleanup_arg_not_function) <<
S.Diag(Attr.getLoc(), diag::err_attribute_cleanup_arg_not_function) <<
Attr.getParameterName();
return;
}
// FIXME: This needs to work with C++ overloading.
// FIXME: This should verify that the function type is compatible
if (FD->getNumParams() != 1) {
S.Diag(Attr.getLoc(), diag::err_attribute_cleanup_arg_must_take_one_arg)<<
S.Diag(Attr.getLoc(), diag::err_attribute_cleanup_func_must_take_one_arg) <<
Attr.getParameterName();
return;
}
// We're currently more strict than GCC about what function types we accept.
// If this ever proves to be a problem it should be easy to fix.
QualType Ty = S.Context.getPointerType(VD->getType());
QualType ParamTy = FD->getParamDecl(0)->getType();
if (Ty != ParamTy) {
S.Diag(Attr.getLoc(),
diag::err_attribute_cleanup_func_arg_incompatible_type) <<
Attr.getParameterName() << ParamTy << Ty;
return;
}
d->addAttr(new CleanupAttr(FD));
}

4
clang/test/Sema/attr-cleanup.c
View File

@ -24,8 +24,10 @@ struct s {
};
void c2();
void c3(struct s a);
void t2()
{
int v1 __attribute__((cleanup(c2))); // expected-error {{'cleanup' function 'c2' must take 1 parameter}}
}
int v2 __attribute__((cleanup(c3))); // expected-error {{'cleanup' function 'c3' parameter has type 'struct s', expected type 'int *'}}
}