From 42dd5772382a0d211f3351788c61b3219640ca7b Mon Sep 17 00:00:00 2001 From: Nuno Lopes Date: Fri, 18 Apr 2008 22:43:39 +0000 Subject: fix __attribute__(format) for struct function pointer fields llvm-svn: 49938 --- clang/lib/Sema/SemaDecl.cpp | 10 +++++++--- clang/test/Sema/format-attribute.c | 5 +++++ 2 files changed, 12 insertions(+), 3 deletions(-) (limited to 'clang') diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp index 015ba8c65d9..e51b7974aec 100644 --- a/clang/lib/Sema/SemaDecl.cpp +++ b/clang/lib/Sema/SemaDecl.cpp @@ -2268,10 +2268,14 @@ void Sema::HandleNothrowAttribute(Decl *d, AttributeList *rawAttr) { } static const FunctionTypeProto *getFunctionProto(Decl *d) { - ValueDecl *decl = dyn_cast(d); - if (!decl) return 0; + QualType Ty; - QualType Ty = decl->getType(); + if (ValueDecl *decl = dyn_cast(d)) + Ty = decl->getType(); + else if (FieldDecl *decl = dyn_cast(d)) + Ty = decl->getType(); + else + return 0; if (Ty->isFunctionPointerType()) { const PointerType *PtrTy = Ty->getAsPointerType(); diff --git a/clang/test/Sema/format-attribute.c b/clang/test/Sema/format-attribute.c index df3e4b59591..8eefe3f0654 100644 --- a/clang/test/Sema/format-attribute.c +++ b/clang/test/Sema/format-attribute.c @@ -17,3 +17,8 @@ void z(char *str, int c, ...) __attribute__((format(strftime, 1,2))); // expecte int (*f_ptr)(char*,...) __attribute__((format(printf, 1,2))); // no-error int (*f2_ptr)(double,...) __attribute__((format(printf, 1, 2))); // expected-error {{format argument not a string type}} + +struct _mystruct { + int (*printf)(const char *format, ...) __attribute__((__format__(printf, 1, 2))); // no-error + int (*printf2)(double format, ...) __attribute__((__format__(printf, 1, 2))); // expected-error {{format argument not a string type}} +}; -- cgit v1.2.3