From 553b2b2e5dde2839618edbc7b60f6c0677774853 Mon Sep 17 00:00:00 2001 From: Richard Trieu Date: Thu, 15 Dec 2011 00:38:15 +0000 Subject: Modify how the -verify flag works. Currently, the verification string and diagnostic message are compared. If either is a substring of the other, then no error is given. This gives rise to an unexpected case: // expect-error{{candidate function has different number of parameters}} will match the following error messages from Clang: candidate function has different number of parameters (expected 1 but has 2) candidate function has different number of parameters It will also match these other error messages: candidate function function has different number of parameters number of parameters This patch will change so that the verification string must be a substring of the diagnostic message before accepting. Also, all the failing tests from this change have been corrected. Some stats from this cleanup: 87 - removed extra spaces around verification strings 70 - wording updates to diagnostics 40 - extra leading or trailing characters (typos, unmatched parens or quotes) 35 - diagnostic level was included (error:, warning:, or note:) 18 - flag name put in the warning (-Wprotocol) llvm-svn: 146619 --- clang/test/SemaCXX/reinterpret-fn-obj-pedantic.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'clang/test/SemaCXX/reinterpret-fn-obj-pedantic.cpp') diff --git a/clang/test/SemaCXX/reinterpret-fn-obj-pedantic.cpp b/clang/test/SemaCXX/reinterpret-fn-obj-pedantic.cpp index 09d08f95ee2..9cdf5a1e6a4 100644 --- a/clang/test/SemaCXX/reinterpret-fn-obj-pedantic.cpp +++ b/clang/test/SemaCXX/reinterpret-fn-obj-pedantic.cpp @@ -4,6 +4,6 @@ void fnptrs() { typedef void (*fnptr)(); fnptr fp = 0; - void *vp = reinterpret_cast(fp); // expected-warning {{reinterpret_cast between pointer-to-function and pointer-to-object is an extension}} - (void)reinterpret_cast(vp); // expected-warning {{reinterpret_cast between pointer-to-function and pointer-to-object is an extension}} + void *vp = reinterpret_cast(fp); // expected-warning {{cast between pointer-to-function and pointer-to-object is an extension}} + (void)reinterpret_cast(vp); // expected-warning {{cast between pointer-to-function and pointer-to-object is an extension}} } -- cgit v1.2.3