From 43d1251a471d19ce83aa8ce91c0104addada5add Mon Sep 17 00:00:00 2001 From: Jean-Daniel Dupas Date: Wed, 25 Jan 2012 00:55:11 +0000 Subject: [PATCH] Add "multiple format attributes" support on block. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@148890 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Sema/SemaChecking.cpp | 12 ++++++------ test/Sema/block-printf-attribute-1.c | 10 ++++++++++ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/lib/Sema/SemaChecking.cpp b/lib/Sema/SemaChecking.cpp index dbb0a0efaa..f5a8b448a1 100644 --- a/lib/Sema/SemaChecking.cpp +++ b/lib/Sema/SemaChecking.cpp @@ -508,11 +508,6 @@ bool Sema::CheckObjCMethodCall(ObjCMethodDecl *Method, SourceLocation lbrac, } bool Sema::CheckBlockCall(NamedDecl *NDecl, CallExpr *TheCall) { - // Printf checking. - const FormatAttr *Format = NDecl->getAttr(); - if (!Format) - return false; - const VarDecl *V = dyn_cast(NDecl); if (!V) return false; @@ -521,7 +516,12 @@ bool Sema::CheckBlockCall(NamedDecl *NDecl, CallExpr *TheCall) { if (!Ty->isBlockPointerType()) return false; - CheckFormatArguments(Format, TheCall); + // format string checking. + for (specific_attr_iterator + i = NDecl->specific_attr_begin(), + e = NDecl->specific_attr_end(); i != e ; ++i) { + CheckFormatArguments(*i, TheCall); + } return false; } diff --git a/test/Sema/block-printf-attribute-1.c b/test/Sema/block-printf-attribute-1.c index 8188ba5b55..dd678a5439 100644 --- a/test/Sema/block-printf-attribute-1.c +++ b/test/Sema/block-printf-attribute-1.c @@ -1,5 +1,7 @@ // RUN: %clang_cc1 %s -fsyntax-only -verify -fblocks +#include + int main() { void (^b) (int arg, const char * format, ...) __attribute__ ((__format__ (__printf__, 1, 3))) = // expected-error {{format argument not a string type}} ^ __attribute__ ((__format__ (__printf__, 1, 3))) (int arg, const char * format, ...) {}; // expected-error {{format argument not a string type}} @@ -9,3 +11,11 @@ int main() { z(1, "%s", 1); // expected-warning{{format specifies type 'char *' but the argument has type 'int'}} z(1, "%s", "HELLO"); // no-warning } + +void multi_attr(va_list ap, int *x, long *y) { + // Handle block with multiple format attributes. + void (^vprintf_scanf) (const char *, va_list, const char *, ...) __attribute__((__format__(__printf__, 1, 0))) __attribute__((__format__(__scanf__, 3, 4))) = + ^ __attribute__((__format__(__printf__, 1, 0))) __attribute__((__format__(__scanf__, 3, 4))) (const char *str, va_list args, const char *fmt, ...) {}; + + vprintf_scanf("%", ap, "%d"); // expected-warning {{incomplete format specifier}}, expected-warning {{more '%' conversions than data arguments}} +}