diff options
Diffstat (limited to 'gcc/gcov.c')
| -rw-r--r-- | gcc/gcov.c | 20 |
1 files changed, 16 insertions, 4 deletions
@@ -1041,17 +1041,21 @@ process_args (int argc, char **argv) return optind; } -/* Output intermediate LINE sitting on LINE_NUM to JSON OBJECT. */ +/* Output intermediate LINE sitting on LINE_NUM to JSON OBJECT. + Add FUNCTION_NAME to the LINE. */ static void output_intermediate_json_line (json::array *object, - line_info *line, unsigned line_num) + line_info *line, unsigned line_num, + const char *function_name) { if (!line->exists) return; json::object *lineo = new json::object (); lineo->set ("line_number", new json::number (line_num)); + if (function_name != NULL) + lineo->set ("function_name", new json::string (function_name)); lineo->set ("count", new json::number (line->count)); lineo->set ("unexecuted_block", new json::literal (line->has_unexecuted_block)); @@ -1141,6 +1145,8 @@ output_json_intermediate_file (json::array *json_files, source_info *src) json::array *lineso = new json::array (); root->set ("lines", lineso); + function_info *last_non_group_fn = NULL; + for (unsigned line_num = 1; line_num <= src->lines.size (); line_num++) { vector<function_info *> *fns = src->get_functions_at_location (line_num); @@ -1150,17 +1156,23 @@ output_json_intermediate_file (json::array *json_files, source_info *src) for (vector<function_info *>::iterator it2 = fns->begin (); it2 != fns->end (); it2++) { + if (!(*it2)->is_group) + last_non_group_fn = *it2; + vector<line_info> &lines = (*it2)->lines; for (unsigned i = 0; i < lines.size (); i++) { line_info *line = &lines[i]; - output_intermediate_json_line (lineso, line, line_num + i); + output_intermediate_json_line (lineso, line, line_num + i, + (*it2)->m_name); } } /* Follow with lines associated with the source file. */ if (line_num < src->lines.size ()) - output_intermediate_json_line (lineso, &src->lines[line_num], line_num); + output_intermediate_json_line (lineso, &src->lines[line_num], line_num, + (last_non_group_fn != NULL + ? last_non_group_fn->m_name : NULL)); } } |