From e59b5e24ea78b6ca06da7ba07ec3218d6b65e989 Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Tue, 27 Feb 2018 15:11:08 +0100 Subject: Make groups more generic (PR gcov-profile/84548). 2018-02-27 Martin Liska PR gcov-profile/84548 * gcov.c (process_file): Allow partial overlap and consider it also as group functions. (output_lines): Properly calculate range of lines for a group. 2018-02-27 Martin Liska PR gcov-profile/84548 * g++.dg/gcov/pr84548.C: New test. From-SVN: r258033 --- gcc/gcov.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'gcc/gcov.c') diff --git a/gcc/gcov.c b/gcc/gcov.c index 37f431c..6bbfe33 100644 --- a/gcc/gcov.c +++ b/gcc/gcov.c @@ -1151,7 +1151,6 @@ process_file (const char *file_name) function_info **slot = fn_map.get (needle); if (slot) { - gcc_assert ((*slot)->end_line == (*it)->end_line); (*slot)->is_group = 1; (*it)->is_group = 1; } @@ -2957,7 +2956,14 @@ output_lines (FILE *gcov_file, const source_info *src) { fns = src->get_functions_at_location (line_num); if (fns.size () > 1) - line_start_group = fns[0]->end_line; + { + /* It's possible to have functions that partially overlap, + thus take the maximum end_line of functions starting + at LINE_NUM. */ + for (unsigned i = 0; i < fns.size (); i++) + if (fns[i]->end_line > line_start_group) + line_start_group = fns[i]->end_line; + } else if (fns.size () == 1) { function_info *fn = fns[0]; -- cgit v1.1