From 5b0e70eee581a927fb1007cdfde31fa02179374b Mon Sep 17 00:00:00 2001 From: nathan Date: Sat, 10 Dec 2011 08:32:34 +0000 Subject: PR gcov-profile/51449 * coverage.c (coverage_end_function): Always process the coverage variables. testsuite/ * g++.dg/gcov/gcov-14.C: New. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@182184 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/coverage.c | 43 +++++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 20 deletions(-) (limited to 'gcc/coverage.c') diff --git a/gcc/coverage.c b/gcc/coverage.c index 656db92beb1..58a76cafadd 100644 --- a/gcc/coverage.c +++ b/gcc/coverage.c @@ -604,20 +604,33 @@ coverage_end_function (unsigned lineno_checksum, unsigned cfg_checksum) bbg_file_name = NULL; } - /* If the function is extern (i.e. extern inline), then we won't be - outputting it, so don't chain it onto the function list. */ - if (fn_ctr_mask && !DECL_EXTERNAL (current_function_decl)) + if (fn_ctr_mask) { - struct coverage_data *item = ggc_alloc_coverage_data (); + struct coverage_data *item = 0; + + /* If the function is extern (i.e. extern inline), then we won't + be outputting it, so don't chain it onto the function + list. */ + if (!DECL_EXTERNAL (current_function_decl)) + { + item = ggc_alloc_coverage_data (); + + item->ident = current_function_funcdef_no + 1; + item->lineno_checksum = lineno_checksum; + item->cfg_checksum = cfg_checksum; + + item->fn_decl = current_function_decl; + item->next = 0; + *functions_tail = item; + functions_tail = &item->next; + } - item->ident = current_function_funcdef_no + 1; - item->lineno_checksum = lineno_checksum; - item->cfg_checksum = cfg_checksum; for (i = 0; i != GCOV_COUNTERS; i++) { tree var = fn_v_ctrs[i]; - - item->ctr_vars[i] = var; + + if (item) + item->ctr_vars[i] = var; if (var) { tree array_type = build_index_type (size_int (fn_n_ctrs[i] - 1)); @@ -627,17 +640,7 @@ coverage_end_function (unsigned lineno_checksum, unsigned cfg_checksum) DECL_SIZE_UNIT (var) = TYPE_SIZE_UNIT (array_type); varpool_finalize_decl (var); } - } - item->fn_decl = current_function_decl; - item->next = 0; - *functions_tail = item; - functions_tail = &item->next; - } - - if (fn_ctr_mask) - { - for (i = 0; i != GCOV_COUNTERS; i++) - { + fn_b_ctrs[i] = fn_n_ctrs[i] = 0; fn_v_ctrs[i] = NULL_TREE; } -- cgit v1.2.1