diff options
| author | Eli Friedman <eli.friedman@gmail.com> | 2012-12-18 00:52:36 +0000 |
|---|---|---|
| committer | Eli Friedman <eli.friedman@gmail.com> | 2012-12-18 00:52:36 +0000 |
| commit | 672845bcde0c0d49b133b50110b5229e158a7ef7 (patch) | |
| tree | 3d8e5175114df373cc0b14b80fa0a8eea70fcf4b /clang/test/Misc/caret-diags-macros.c | |
| parent | f53f5785674af89c021c8b3aa54552231273bb35 (diff) | |
| download | bcm5719-llvm-672845bcde0c0d49b133b50110b5229e158a7ef7.tar.gz bcm5719-llvm-672845bcde0c0d49b133b50110b5229e158a7ef7.zip | |
More conservative fix for <rdar://problem/12847524> (a crash printing diagnostic ranges).
I'm not really happy with this fix, but I'm confident it's correct.
llvm-svn: 170397
Diffstat (limited to 'clang/test/Misc/caret-diags-macros.c')
| -rw-r--r-- | clang/test/Misc/caret-diags-macros.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/clang/test/Misc/caret-diags-macros.c b/clang/test/Misc/caret-diags-macros.c index ce62425e780..95fc64cf3c2 100644 --- a/clang/test/Misc/caret-diags-macros.c +++ b/clang/test/Misc/caret-diags-macros.c @@ -205,3 +205,23 @@ void foo_aa() // CHECK-NEXT: {{.*}}:189:31: note: expanded from macro 'APPEND2' // CHECK-NEXT: #define APPEND2(NUM, SUFF) -1 != NUM ## SUFF // CHECK-NEXT: {{^ ~~ \^ ~~~~~~~~~~~}} + +unsigned long strlen_test(const char *s); +#define __darwin_obsz(object) __builtin_object_size (object, 1) +#define sprintf2(str, ...) \ + __builtin___sprintf_chk (str, 0, __darwin_obsz(str), __VA_ARGS__) +#define Cstrlen(a) strlen_test(a) +#define Csprintf sprintf2 +void f(char* pMsgBuf, char* pKeepBuf) { +Csprintf(pMsgBuf,"\nEnter minimum anagram length (2-%1d): ", Cstrlen(pKeepBuf)); +} +// CHECK: {{.*}}:216:62: warning: format specifies type 'int' but the argument has type 'unsigned long' +// CHECK-NEXT: Csprintf(pMsgBuf,"\nEnter minimum anagram length (2-%1d): ", Cstrlen(pKeepBuf)); +// CHECK-NEXT: {{^ ~~~ \^}} +// CHECK-NEXT: {{^ %1ld}} +// CHECK-NEXT: {{.*}}:213:21: note: expanded from macro 'Cstrlen' +// CHECK-NEXT: #define Cstrlen(a) strlen_test(a) +// CHECK-NEXT: {{^ \^}} +// CHECK-NEXT: {{.*}}:212:56: note: expanded from macro 'sprintf2' +// CHECK-NEXT: __builtin___sprintf_chk (str, 0, __darwin_obsz(str), __VA_ARGS__) +// CHECK-NEXT: {{^ \^}} |
