diff options
| author | Nadav Rotem <nrotem@apple.com> | 2012-12-13 19:58:10 +0000 |
|---|---|---|
| committer | Nadav Rotem <nrotem@apple.com> | 2012-12-13 19:58:10 +0000 |
| commit | b89373430adcf984f8f616ca09f2820934fbdc26 (patch) | |
| tree | f056569213dc5c1e20e127ad1f11fe3e5782c661 /clang/test/Misc/caret-diags-macros.c | |
| parent | 6975d35979e2cb7765f8e4bfc8d7d62af728ae52 (diff) | |
| download | bcm5719-llvm-b89373430adcf984f8f616ca09f2820934fbdc26.tar.gz bcm5719-llvm-b89373430adcf984f8f616ca09f2820934fbdc26.zip | |
Revert 170049 because it fails with an assertion on one of the spec2000 workloads.
llvm-svn: 170143
Diffstat (limited to 'clang/test/Misc/caret-diags-macros.c')
| -rw-r--r-- | clang/test/Misc/caret-diags-macros.c | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/clang/test/Misc/caret-diags-macros.c b/clang/test/Misc/caret-diags-macros.c index 8fcfeb070cd..ce62425e780 100644 --- a/clang/test/Misc/caret-diags-macros.c +++ b/clang/test/Misc/caret-diags-macros.c @@ -181,10 +181,10 @@ void foo_aa() } // CHECK: {{.*}}:180:21: warning: expression result unused // CHECK-NEXT: iequals(__LINE__, BARC(4,3,2,6,8), 8); -// CHECK-NEXT: {{^ \^ ~}} +// CHECK-NEXT: {{^ \^~~~~~~~~~~~~~~}} // CHECK-NEXT: {{.*}}:179:51: note: expanded from macro 'BARC' // CHECK-NEXT: #define /* */ BARC(c, /* */b, a, ...) (a+b+/* */c + __VA_ARGS__ +0) -// CHECK-NEXT: {{^ \^}} +// CHECK-NEXT: {{^ ~~~~~~~~~~ \^}} #define APPEND2(NUM, SUFF) -1 != NUM ## SUFF #define APPEND(NUM, SUFF) APPEND2(NUM, SUFF) @@ -205,24 +205,3 @@ 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: {{.*}}:217: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: {{.*}}:214:21: note: expanded from macro 'Cstrlen' -// CHECK-NEXT: #define Cstrlen(a) strlen_test(a) -// CHECK-NEXT: {{^ \^}} -// CHECK-NEXT: {{.*}}:213:56: note: expanded from macro 'sprintf2' -// CHECK-NEXT: __builtin___sprintf_chk (str, 0, __darwin_obsz(str), __VA_ARGS__) -// CHECK-NEXT: {{^ \^}} |

