diff options
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/coverage.c | 18 |
2 files changed, 16 insertions, 8 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index de6973a..eb23c85 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,11 @@ 2018-09-24 Martin Liska <mliska@suse.cz> + * coverage.c (get_coverage_counts): Use warning_at + with current_function_decl location. Use %qD in warning + message. + +2018-09-24 Martin Liska <mliska@suse.cz> + * memory-block.h (memory_block_pool::release): Annotate with valgrind that the memory is not accessible. diff --git a/gcc/coverage.c b/gcc/coverage.c index 26cce2b..8f12778 100644 --- a/gcc/coverage.c +++ b/gcc/coverage.c @@ -336,12 +336,13 @@ get_coverage_counts (unsigned counter, unsigned cfg_checksum, { static int warned = 0; bool warning_printed = false; - tree id = DECL_ASSEMBLER_NAME (current_function_decl); warning_printed = - warning_at (input_location, OPT_Wcoverage_mismatch, - "the control flow of function %qE does not match " - "its profile data (counter %qs)", id, ctr_names[counter]); + warning_at (DECL_SOURCE_LOCATION (current_function_decl), + OPT_Wcoverage_mismatch, + "the control flow of function %qD does not match " + "its profile data (counter %qs)", current_function_decl, + ctr_names[counter]); if (warning_printed && dump_enabled_p ()) { dump_user_location_t loc @@ -370,10 +371,11 @@ get_coverage_counts (unsigned counter, unsigned cfg_checksum, } else if (entry->lineno_checksum != lineno_checksum) { - warning (OPT_Wcoverage_mismatch, - "source locations for function %qE have changed," - " the profile data may be out of date", - DECL_ASSEMBLER_NAME (current_function_decl)); + warning_at (DECL_SOURCE_LOCATION (current_function_decl), + OPT_Wcoverage_mismatch, + "source locations for function %qD have changed," + " the profile data may be out of date", + current_function_decl); } return entry->counts; |