diff options
Diffstat (limited to 'clang/test')
| -rw-r--r-- | clang/test/Misc/warning-flags.c | 5 | ||||
| -rw-r--r-- | clang/test/Preprocessor/macro_fn.c | 18 | ||||
| -rw-r--r-- | clang/test/SemaCXX/cxx98-compat-pedantic.cpp | 2 |
3 files changed, 11 insertions, 14 deletions
diff --git a/clang/test/Misc/warning-flags.c b/clang/test/Misc/warning-flags.c index 035dd34fb36..3e2140f36fd 100644 --- a/clang/test/Misc/warning-flags.c +++ b/clang/test/Misc/warning-flags.c @@ -17,7 +17,7 @@ This test serves two purposes: The list of warnings below should NEVER grow. It should gradually shrink to 0. -CHECK: Warnings without flags (241): +CHECK: Warnings without flags (238): CHECK-NEXT: ext_anonymous_struct_union_qualified CHECK-NEXT: ext_binary_literal CHECK-NEXT: ext_cast_fn_obj @@ -25,7 +25,6 @@ CHECK-NEXT: ext_delete_void_ptr_operand CHECK-NEXT: ext_designated_init CHECK-NEXT: ext_duplicate_declspec CHECK-NEXT: ext_ellipsis_exception_spec -CHECK-NEXT: ext_empty_fnmacro_arg CHECK-NEXT: ext_enum_friend CHECK-NEXT: ext_enum_value_not_int CHECK-NEXT: ext_enumerator_list_comma @@ -44,12 +43,10 @@ CHECK-NEXT: ext_integer_complex CHECK-NEXT: ext_integer_increment_complex CHECK-NEXT: ext_invalid_sign_spec CHECK-NEXT: ext_missing_declspec -CHECK-NEXT: ext_missing_varargs_arg CHECK-NEXT: ext_missing_whitespace_after_macro_name CHECK-NEXT: ext_new_paren_array_nonconst CHECK-NEXT: ext_nonstandard_escape CHECK-NEXT: ext_param_not_declared -CHECK-NEXT: ext_paste_comma CHECK-NEXT: ext_plain_complex CHECK-NEXT: ext_pp_bad_vaargs_use CHECK-NEXT: ext_pp_comma_expr diff --git a/clang/test/Preprocessor/macro_fn.c b/clang/test/Preprocessor/macro_fn.c index 85733b4af06..f93d52c7eda 100644 --- a/clang/test/Preprocessor/macro_fn.c +++ b/clang/test/Preprocessor/macro_fn.c @@ -4,8 +4,8 @@ #define zero() 0 #define one(x) 0 #define two(x, y) 0 -#define zero_dot(...) 0 /* expected-warning {{variadic macros were introduced in C99}} */ -#define one_dot(x, ...) 0 /* expected-warning {{variadic macros were introduced in C99}} */ +#define zero_dot(...) 0 /* expected-warning {{variadic macros are a C99 feature}} */ +#define one_dot(x, ...) 0 /* expected-warning {{variadic macros are a C99 feature}} expected-note 2{{macro 'one_dot' defined here}} */ zero() zero(1); /* expected-error {{too many arguments provided to function-like macro invocation}} */ @@ -19,25 +19,25 @@ one(a, b) /* expected-error {{too many arguments provided to function-li two() /* expected-error {{too few arguments provided to function-like macro invocation}} */ two(a) /* expected-error {{too few arguments provided to function-like macro invocation}} */ two(a,b) -two(a, ) /* expected-warning {{empty macro arguments were standardized in C99}} */ +two(a, ) /* expected-warning {{empty macro arguments are a C99 feature}} */ two(a,b,c) /* expected-error {{too many arguments provided to function-like macro invocation}} */ two( - , /* expected-warning {{empty macro arguments were standardized in C99}} */ - , /* expected-warning {{empty macro arguments were standardized in C99}} \ + , /* expected-warning {{empty macro arguments are a C99 feature}} */ + , /* expected-warning {{empty macro arguments are a C99 feature}} \ expected-error {{too many arguments provided to function-like macro invocation}} */ ) -two(,) /* expected-warning 2 {{empty macro arguments were standardized in C99}} */ +two(,) /* expected-warning 2 {{empty macro arguments are a C99 feature}} */ /* PR4006 & rdar://6807000 */ -#define e(...) __VA_ARGS__ /* expected-warning {{variadic macros were introduced in C99}} */ +#define e(...) __VA_ARGS__ /* expected-warning {{variadic macros are a C99 feature}} */ e(x) e() zero_dot() -one_dot(x) /* empty ... argument: expected-warning {{varargs argument missing, but tolerated as an extension}} */ -one_dot() /* empty first argument, elided ...: expected-warning {{varargs argument missing, but tolerated as an extension}} */ +one_dot(x) /* empty ... argument: expected-warning {{must specify at least one argument for '...' parameter of variadic macro}} */ +one_dot() /* empty first argument, elided ...: expected-warning {{must specify at least one argument for '...' parameter of variadic macro}} */ /* rdar://6816766 - Crash with function-like macro test at end of directive. */ diff --git a/clang/test/SemaCXX/cxx98-compat-pedantic.cpp b/clang/test/SemaCXX/cxx98-compat-pedantic.cpp index 00532d5ac07..c07f64e614d 100644 --- a/clang/test/SemaCXX/cxx98-compat-pedantic.cpp +++ b/clang/test/SemaCXX/cxx98-compat-pedantic.cpp @@ -9,7 +9,7 @@ #line 32768 // expected-warning {{#line number greater than 32767 is incompatible with C++98}} #define VA_MACRO(x, ...) x // expected-warning {{variadic macros are incompatible with C++98}} -VA_MACRO(,x) // expected-warning {{empty macro argument list is incompatible with C++98}} +VA_MACRO(,x) // expected-warning {{empty macro arguments are incompatible with C++98}} ; // expected-warning {{extra ';' outside of a function is incompatible with C++98}} |
