forked from OSchip/llvm-project
Improve Sema of the cleanup attribute somewhat.
llvm-svn: 64047
This commit is contained in:
parent
0509d9635b
commit
723f55d697
clang
|
@ -385,8 +385,10 @@ DIAG(err_attribute_cleanup_arg_not_found, ERROR,
|
||||||
"'cleanup' argument %0 not found")
|
"'cleanup' argument %0 not found")
|
||||||
DIAG(err_attribute_cleanup_arg_not_function, ERROR,
|
DIAG(err_attribute_cleanup_arg_not_function, ERROR,
|
||||||
"'cleanup' argument %0 is not a function")
|
"'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")
|
"'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
|
// Clang-Specific Attributes
|
||||||
DIAG(err_attribute_iboutlet_non_ivar, ERROR,
|
DIAG(err_attribute_iboutlet_non_ivar, ERROR,
|
||||||
|
|
|
@ -847,6 +847,10 @@ static void HandlePureAttr(Decl *d, const AttributeList &Attr, Sema &S) {
|
||||||
}
|
}
|
||||||
|
|
||||||
static void HandleCleanupAttr(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()) {
|
if (!Attr.getParameterName()) {
|
||||||
S.Diag(Attr.getLoc(), diag::err_attribute_wrong_number_arguments) << 1;
|
S.Diag(Attr.getLoc(), diag::err_attribute_wrong_number_arguments) << 1;
|
||||||
return;
|
return;
|
||||||
|
@ -868,26 +872,35 @@ static void HandleCleanupAttr(Decl *d, const AttributeList &Attr, Sema &S) {
|
||||||
NamedDecl *CleanupDecl = S.LookupName(S.TUScope, Attr.getParameterName(),
|
NamedDecl *CleanupDecl = S.LookupName(S.TUScope, Attr.getParameterName(),
|
||||||
Sema::LookupOrdinaryName);
|
Sema::LookupOrdinaryName);
|
||||||
if (!CleanupDecl) {
|
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();
|
Attr.getParameterName();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
FunctionDecl *FD = dyn_cast<FunctionDecl>(CleanupDecl);
|
FunctionDecl *FD = dyn_cast<FunctionDecl>(CleanupDecl);
|
||||||
if (!FD) {
|
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();
|
Attr.getParameterName();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// FIXME: This needs to work with C++ overloading.
|
|
||||||
// FIXME: This should verify that the function type is compatible
|
|
||||||
if (FD->getNumParams() != 1) {
|
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();
|
Attr.getParameterName();
|
||||||
return;
|
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));
|
d->addAttr(new CleanupAttr(FD));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -24,8 +24,10 @@ struct s {
|
||||||
};
|
};
|
||||||
|
|
||||||
void c2();
|
void c2();
|
||||||
|
void c3(struct s a);
|
||||||
|
|
||||||
void t2()
|
void t2()
|
||||||
{
|
{
|
||||||
int v1 __attribute__((cleanup(c2))); // expected-error {{'cleanup' function 'c2' must take 1 parameter}}
|
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 *'}}
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue