From 0d48e8779c6a9ac88f5efd1b4a2d40f43ef75faf Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Fri, 5 Oct 2018 19:02:17 +0000 Subject: [PATCH] Support string locations for C++ in -Wformat (PR c++/56856) -Wformat in the C++ FE doesn't work as well as it could: (a) it doesn't report precise locations within the string literal, and (b) it doesn't underline arguments for those arguments !CAN_HAVE_LOCATION_P, despite having location wrapper nodes. For example: Wformat-ranges.C:32:10: warning: format '%s' expects argument of type 'char*', but argument 2 has type 'int' [-Wformat=] 32 | printf("hello %s", 42); | ^~~~~~~~~~ (a) is due to not wiring up the langhook for extracting substring locations. This patch uses the one in c-family; it also fixes string literal parsing so that it records string concatenations (needed for extracting substring locations from concatenated strings). (b) is due to the call to maybe_constant_value here: fargs[j] = maybe_constant_value (argarray[j]); within build_over_call. The patch fixes this by building a vec of location_t values when calling check_function_arguments. I attempted to eliminate the maybe_constant_value call here, but it's needed by e.g. check_function_sentinel for detecting NULL, and that code is in "c-family", so it can't simply call into maybe_constant_value (which is in "cp"). With this patch, the output for the above example is improved to: Wformat-ranges.C:32:18: warning: format '%s' expects argument of type 'char*', but argument 2 has type 'int' [-Wformat=] 32 | printf("hello %s", 42); | ~^ ~~ | | | | | int | char* | %d gcc/cp/ChangeLog: PR c++/56856 * call.c (build_over_call): Build a vec of locations of the arguments before the call to maybe_constant_value, and pass to check_function_arguments. * cp-lang.c (LANG_HOOKS_GET_SUBSTRING_LOCATION): Define as c_get_substring_location. * parser.c (cp_parser_string_literal): Capture string concatenation locations. gcc/ChangeLog: PR c++/56856 * input.c (expand_location_to_spelling_point): Add param "aspect" and use rather than hardcoding LOCATION_ASPECT_CARET. (get_substring_ranges_for_loc): Handle the case of a single token within a macro expansion. * input.h (expand_location_to_spelling_point): Add "aspect" param, defaulting to LOCATION_ASPECT_CARET. gcc/testsuite/ChangeLog: PR c++/56856 * g++.dg/ext/builtin4.C: Set expected location for warning to the correct location within the format string. * g++.dg/plugin/plugin.exp (plugin_test_list): Add the plugin and files for testing locations within string literal locations from the C frontend. * g++.dg/warn/Wformat-method.C: New test. * g++.dg/warn/Wformat-pr71863.C: New test. * g++.dg/warn/Wformat-ranges-c++11.C: New test. * g++.dg/warn/Wformat-ranges.C: New test, based on gcc.dg/format/diagnostic-ranges.c. * gcc.dg/plugin/diagnostic-test-string-literals-1.c (test_multitoken_macro): Generalize expected output to work with both C and C++. * gcc.dg/plugin/diagnostic-test-string-literals-2.c (test_stringified_token_1): Likewise. (test_stringified_token_3): Likewise. From-SVN: r264887 --- gcc/ChangeLog | 10 ++ gcc/cp/ChangeLog | 11 ++ gcc/cp/call.c | 4 +- gcc/cp/cp-lang.c | 3 + gcc/cp/parser.c | 14 ++- gcc/input.c | 44 ++++---- gcc/input.h | 5 +- gcc/testsuite/ChangeLog | 20 ++++ gcc/testsuite/g++.dg/ext/builtin4.C | 2 +- gcc/testsuite/g++.dg/plugin/plugin.exp | 5 + gcc/testsuite/g++.dg/warn/Wformat-method.C | 40 +++++++ gcc/testsuite/g++.dg/warn/Wformat-pr71863.C | 33 ++++++ gcc/testsuite/g++.dg/warn/Wformat-ranges-c++11.C | 18 ++++ .../warn/Wformat-ranges.C} | 117 ++++++++++----------- gcc/testsuite/gcc.dg/format/diagnostic-ranges.c | 11 +- .../plugin/diagnostic-test-string-literals-1.c | 6 +- .../plugin/diagnostic-test-string-literals-2.c | 4 +- 17 files changed, 258 insertions(+), 89 deletions(-) create mode 100644 gcc/testsuite/g++.dg/warn/Wformat-method.C create mode 100644 gcc/testsuite/g++.dg/warn/Wformat-pr71863.C create mode 100644 gcc/testsuite/g++.dg/warn/Wformat-ranges-c++11.C copy gcc/testsuite/{gcc.dg/format/diagnostic-ranges.c => g++.dg/warn/Wformat-ranges.C} (82%) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index c2ebbbcf436..53c9c89ce9a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,13 @@ +2018-10-05 David Malcolm + + PR c++/56856 + * input.c (expand_location_to_spelling_point): Add param "aspect" + and use rather than hardcoding LOCATION_ASPECT_CARET. + (get_substring_ranges_for_loc): Handle the case of a single token + within a macro expansion. + * input.h (expand_location_to_spelling_point): Add "aspect" param, + defaulting to LOCATION_ASPECT_CARET. + 2018-10-05 Paul Koning * config/pdp11/pdp11.c (TARGET_CXX_GUARD_TYPE): Define. diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index c76340cb23f..97d7e8d83c3 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,14 @@ +2018-10-05 David Malcolm + + PR c++/56856 + * call.c (build_over_call): Build a vec of locations of the + arguments before the call to maybe_constant_value, and pass to + check_function_arguments. + * cp-lang.c (LANG_HOOKS_GET_SUBSTRING_LOCATION): Define as + c_get_substring_location. + * parser.c (cp_parser_string_literal): Capture string + concatenation locations. + 2018-10-04 Nathan Sidwell * lang-specs.h: Use string contatenation, not line splicing. diff --git a/gcc/cp/call.c b/gcc/cp/call.c index b2ca667c8b4..747f837019d 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -8188,6 +8188,7 @@ build_over_call (struct z_candidate *cand, int flags, tsubst_flags_t complain) { tree *fargs = (!nargs ? argarray : (tree *) alloca (nargs * sizeof (tree))); + auto_vec arglocs (nargs); for (j = 0; j < nargs; j++) { /* For -Wformat undo the implicit passing by hidden reference @@ -8197,10 +8198,11 @@ build_over_call (struct z_candidate *cand, int flags, tsubst_flags_t complain) fargs[j] = TREE_OPERAND (argarray[j], 0); else fargs[j] = maybe_constant_value (argarray[j]); + arglocs.quick_push (EXPR_LOC_OR_LOC (argarray[j], input_location)); } warned_p = check_function_arguments (input_location, fn, TREE_TYPE (fn), - nargs, fargs, NULL); + nargs, fargs, &arglocs); } if (DECL_INHERITED_CTOR (fn)) diff --git a/gcc/cp/cp-lang.c b/gcc/cp/cp-lang.c index 26a1e6d29cf..a0b0102f798 100644 --- a/gcc/cp/cp-lang.c +++ b/gcc/cp/cp-lang.c @@ -83,6 +83,9 @@ static tree cxx_enum_underlying_base_type (const_tree); #define LANG_HOOKS_RUN_LANG_SELFTESTS selftest::run_cp_tests #endif /* #if CHECKING_P */ +#undef LANG_HOOKS_GET_SUBSTRING_LOCATION +#define LANG_HOOKS_GET_SUBSTRING_LOCATION c_get_substring_location + /* Each front end provides its own lang hook initializer. */ struct lang_hooks lang_hooks = LANG_HOOKS_INITIALIZER; diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index a17cc3f23f2..032108abfd3 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -4034,6 +4034,7 @@ cp_parser_string_literal (cp_parser *parser, bool translate, bool wide_ok, tree value; size_t count; struct obstack str_ob; + struct obstack loc_ob; cpp_string str, istr, *strs; cp_token *tok; enum cpp_ttype type, curr_type; @@ -4090,6 +4091,7 @@ cp_parser_string_literal (cp_parser *parser, bool translate, bool wide_ok, { location_t last_tok_loc = tok->location; gcc_obstack_init (&str_ob); + gcc_obstack_init (&loc_ob); count = 0; do @@ -4135,6 +4137,7 @@ cp_parser_string_literal (cp_parser *parser, bool translate, bool wide_ok, } obstack_grow (&str_ob, &str, sizeof (cpp_string)); + obstack_grow (&loc_ob, &tok->location, sizeof (location_t)); last_tok_loc = tok->location; @@ -4173,6 +4176,12 @@ cp_parser_string_literal (cp_parser *parser, bool translate, bool wide_ok, { value = build_string (istr.len, (const char *)istr.text); free (CONST_CAST (unsigned char *, istr.text)); + if (count > 1) + { + location_t *locs = (location_t *)obstack_finish (&loc_ob); + gcc_assert (g_string_concat_db); + g_string_concat_db->record_string_concatenation (count, locs); + } switch (type) { @@ -4209,7 +4218,10 @@ cp_parser_string_literal (cp_parser *parser, bool translate, bool wide_ok, value = error_mark_node; if (count > 1) - obstack_free (&str_ob, 0); + { + obstack_free (&str_ob, 0); + obstack_free (&loc_ob, 0); + } return cp_expr (value, loc); } diff --git a/gcc/input.c b/gcc/input.c index d65a82dc26e..b4b71367018 100644 --- a/gcc/input.c +++ b/gcc/input.c @@ -813,10 +813,10 @@ expand_location (source_location loc) "". */ expanded_location -expand_location_to_spelling_point (source_location loc) +expand_location_to_spelling_point (source_location loc, + enum location_aspect aspect) { - return expand_location_1 (loc, /*expansion_point_p=*/false, - LOCATION_ASPECT_CARET); + return expand_location_1 (loc, /*expansion_point_p=*/false, aspect); } /* The rich_location class within libcpp requires a way to expand @@ -1397,24 +1397,32 @@ get_substring_ranges_for_loc (cpp_reader *pfile, source_range src_range = get_range_from_loc (line_table, strlocs[i]); if (src_range.m_start >= LINEMAPS_MACRO_LOWEST_LOCATION (line_table)) - /* If the string is within a macro expansion, we can't get at the - end location. */ - return "macro expansion"; - - if (src_range.m_start >= LINE_MAP_MAX_LOCATION_WITH_COLS) - /* If so, we can't reliably determine where the token started within - its line. */ - return "range starts after LINE_MAP_MAX_LOCATION_WITH_COLS"; - - if (src_range.m_finish >= LINE_MAP_MAX_LOCATION_WITH_COLS) - /* If so, we can't reliably determine where the token finished within - its line. */ - return "range ends after LINE_MAP_MAX_LOCATION_WITH_COLS"; + { + /* If the string token was within a macro expansion, then we can + cope with it for the simple case where we have a single token. + Otherwise, bail out. */ + if (src_range.m_start != src_range.m_finish) + return "macro expansion"; + } + else + { + if (src_range.m_start >= LINE_MAP_MAX_LOCATION_WITH_COLS) + /* If so, we can't reliably determine where the token started within + its line. */ + return "range starts after LINE_MAP_MAX_LOCATION_WITH_COLS"; + + if (src_range.m_finish >= LINE_MAP_MAX_LOCATION_WITH_COLS) + /* If so, we can't reliably determine where the token finished + within its line. */ + return "range ends after LINE_MAP_MAX_LOCATION_WITH_COLS"; + } expanded_location start - = expand_location_to_spelling_point (src_range.m_start); + = expand_location_to_spelling_point (src_range.m_start, + LOCATION_ASPECT_START); expanded_location finish - = expand_location_to_spelling_point (src_range.m_finish); + = expand_location_to_spelling_point (src_range.m_finish, + LOCATION_ASPECT_FINISH); if (start.file != finish.file) return "range endpoints are in different files"; if (start.line != finish.line) diff --git a/gcc/input.h b/gcc/input.h index 4619663519a..e5d5a0932b8 100644 --- a/gcc/input.h +++ b/gcc/input.h @@ -85,7 +85,10 @@ class char_span extern char_span location_get_source_line (const char *file_path, int line); extern bool location_missing_trailing_newline (const char *file_path); -extern expanded_location expand_location_to_spelling_point (source_location); +extern expanded_location +expand_location_to_spelling_point (source_location, + enum location_aspect aspect + = LOCATION_ASPECT_CARET); extern source_location expansion_point_location_if_in_system_header (source_location); extern source_location expansion_point_location (source_location); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 2f3ababae78..37a035a9ed8 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,25 @@ 2018-10-05 David Malcolm + PR c++/56856 + * g++.dg/ext/builtin4.C: Set expected location for warning to the + correct location within the format string. + * g++.dg/plugin/plugin.exp (plugin_test_list): Add the plugin and + files for testing locations within string literal locations from + the C frontend. + * g++.dg/warn/Wformat-method.C: New test. + * g++.dg/warn/Wformat-pr71863.C: New test. + * g++.dg/warn/Wformat-ranges-c++11.C: New test. + * g++.dg/warn/Wformat-ranges.C: New test, based on + gcc.dg/format/diagnostic-ranges.c. + * gcc.dg/plugin/diagnostic-test-string-literals-1.c + (test_multitoken_macro): Generalize expected output to work with + both C and C++. + * gcc.dg/plugin/diagnostic-test-string-literals-2.c + (test_stringified_token_1): Likewise. + (test_stringified_token_3): Likewise. + +2018-10-05 David Malcolm + * lib/multiline.exp (proc dg-end-multiline-output): Check argument count. If there's a 3rd argument, use dg-process-target on it, bailing out, or recording expected failures as "maybe_x". diff --git a/gcc/testsuite/g++.dg/ext/builtin4.C b/gcc/testsuite/g++.dg/ext/builtin4.C index 8804b53bd7a..6691434c7c9 100644 --- a/gcc/testsuite/g++.dg/ext/builtin4.C +++ b/gcc/testsuite/g++.dg/ext/builtin4.C @@ -6,5 +6,5 @@ extern "C" int printf(const char*,...); void foo() { - printf("%d"); // { dg-warning "expects a matching" } + printf("%d"); // { dg-warning "12: expects a matching" } } diff --git a/gcc/testsuite/g++.dg/plugin/plugin.exp b/gcc/testsuite/g++.dg/plugin/plugin.exp index d9f54ab9877..e7c3b692625 100644 --- a/gcc/testsuite/g++.dg/plugin/plugin.exp +++ b/gcc/testsuite/g++.dg/plugin/plugin.exp @@ -67,6 +67,11 @@ set plugin_test_list [list \ diagnostic-test-expressions-1.C } \ { ../../gcc.dg/plugin/diagnostic_plugin_test_inlining.c \ diagnostic-test-inlining-1.C } \ + { ../../gcc.dg/plugin/diagnostic_plugin_test_string_literals.c \ + ../../gcc.dg/plugin/diagnostic-test-string-literals-1.c \ + ../../gcc.dg/plugin/diagnostic-test-string-literals-2.c \ + ../../gcc.dg/plugin/diagnostic-test-string-literals-3.c \ + ../../gcc.dg/plugin/diagnostic-test-string-literals-4.c } \ { show_template_tree_color_plugin.c \ show-template-tree-color.C \ show-template-tree-color-labels.C \ diff --git a/gcc/testsuite/g++.dg/warn/Wformat-method.C b/gcc/testsuite/g++.dg/warn/Wformat-method.C new file mode 100644 index 00000000000..8494bf10df6 --- /dev/null +++ b/gcc/testsuite/g++.dg/warn/Wformat-method.C @@ -0,0 +1,40 @@ +// { dg-options "-Wformat -fdiagnostics-show-caret" } + +class logger +{ +public: + void log (const char *fmt, ...) __attribute__((format (printf, 2, 3))); +}; + +void test () +{ + logger out; + out.log ("before %s after", 42); // { dg-warning "argument 3 has type 'int'" } + /* { dg-begin-multiline-output "" } + out.log ("before %s after", 42); + ~^ ~~ + | | + char* int + %d + { dg-end-multiline-output "" } */ +} + +template +class logger_2 +{ +public: + void log (const char *fmt, ...) __attribute__((format (printf, 2, 3))); +}; + +void test_2 () +{ + logger_2 out; + out.log ("before %s after", 42); // { dg-warning "argument 3 has type 'int'" } + /* { dg-begin-multiline-output "" } + out.log ("before %s after", 42); + ~^ ~~ + | | + char* int + %d + { dg-end-multiline-output "" } */ +} diff --git a/gcc/testsuite/g++.dg/warn/Wformat-pr71863.C b/gcc/testsuite/g++.dg/warn/Wformat-pr71863.C new file mode 100644 index 00000000000..537274c7fe7 --- /dev/null +++ b/gcc/testsuite/g++.dg/warn/Wformat-pr71863.C @@ -0,0 +1,33 @@ +// { dg-options "-Wformat -fdiagnostics-show-caret" } + +void test_1 (void) +{ + __builtin_printf ("%s%s", 42, 43); // { dg-warning "argument 2 has type 'int'" } + // { dg-warning "argument 3 has type 'int'" "" { target *-*-* } .-1 } + /* { dg-begin-multiline-output "" } + __builtin_printf ("%s%s", 42, 43); + ~^ ~~ + | | + char* int + %d + { dg-end-multiline-output "" } */ + /* { dg-begin-multiline-output "" } + __builtin_printf ("%s%s", 42, 43); + ~^ ~~ + | | + char* int + %d + { dg-end-multiline-output "" } */ +} + +void test_2 (void) +{ + __builtin_printf ("before %s after", 6 * 7); // { dg-warning "argument 2 has type 'int'" } + /* { dg-begin-multiline-output "" } + __builtin_printf ("before %s after", 6 * 7); + ~^ ~~~~~ + | | + char* int + %d + { dg-end-multiline-output "" } */ +} diff --git a/gcc/testsuite/g++.dg/warn/Wformat-ranges-c++11.C b/gcc/testsuite/g++.dg/warn/Wformat-ranges-c++11.C new file mode 100644 index 00000000000..a4d3fff2967 --- /dev/null +++ b/gcc/testsuite/g++.dg/warn/Wformat-ranges-c++11.C @@ -0,0 +1,18 @@ +// { dg-do compile { target c++11 } } +/* { dg-options "-Wformat -fdiagnostics-show-caret" } */ + +/* C++11-specific format tests. */ + +#define printf __builtin_printf + +void test_u8 (const char *msg) +{ + printf(u8"hello %i", msg);/* { dg-warning "format '%i' expects argument of type 'int', but argument 2 has type 'const char\\*' " } */ +/* { dg-begin-multiline-output "" } + printf(u8"hello %i", msg); + ~^ ~~~ + | | + int const char* + %s + { dg-end-multiline-output "" } */ +} diff --git a/gcc/testsuite/gcc.dg/format/diagnostic-ranges.c b/gcc/testsuite/g++.dg/warn/Wformat-ranges.C similarity index 82% copy from gcc/testsuite/gcc.dg/format/diagnostic-ranges.c copy to gcc/testsuite/g++.dg/warn/Wformat-ranges.C index 84535f018d7..96dfa97055c 100644 --- a/gcc/testsuite/gcc.dg/format/diagnostic-ranges.c +++ b/gcc/testsuite/g++.dg/warn/Wformat-ranges.C @@ -1,29 +1,41 @@ /* { dg-options "-Wformat -fdiagnostics-show-caret" } */ -/* See PR 52952. */ +/* This is a copy of gcc.dg/format/diagnostic-ranges.c + with the following changes: + - removal of "format.h" + - "char \\*" -> "char\\*" (space removal) + - move of test_u8 to Wformat-ranges-c++11.C. */ + +#define printf __builtin_printf +typedef __SIZE_TYPE__ size_t; +typedef __SIZE_TYPE__ ssize_t; -#include "format.h" +extern ssize_t strfmon (char *__restrict __s, size_t __maxsize, + const char *__restrict, ...) + __attribute__ ((__format__ (__strfmon__, 3, 4))); + +/* See PR 52952. */ void test_mismatching_types (const char *msg) { - printf("hello %i", msg); /* { dg-warning "format '%i' expects argument of type 'int', but argument 2 has type 'const char \\*' " } */ + printf("hello %i", msg); /* { dg-warning "format '%i' expects argument of type 'int', but argument 2 has type 'const char\\*' " } */ /* { dg-begin-multiline-output "" } printf("hello %i", msg); ~^ ~~~ | | - int const char * + int const char* %s { dg-end-multiline-output "" } */ - printf("hello %s", 42); /* { dg-warning "format '%s' expects argument of type 'char \\*', but argument 2 has type 'int'" } */ + printf("hello %s", 42); /* { dg-warning "format '%s' expects argument of type 'char\\*', but argument 2 has type 'int'" } */ /* { dg-begin-multiline-output "" } printf("hello %s", 42); ~^ ~~ | | | int - char * + char* %d { dg-end-multiline-output "" } */ @@ -45,7 +57,7 @@ void test_multiple_arguments (void) printf ("arg0: %i arg1: %s arg 2: %i", ~^ | - char * + char* %d 100, 101, 102); ~~~ @@ -62,7 +74,7 @@ void test_multiple_arguments_2 (int i, int j) printf ("arg0: %i arg1: %s arg 2: %i", ~^ | - char * + char* %d 100, i + j, 102); ~~~~~ @@ -72,16 +84,10 @@ void test_multiple_arguments_2 (int i, int j) } void multiline_format_string (void) { - printf ("before the fmt specifier" /* { dg-warning "11: format '%d' expects a matching 'int' argument" } */ -/* { dg-begin-multiline-output "" } - printf ("before the fmt specifier" - ^~~~~~~~~~~~~~~~~~~~~~~~~~ - { dg-end-multiline-output "" } */ - + printf ("before the fmt specifier" "%" - "d" /* { dg-message "12: format string is defined here" } */ + "d" /* { dg-warning "12: format '%d' expects a matching 'int' argument" } */ "after the fmt specifier"); - /* { dg-begin-multiline-output "" } "%" ~~ @@ -96,13 +102,13 @@ void test_hex (const char *msg) { /* "%" is \x25 "i" is \x69 */ - printf("hello \x25\x69", msg); /* { dg-warning "format '%i' expects argument of type 'int', but argument 2 has type 'const char \\*' " } */ + printf("hello \x25\x69", msg); /* { dg-warning "format '%i' expects argument of type 'int', but argument 2 has type 'const char\\*' " } */ /* { dg-begin-multiline-output "" } printf("hello \x25\x69", msg); ~~~~^~~~ ~~~ | | - int const char * + int const char* \x25s { dg-end-multiline-output "" } */ } @@ -111,13 +117,13 @@ void test_oct (const char *msg) { /* "%" is octal 045 "i" is octal 151. */ - printf("hello \045\151", msg); /* { dg-warning "format '%i' expects argument of type 'int', but argument 2 has type 'const char \\*' " } */ + printf("hello \045\151", msg); /* { dg-warning "format '%i' expects argument of type 'int', but argument 2 has type 'const char\\*' " } */ /* { dg-begin-multiline-output "" } printf("hello \045\151", msg); ~~~~^~~~ ~~~ | | - int const char * + int const char* \045s { dg-end-multiline-output "" } */ } @@ -130,42 +136,25 @@ void test_multiple (const char *msg) msg); /* { dg-begin-multiline-output "" } printf("prefix" "\x25" "\151" "suffix", - ^~~~~~~~ - msg); - ~~~ - | - const char * - { dg-end-multiline-output "" } */ - -/* { dg-begin-multiline-output "" } - printf("prefix" "\x25" "\151" "suffix", ~~~~~~~~^~~~ | int \x25" "s + msg); + ~~~ + | + const char* { dg-end-multiline-output "" } */ } -void test_u8 (const char *msg) -{ - printf(u8"hello %i", msg);/* { dg-warning "format '%i' expects argument of type 'int', but argument 2 has type 'const char \\*' " } */ -/* { dg-begin-multiline-output "" } - printf(u8"hello %i", msg); - ~^ ~~~ - | | - int const char * - %s - { dg-end-multiline-output "" } */ -} - void test_param (long long_i, long long_j) { - printf ("foo %s bar", long_i + long_j); /* { dg-warning "17: format '%s' expects argument of type 'char \\*', but argument 2 has type 'long int'" } */ + printf ("foo %s bar", long_i + long_j); /* { dg-warning "17: format '%s' expects argument of type 'char\\*', but argument 2 has type 'long int'" } */ /* { dg-begin-multiline-output "" } printf ("foo %s bar", long_i + long_j); ~^ ~~~~~~~~~~~~~~~ | | - char * long int + char* long int %ld { dg-end-multiline-output "" } */ } @@ -276,12 +265,12 @@ void test_embedded_nul (void) void test_macro (const char *msg) { #define INT_FMT "%i" /* { dg-message "19: format string is defined here" } */ - printf("hello " INT_FMT " world", msg); /* { dg-warning "10: format '%i' expects argument of type 'int', but argument 2 has type 'const char \\*' " } */ + printf("hello " INT_FMT " world", msg); /* { dg-warning "10: format '%i' expects argument of type 'int', but argument 2 has type 'const char\\*' " } */ /* { dg-begin-multiline-output "" } printf("hello " INT_FMT " world", msg); - ^~~~~~~~ ~~~ + ^~~~~~~~~~~~~~~~~~~~~~~~~ ~~~ | - const char * + const char* { dg-end-multiline-output "" } */ /* { dg-begin-multiline-output "" } #define INT_FMT "%i" @@ -296,12 +285,12 @@ void test_macro (const char *msg) void test_macro_2 (const char *msg) { #define PRIu32 "u" /* { dg-message "17: format string is defined here" } */ - printf("hello %" PRIu32 " world", msg); /* { dg-warning "10: format '%u' expects argument of type 'unsigned int', but argument 2 has type 'const char \\*' " } */ + printf("hello %" PRIu32 " world", msg); /* { dg-warning "10: format '%u' expects argument of type 'unsigned int', but argument 2 has type 'const char\\*' " } */ /* { dg-begin-multiline-output "" } printf("hello %" PRIu32 " world", msg); - ^~~~~~~~~ ~~~ + ^~~~~~~~~~~~~~~~~~~~~~~~~ ~~~ | - const char * + const char* { dg-end-multiline-output "" } */ /* { dg-begin-multiline-output "" } #define PRIu32 "u" @@ -314,7 +303,8 @@ void test_macro_2 (const char *msg) void test_macro_3 (const char *msg) { -#define FMT_STRING "hello %i world" /* { dg-warning "20: format '%i' expects argument of type 'int', but argument 2 has type 'const char \\*' " } */ +#define FMT_STRING "hello %i world" // { dg-line test_macro_3_macro_line } +/* { dg-warning "20: format '%i' expects argument of type 'int', but argument 2 has type 'const char\\*'" "" { target *-*-* } .-1 } */ printf(FMT_STRING, msg); /* { dg-message "10: in expansion of macro 'FMT_STRING" } */ /* { dg-begin-multiline-output "" } #define FMT_STRING "hello %i world" @@ -324,16 +314,24 @@ void test_macro_3 (const char *msg) printf(FMT_STRING, msg); ^~~~~~~~~~ { dg-end-multiline-output "" } */ +/* { dg-message "28: format string is defined here" "" { target *-*-* } test_macro_3_macro_line } */ +/* { dg-begin-multiline-output "" } + #define FMT_STRING "hello %i world" + ~^ + | + int + %s + { dg-end-multiline-output "" } */ #undef FMT_STRING } void test_macro_4 (const char *msg) { -#define FMT_STRING "hello %i world" /* { dg-warning "20: format '%i' expects argument of type 'int', but argument 2 has type 'const char \\*' " } */ +#define FMT_STRING "hello %i world" /* { dg-warning "20: format '%i' expects argument of type 'int', but argument 2 has type 'const char\\*' " } */ printf(FMT_STRING "\n", msg); /* { dg-message "10: in expansion of macro 'FMT_STRING" } */ /* { dg-begin-multiline-output "" } #define FMT_STRING "hello %i world" - ^~~~~~~~~~~~~~~~ + ^ { dg-end-multiline-output "" } */ /* { dg-begin-multiline-output "" } printf(FMT_STRING "\n", msg); @@ -351,19 +349,12 @@ void test_macro_4 (const char *msg) void test_non_contiguous_strings (void) { - __builtin_printf(" %" "d ", 0.5); /* { dg-warning "20: format .%d. expects argument of type .int., but argument 2 has type .double." } */ - /* { dg-message "26: format string is defined here" "" { target *-*-* } .-1 } */ - /* { dg-begin-multiline-output "" } - __builtin_printf(" %" "d ", 0.5); - ^~~~ ~~~ - | - double - { dg-end-multiline-output "" } */ + __builtin_printf(" %" "d ", 0.5); /* { dg-warning "26: format .%d. expects argument of type .int., but argument 2 has type .double." } */ /* { dg-begin-multiline-output "" } __builtin_printf(" %" "d ", 0.5); - ~~~~^ - | - int + ~~~~^ ~~~ + | | + int double %" "f { dg-end-multiline-output "" } */ } diff --git a/gcc/testsuite/gcc.dg/format/diagnostic-ranges.c b/gcc/testsuite/gcc.dg/format/diagnostic-ranges.c index 84535f018d7..2c33ce2c0d5 100644 --- a/gcc/testsuite/gcc.dg/format/diagnostic-ranges.c +++ b/gcc/testsuite/gcc.dg/format/diagnostic-ranges.c @@ -314,7 +314,8 @@ void test_macro_2 (const char *msg) void test_macro_3 (const char *msg) { -#define FMT_STRING "hello %i world" /* { dg-warning "20: format '%i' expects argument of type 'int', but argument 2 has type 'const char \\*' " } */ +#define FMT_STRING "hello %i world" /* { dg-line test_macro_3_macro_line } */ + /* { dg-warning "20: format '%i' expects argument of type 'int', but argument 2 has type 'const char \\*'" "" { target *-*-*} .-1 } */ printf(FMT_STRING, msg); /* { dg-message "10: in expansion of macro 'FMT_STRING" } */ /* { dg-begin-multiline-output "" } #define FMT_STRING "hello %i world" @@ -324,6 +325,14 @@ void test_macro_3 (const char *msg) printf(FMT_STRING, msg); ^~~~~~~~~~ { dg-end-multiline-output "" } */ +/* { dg-message "28: format string is defined here" "" { target *-*-* } test_macro_3_macro_line } */ +/* { dg-begin-multiline-output "" } + #define FMT_STRING "hello %i world" + ~^ + | + int + %s + { dg-end-multiline-output "" } */ #undef FMT_STRING } diff --git a/gcc/testsuite/gcc.dg/plugin/diagnostic-test-string-literals-1.c b/gcc/testsuite/gcc.dg/plugin/diagnostic-test-string-literals-1.c index bea86afad76..73770aa1bee 100644 --- a/gcc/testsuite/gcc.dg/plugin/diagnostic-test-string-literals-1.c +++ b/gcc/testsuite/gcc.dg/plugin/diagnostic-test-string-literals-1.c @@ -251,7 +251,11 @@ test_multitoken_macro (void) /* { dg-begin-multiline-output "" } #define RANGE ("0123456789") ^~~~~~~~~~~~~~ - { dg-end-multiline-output "" } */ + { dg-end-multiline-output "" { target c } } */ +/* { dg-begin-multiline-output "" } + #define RANGE ("0123456789") + ~^~~~~~~~~~~~~ + { dg-end-multiline-output "" { target c++ } } */ /* { dg-begin-multiline-output "" } __emit_string_literal_range (RANGE, 4, 3, 6); ^~~~~ diff --git a/gcc/testsuite/gcc.dg/plugin/diagnostic-test-string-literals-2.c b/gcc/testsuite/gcc.dg/plugin/diagnostic-test-string-literals-2.c index e9d98f4d6be..260c47d3401 100644 --- a/gcc/testsuite/gcc.dg/plugin/diagnostic-test-string-literals-2.c +++ b/gcc/testsuite/gcc.dg/plugin/diagnostic-test-string-literals-2.c @@ -12,7 +12,7 @@ test_stringified_token_1 (int x) { #define STRINGIFY(EXPR) #EXPR - __emit_string_literal_range (STRINGIFY(x > 0), /* { dg-error "unable to read substring location: macro expansion" } */ + __emit_string_literal_range (STRINGIFY(x > 0), /* { dg-error "macro expansion|cpp_interpret_string_1 failed" } */ 0, 0, 4); #undef STRINGIFY @@ -43,7 +43,7 @@ test_stringified_token_3 (int x) #define XSTR(s) STR(s) #define STR(s) #s #define FOO 123456789 - __emit_string_literal_range (XSTR (FOO), /* { dg-error "unable to read substring location: macro expansion" } */ + __emit_string_literal_range (XSTR (FOO), /* { dg-error "macro expansion|cpp_interpret_string_1 failed" } */ 2, 2, 3); #undef XSTR -- 2.11.4.GIT