This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[PATCH 3/7] GCOV: introduce vector for function_info::counts.
- From: marxin <mliska at suse dot cz>
- To: gcc-patches at gcc dot gnu dot org
- Cc: nathan at acm dot org
- Date: Thu, 9 Nov 2017 11:24:05 +0100
- Subject: [PATCH 3/7] GCOV: introduce vector for function_info::counts.
- Authentication-results: sourceware.org; auth=none
- References: <cover.1510223055.git.mliska@suse.cz>
- Resent-user-agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0
gcc/ChangeLog:
2017-11-09 Martin Liska <mliska@suse.cz>
* gcov.c (function_info::function_info): Remove num_counts
and add vector<gcov_type>.
(function_info::~function_info): Use the vector.
(process_file): Likewise.
(read_graph_file): Likewise.
(read_count_file): Likewise.
(solve_flow_graph): Likewise.
---
gcc/gcov.c | 21 ++++++++-------------
1 file changed, 8 insertions(+), 13 deletions(-)
diff --git a/gcc/gcov.c b/gcc/gcov.c
index 3dc159726c7..02a01b51763 100644
--- a/gcc/gcov.c
+++ b/gcc/gcov.c
@@ -257,8 +257,7 @@ typedef struct function_info
unsigned blocks_executed;
/* Raw arc coverage counts. */
- gcov_type *counts;
- unsigned num_counts;
+ vector<gcov_type> counts;
/* First line number. */
unsigned start_line;
@@ -551,8 +550,8 @@ extern int main (int, char **);
function_info::function_info (): name (NULL), demangled_name (NULL),
ident (0), lineno_checksum (0), cfg_checksum (0), has_catch (0),
artificial (0), is_group (0),
- blocks (), blocks_executed (0), counts (NULL), num_counts (0),
- start_line (0), start_column (0), end_line (0), src (0), lines (), next (NULL)
+ blocks (), blocks_executed (0), counts (),
+ start_line (0), start_column (), end_line (0), src (0), lines (), next (NULL)
{
}
@@ -568,7 +567,6 @@ function_info::~function_info ()
free (arc);
}
}
- free (counts);
if (flag_demangled_names && demangled_name != name)
free (demangled_name);
free (name);
@@ -1140,7 +1138,7 @@ process_file (const char *file_name)
function_t *fn = *it;
unsigned src = fn->src;
- if (fn->counts || no_data_file)
+ if (!fn->counts.empty () || no_data_file)
{
source_info *s = &sources[src];
s->functions.push_back (fn);
@@ -1604,7 +1602,7 @@ read_graph_file (void)
}
if (!arc->on_tree)
- fn->num_counts++;
+ fn->counts.push_back (0);
}
if (mark_catches)
@@ -1755,13 +1753,10 @@ read_count_file (void)
}
else if (tag == GCOV_TAG_FOR_COUNTER (GCOV_COUNTER_ARCS) && fn)
{
- if (length != GCOV_TAG_COUNTER_LENGTH (fn->num_counts))
+ if (length != GCOV_TAG_COUNTER_LENGTH (fn->counts.size ()))
goto mismatch;
- if (!fn->counts)
- fn->counts = XCNEWVEC (gcov_type, fn->num_counts);
-
- for (ix = 0; ix != fn->num_counts; ix++)
+ for (ix = 0; ix != fn->counts.size (); ix++)
fn->counts[ix] += gcov_read_counter ();
}
gcov_sync (base, length);
@@ -1788,7 +1783,7 @@ solve_flow_graph (function_t *fn)
{
unsigned ix;
arc_t *arc;
- gcov_type *count_ptr = fn->counts;
+ gcov_type *count_ptr = &fn->counts.front ();
block_t *blk;
block_t *valid_blocks = NULL; /* valid, but unpropagated blocks. */
block_t *invalid_blocks = NULL; /* invalid, but inferable blocks. */
--
2.14.3