From 652623f7c68594b1825a333bf8e83e87d1c3f523 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Sat, 27 Feb 2021 10:43:28 +0100 Subject: [PATCH] gcse, ipa-devirt: Use %wd/%wu instead of HOST_WIDE_INT_PRINT* in diagnostics [PR99288] HOST_WIDE_INT_PRINT* in the string literals of warning/error/inform etc. make those messages non-translatable, and we have a perfectly fine alternative when not using system *printf - %w{d,u}. 2021-02-27 Jakub Jelinek PR other/99288 * gcse.c (gcse_or_cprop_is_too_expensive): Use %wu instead of HOST_WIDE_INT_PRINT_UNSIGNED in warning format string. * ipa-devirt.c (ipa_odr_read_section): Use %wd instead of HOST_WIDE_INT_PRINT_DEC in inform format string. Fix comment typos. --- gcc/gcse.c | 3 +-- gcc/ipa-devirt.c | 7 +++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/gcc/gcse.c b/gcc/gcse.c index 2c81fe413360..210dc7bd5da3 100644 --- a/gcc/gcse.c +++ b/gcc/gcse.c @@ -4011,8 +4011,7 @@ gcse_or_cprop_is_too_expensive (const char *pass) { warning (OPT_Wdisabled_optimization, "%s: %d basic blocks and %d registers; " - "increase %<--param max-gcse-memory%> above " - HOST_WIDE_INT_PRINT_UNSIGNED, + "increase %<--param max-gcse-memory%> above %wu", pass, n_basic_blocks_for_fn (cfun), max_reg_num (), memory_request / 1024); diff --git a/gcc/ipa-devirt.c b/gcc/ipa-devirt.c index 203fef3d6865..8cd1100aba98 100644 --- a/gcc/ipa-devirt.c +++ b/gcc/ipa-devirt.c @@ -4261,13 +4261,12 @@ ipa_odr_read_section (struct lto_file_decl_data *file_data, const char *data, " in another translation unit", this_enum.vals[j].name, warn_name); /* FIXME: In case there is easy way to print wide_ints, - perhaps we could do it here instead of overlfow checpl. */ + perhaps we could do it here instead of overflow check. */ else if (wi::fits_shwi_p (this_enum.vals[j].val) && wi::fits_shwi_p (warn_value)) inform (this_enum.vals[j].locus, - "name %qs is defined to " HOST_WIDE_INT_PRINT_DEC - " while another translation unit defines " - "it as " HOST_WIDE_INT_PRINT_DEC, + "name %qs is defined to %wd while another " + "translation unit defines it as %wd", warn_name, this_enum.vals[j].val.to_shwi (), warn_value.to_shwi ()); else -- 2.39.5