dnrops
/
clang
mirror of https://github.com/microsoft/clang.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add "multiple format attributes" support on block. 

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@148890 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Jean-Daniel Dupas 2012-01-25 00:55:11 +00:00
parent 5ac4b6917a
commit 43d1251a47
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/Sema/SemaChecking.cpp
View File

@ -508,11 +508,6 @@ bool Sema::CheckObjCMethodCall(ObjCMethodDecl *Method, SourceLocation lbrac,
} }
bool Sema::CheckBlockCall(NamedDecl *NDecl, CallExpr *TheCall) { bool Sema::CheckBlockCall(NamedDecl *NDecl, CallExpr *TheCall) {
// Printf checking.
const FormatAttr *Format = NDecl->getAttr<FormatAttr>();
if (!Format)
return false;
const VarDecl *V = dyn_cast<VarDecl>(NDecl); const VarDecl *V = dyn_cast<VarDecl>(NDecl);
if (!V) if (!V)
return false; return false;
@ -521,7 +516,12 @@ bool Sema::CheckBlockCall(NamedDecl *NDecl, CallExpr *TheCall) {
if (!Ty->isBlockPointerType()) if (!Ty->isBlockPointerType())
return false; return false;
CheckFormatArguments(Format, TheCall); // format string checking.
for (specific_attr_iterator<FormatAttr>
i = NDecl->specific_attr_begin<FormatAttr>(),
e = NDecl->specific_attr_end<FormatAttr>(); i != e ; ++i) {
CheckFormatArguments(*i, TheCall);
}
return false; return false;
} }

10
test/Sema/block-printf-attribute-1.c
View File

@ -1,5 +1,7 @@
// RUN: %clang_cc1 %s -fsyntax-only -verify -fblocks // RUN: %clang_cc1 %s -fsyntax-only -verify -fblocks
#include <stdarg.h>
int main() { int main() {
void (^b) (int arg, const char * format, ...) __attribute__ ((__format__ (__printf__, 1, 3))) = // expected-error {{format argument not a string type}} 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}} ^ __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", 1); // expected-warning{{format specifies type 'char *' but the argument has type 'int'}}
z(1, "%s", "HELLO"); // no-warning 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}}
}