From: David Malcolm Date: Thu, 8 Nov 2018 15:31:13 +0000 (+0000) Subject: Support %f in pp_format X-Git-Tag: basepoints/gcc-10~3229 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=204839e7c41678c3f93975fe4356492040fcf411;p=thirdparty%2Fgcc.git Support %f in pp_format Numerous formatted messages from the inliner use %f, mostly as %f, but occasionally with length modifiers. This patch implements the simplest case of "%f" for pp_format (with no modifier support) to make it easier to port these messages from fprintf to dump_printf_loc. The selftest has an assertion that %f on 1.0 is printed as "1.000000". This comes from the host's sprintf, and I believe this is guaranteed by POSIX: "If the precision is missing, it shall be taken as 6". If this is an issue I can drop the selftest. gcc/c-family/ChangeLog: * c-format.c (gcc_dump_printf_char_table): Add entry for %f. gcc/ChangeLog: * pretty-print.c (pp_format): Handle %f. (selftest::test_pp_format): Add test of %f. * pretty-print.h (pp_double): New macro. gcc/testsuite/ChangeLog: * gcc.dg/format/gcc_diag-10.c: Add coverage for %f. From-SVN: r265919 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 0ebab865cee1..bc91ee298d85 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2018-11-08 David Malcolm + + * pretty-print.c (pp_format): Handle %f. + (selftest::test_pp_format): Add test of %f. + * pretty-print.h (pp_double): New macro. + 2018-11-08 David Malcolm * dump-context.h (ASSERT_IS_CGRAPH_NODE): New macro. diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog index 11978713ee26..ac2353978b11 100644 --- a/gcc/c-family/ChangeLog +++ b/gcc/c-family/ChangeLog @@ -1,3 +1,7 @@ +2018-11-08 David Malcolm + + * c-format.c (gcc_dump_printf_char_table): Add entry for %f. + 2018-11-08 David Malcolm * c-format.c (local_cgraph_node_ptr_node): New variable. diff --git a/gcc/c-family/c-format.c b/gcc/c-family/c-format.c index c8ae6c40275b..6613092c6fdc 100644 --- a/gcc/c-family/c-format.c +++ b/gcc/c-family/c-format.c @@ -810,6 +810,9 @@ static const format_char_info gcc_dump_printf_char_table[] = /* T requires a "tree" at runtime. */ { "T", 1, STD_C89, { T89_T, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "", "\"", NULL }, + /* %f requires a "double"; it doesn't support modifiers. */ + { "f", 0, STD_C89, { T89_D, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "", "\"", NULL }, + { NULL, 0, STD_C89, NOLENGTHS, NULL, NULL, NULL } }; diff --git a/gcc/pretty-print.c b/gcc/pretty-print.c index 7dd900b3bbf6..19ef75bdfcf6 100644 --- a/gcc/pretty-print.c +++ b/gcc/pretty-print.c @@ -977,6 +977,7 @@ pp_indent (pretty_printer *pp) %ld, %li, %lo, %lu, %lx: long versions of the above. %lld, %lli, %llo, %llu, %llx: long long versions. %wd, %wi, %wo, %wu, %wx: HOST_WIDE_INT versions. + %f: double %c: character. %s: string. %p: pointer (printed in a host-dependent manner). @@ -1307,6 +1308,10 @@ pp_format (pretty_printer *pp, text_info *text) (pp, *text->args_ptr, precision, unsigned, "u"); break; + case 'f': + pp_double (pp, va_arg (*text->args_ptr, double)); + break; + case 'Z': { int *v = va_arg (*text->args_ptr, int *); @@ -2160,6 +2165,7 @@ test_pp_format () ASSERT_PP_FORMAT_2 ("17 12345678", "%wo %x", (HOST_WIDE_INT)15, 0x12345678); ASSERT_PP_FORMAT_2 ("0xcafebabe 12345678", "%wx %x", (HOST_WIDE_INT)0xcafebabe, 0x12345678); + ASSERT_PP_FORMAT_2 ("1.000000 12345678", "%f %x", 1.0, 0x12345678); ASSERT_PP_FORMAT_2 ("A 12345678", "%c %x", 'A', 0x12345678); ASSERT_PP_FORMAT_2 ("hello world 12345678", "%s %x", "hello world", 0x12345678); diff --git a/gcc/pretty-print.h b/gcc/pretty-print.h index 2decc516b1f0..a6e60f110f07 100644 --- a/gcc/pretty-print.h +++ b/gcc/pretty-print.h @@ -330,6 +330,7 @@ pp_get_prefix (const pretty_printer *pp) { return pp->prefix; } pp_string (PP, pp_buffer (PP)->digit_buffer); \ } \ while (0) +#define pp_double(PP, F) pp_scalar (PP, "%f", F) #define pp_pointer(PP, P) pp_scalar (PP, "%p", P) #define pp_identifier(PP, ID) pp_string (PP, (pp_translate_identifiers (PP) \ diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 1799cb58ffb8..f4fd981d98ca 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2018-11-08 David Malcolm + + * gcc.dg/format/gcc_diag-10.c: Add coverage for %f. + 2018-11-08 David Malcolm * gcc.dg/format/gcc_diag-10.c (cgraph_node): New typedef. diff --git a/gcc/testsuite/gcc.dg/format/gcc_diag-10.c b/gcc/testsuite/gcc.dg/format/gcc_diag-10.c index 97a1993dc8fa..ba2629b3ecba 100644 --- a/gcc/testsuite/gcc.dg/format/gcc_diag-10.c +++ b/gcc/testsuite/gcc.dg/format/gcc_diag-10.c @@ -183,4 +183,6 @@ void test_dump (tree t, gimple *stmt, cgraph_node *node) dump ("%T", t); dump ("%G", stmt); dump ("%C", node); + dump ("%f", 1.0); + dump ("%4.2f", 1.0); /* { dg-warning "format" } */ }