#include "tree-iterator.h"
#include "cgraph.h"
#include "tree-pass.h"
+#include "diagnostic.h"
+#include "intl.h"
#include "gcov-io.c"
/* Read and discard the stamp. */
gcov_read_unsigned ();
-
+
counts_hash = htab_create (10,
htab_counts_entry_hash, htab_counts_entry_eq,
htab_counts_entry_del);
|| entry->summary.num != expected)
{
static int warned = 0;
+ bool warning_printed = false;
tree id = DECL_ASSEMBLER_NAME (current_function_decl);
- if (warn_coverage_mismatch)
- warning (OPT_Wcoverage_mismatch, "coverage mismatch for function "
- "%qE while reading counter %qs", id, ctr_names[counter]);
- else
- error ("coverage mismatch for function %qE while reading counter %qs",
- id, ctr_names[counter]);
-
- if (!inhibit_warnings)
+ warning_printed =
+ warning_at (input_location, OPT_Wcoverage_mismatch,
+ "coverage mismatch for function "
+ "%qE while reading counter %qs", id, ctr_names[counter]);
+ if (warning_printed)
{
if (entry->checksum != checksum)
- inform (input_location, "checksum is %x instead of %x", entry->checksum, checksum);
+ inform (input_location, "checksum is %x instead of %x",
+ entry->checksum, checksum);
else
inform (input_location, "number of counters is %d instead of %d",
entry->summary.num, expected);
- }
-
- if (warn_coverage_mismatch
- && !inhibit_warnings
- && !warned++)
- {
- inform (input_location, "coverage mismatch ignored due to -Wcoverage-mismatch");
- inform (input_location, flag_guess_branch_prob
- ? "execution counts estimated"
- : "execution counts assumed to be zero");
- if (!flag_guess_branch_prob)
- inform (input_location, "this can result in poorly optimized code");
+
+ if (!(errorcount || sorrycount)
+ && !warned++)
+ {
+ inform (input_location, "coverage mismatch ignored");
+ inform (input_location, flag_guess_branch_prob
+ ? G_("execution counts estimated")
+ : G_("execution counts assumed to be zero"));
+ if (!flag_guess_branch_prob)
+ inform (input_location,
+ "this can result in poorly optimized code");
+ }
}
return NULL;
tree gcov_type_array_type
= build_array_type (gcov_type_node, NULL_TREE);
tree_ctr_tables[counter]
- = build_decl (VAR_DECL, NULL_TREE, gcov_type_array_type);
+ = build_decl (BUILTINS_LOCATION,
+ VAR_DECL, NULL_TREE, gcov_type_array_type);
TREE_STATIC (tree_ctr_tables[counter]) = 1;
ASM_GENERATE_INTERNAL_LABEL (buf, "LPBX", counter + 1);
DECL_NAME (tree_ctr_tables[counter]) = get_identifier (buf);
{
/* We don't need to output .gcno file unless we're under -ftest-coverage
(e.g. -fprofile-arcs/generate/use don't need .gcno to work). */
- if (no_coverage || !flag_test_coverage)
+ if (no_coverage || !flag_test_coverage || flag_compare_debug)
return 0;
if (!bbg_function_announced)
tree array_type;
/* ident */
- fields = build_decl (FIELD_DECL, NULL_TREE, get_gcov_unsigned_t ());
+ fields = build_decl (BUILTINS_LOCATION,
+ FIELD_DECL, NULL_TREE, get_gcov_unsigned_t ());
/* checksum */
- field = build_decl (FIELD_DECL, NULL_TREE, get_gcov_unsigned_t ());
+ field = build_decl (BUILTINS_LOCATION,
+ FIELD_DECL, NULL_TREE, get_gcov_unsigned_t ());
TREE_CHAIN (field) = fields;
fields = field;
array_type = build_array_type (get_gcov_unsigned_t (), array_type);
/* counters */
- field = build_decl (FIELD_DECL, NULL_TREE, array_type);
+ field = build_decl (BUILTINS_LOCATION,
+ FIELD_DECL, NULL_TREE, array_type);
TREE_CHAIN (field) = fields;
fields = field;
static tree
build_fn_info_value (const struct function_list *function, tree type)
{
- tree value = NULL_TREE;
tree fields = TYPE_FIELDS (type);
unsigned ix;
- tree array_value = NULL_TREE;
+ VEC(constructor_elt,gc) *v1 = NULL;
+ VEC(constructor_elt,gc) *v2 = NULL;
/* ident */
- value = tree_cons (fields, build_int_cstu (get_gcov_unsigned_t (),
- function->ident), value);
+ CONSTRUCTOR_APPEND_ELT (v1, fields,
+ build_int_cstu (get_gcov_unsigned_t (),
+ function->ident));
fields = TREE_CHAIN (fields);
/* checksum */
- value = tree_cons (fields, build_int_cstu (get_gcov_unsigned_t (),
- function->checksum), value);
+ CONSTRUCTOR_APPEND_ELT (v1, fields,
+ build_int_cstu (get_gcov_unsigned_t (),
+ function->checksum));
fields = TREE_CHAIN (fields);
/* counters */
for (ix = 0; ix != GCOV_COUNTERS; ix++)
if (prg_ctr_mask & (1 << ix))
- {
- tree counters = build_int_cstu (get_gcov_unsigned_t (),
- function->n_ctrs[ix]);
+ CONSTRUCTOR_APPEND_ELT (v2, NULL,
+ build_int_cstu (get_gcov_unsigned_t (),
+ function->n_ctrs[ix]));
- array_value = tree_cons (NULL_TREE, counters, array_value);
- }
+ CONSTRUCTOR_APPEND_ELT (v1, fields,
+ build_constructor (TREE_TYPE (fields), v2));
- /* FIXME: use build_constructor directly. */
- array_value = build_constructor_from_list (TREE_TYPE (fields),
- nreverse (array_value));
- value = tree_cons (fields, array_value, value);
-
- /* FIXME: use build_constructor directly. */
- value = build_constructor_from_list (type, nreverse (value));
-
- return value;
+ return build_constructor (type, v1);
}
/* Creates the gcov_ctr_info RECORD_TYPE. */
tree gcov_merge_fn_type;
/* counters */
- field = build_decl (FIELD_DECL, NULL_TREE, get_gcov_unsigned_t ());
+ field = build_decl (BUILTINS_LOCATION,
+ FIELD_DECL, NULL_TREE, get_gcov_unsigned_t ());
TREE_CHAIN (field) = fields;
fields = field;
/* values */
- field = build_decl (FIELD_DECL, NULL_TREE, gcov_ptr_type);
+ field = build_decl (BUILTINS_LOCATION,
+ FIELD_DECL, NULL_TREE, gcov_ptr_type);
TREE_CHAIN (field) = fields;
fields = field;
build_function_type_list (void_type_node,
gcov_ptr_type, get_gcov_unsigned_t (),
NULL_TREE);
- field = build_decl (FIELD_DECL, NULL_TREE,
+ field = build_decl (BUILTINS_LOCATION,
+ FIELD_DECL, NULL_TREE,
build_pointer_type (gcov_merge_fn_type));
TREE_CHAIN (field) = fields;
fields = field;
static tree
build_ctr_info_value (unsigned int counter, tree type)
{
- tree value = NULL_TREE;
tree fields = TYPE_FIELDS (type);
tree fn;
+ VEC(constructor_elt,gc) *v = NULL;
/* counters */
- value = tree_cons (fields,
- build_int_cstu (get_gcov_unsigned_t (),
- prg_n_ctrs[counter]),
- value);
+ CONSTRUCTOR_APPEND_ELT (v, fields,
+ build_int_cstu (get_gcov_unsigned_t (),
+ prg_n_ctrs[counter]));
fields = TREE_CHAIN (fields);
if (prg_n_ctrs[counter])
TREE_TYPE (tree_ctr_tables[counter]) = array_type;
DECL_SIZE (tree_ctr_tables[counter]) = TYPE_SIZE (array_type);
DECL_SIZE_UNIT (tree_ctr_tables[counter]) = TYPE_SIZE_UNIT (array_type);
- assemble_variable (tree_ctr_tables[counter], 0, 0, 0);
+ varpool_finalize_decl (tree_ctr_tables[counter]);
- value = tree_cons (fields,
- build1 (ADDR_EXPR, TREE_TYPE (fields),
- tree_ctr_tables[counter]),
- value);
+ CONSTRUCTOR_APPEND_ELT (v, fields,
+ build1 (ADDR_EXPR, TREE_TYPE (fields),
+ tree_ctr_tables[counter]));
}
else
- value = tree_cons (fields, null_pointer_node, value);
+ CONSTRUCTOR_APPEND_ELT (v, fields, null_pointer_node);
fields = TREE_CHAIN (fields);
- fn = build_decl (FUNCTION_DECL,
+ fn = build_decl (BUILTINS_LOCATION,
+ FUNCTION_DECL,
get_identifier (ctr_merge_functions[counter]),
TREE_TYPE (TREE_TYPE (fields)));
DECL_EXTERNAL (fn) = 1;
TREE_PUBLIC (fn) = 1;
DECL_ARTIFICIAL (fn) = 1;
TREE_NOTHROW (fn) = 1;
- value = tree_cons (fields,
- build1 (ADDR_EXPR, TREE_TYPE (fields), fn),
- value);
+ DECL_ASSEMBLER_NAME (fn); /* Initialize assembler name so we can stream out. */
+ CONSTRUCTOR_APPEND_ELT (v, fields, build1 (ADDR_EXPR, TREE_TYPE (fields), fn));
- /* FIXME: use build_constructor directly. */
- value = build_constructor_from_list (type, nreverse (value));
-
- return value;
+ return build_constructor (type, v);
}
/* Creates the gcov_info RECORD_TYPE and initializer for it. Returns a
tree fn_info_ptr_type;
tree ctr_info_type, ctr_info_ary_type, ctr_info_value = NULL_TREE;
tree field, fields = NULL_TREE;
- tree value = NULL_TREE;
tree filename_string;
int da_file_name_len;
unsigned n_fns;
const struct function_list *fn;
tree string_type;
+ VEC(constructor_elt,gc) *v1 = NULL;
+ VEC(constructor_elt,gc) *v2 = NULL;
/* Count the number of active counters. */
for (n_ctr_types = 0, ix = 0; ix != GCOV_COUNTERS; ix++)
const_type = build_qualified_type (type, TYPE_QUAL_CONST);
/* Version ident */
- field = build_decl (FIELD_DECL, NULL_TREE, get_gcov_unsigned_t ());
+ field = build_decl (BUILTINS_LOCATION,
+ FIELD_DECL, NULL_TREE, get_gcov_unsigned_t ());
TREE_CHAIN (field) = fields;
fields = field;
- value = tree_cons (field, build_int_cstu (TREE_TYPE (field), GCOV_VERSION),
- value);
+ CONSTRUCTOR_APPEND_ELT (v1, field,
+ build_int_cstu (TREE_TYPE (field), GCOV_VERSION));
/* next -- NULL */
- field = build_decl (FIELD_DECL, NULL_TREE, build_pointer_type (const_type));
+ field = build_decl (BUILTINS_LOCATION,
+ FIELD_DECL, NULL_TREE, build_pointer_type (const_type));
TREE_CHAIN (field) = fields;
fields = field;
- value = tree_cons (field, null_pointer_node, value);
+ CONSTRUCTOR_APPEND_ELT (v1, field, null_pointer_node);
/* stamp */
- field = build_decl (FIELD_DECL, NULL_TREE, get_gcov_unsigned_t ());
+ field = build_decl (BUILTINS_LOCATION,
+ FIELD_DECL, NULL_TREE, get_gcov_unsigned_t ());
TREE_CHAIN (field) = fields;
fields = field;
- value = tree_cons (field, build_int_cstu (TREE_TYPE (field), local_tick),
- value);
+ CONSTRUCTOR_APPEND_ELT (v1, field,
+ build_int_cstu (TREE_TYPE (field), local_tick));
/* Filename */
string_type = build_pointer_type (build_qualified_type (char_type_node,
TYPE_QUAL_CONST));
- field = build_decl (FIELD_DECL, NULL_TREE, string_type);
+ field = build_decl (BUILTINS_LOCATION,
+ FIELD_DECL, NULL_TREE, string_type);
TREE_CHAIN (field) = fields;
fields = field;
da_file_name_len = strlen (da_file_name);
TREE_TYPE (filename_string) = build_array_type
(char_type_node, build_index_type
(build_int_cst (NULL_TREE, da_file_name_len)));
- value = tree_cons (field, build1 (ADDR_EXPR, string_type, filename_string),
- value);
+ CONSTRUCTOR_APPEND_ELT (v1, field,
+ build1 (ADDR_EXPR, string_type, filename_string));
/* Build the fn_info type and initializer. */
fn_info_type = build_fn_info_type (n_ctr_types);
fn_info_ptr_type = build_pointer_type (build_qualified_type
(fn_info_type, TYPE_QUAL_CONST));
for (fn = functions_head, n_fns = 0; fn; fn = fn->next, n_fns++)
- fn_info_value = tree_cons (NULL_TREE,
- build_fn_info_value (fn, fn_info_type),
- fn_info_value);
+ CONSTRUCTOR_APPEND_ELT (v2, NULL_TREE,
+ build_fn_info_value (fn, fn_info_type));
+
if (n_fns)
{
tree array_type;
array_type = build_index_type (build_int_cst (NULL_TREE, n_fns - 1));
array_type = build_array_type (fn_info_type, array_type);
- /* FIXME: use build_constructor directly. */
- fn_info_value = build_constructor_from_list (array_type,
- nreverse (fn_info_value));
+ fn_info_value = build_constructor (array_type, v2);
fn_info_value = build1 (ADDR_EXPR, fn_info_ptr_type, fn_info_value);
}
else
fn_info_value = null_pointer_node;
/* number of functions */
- field = build_decl (FIELD_DECL, NULL_TREE, get_gcov_unsigned_t ());
+ field = build_decl (BUILTINS_LOCATION,
+ FIELD_DECL, NULL_TREE, get_gcov_unsigned_t ());
TREE_CHAIN (field) = fields;
fields = field;
- value = tree_cons (field,
- build_int_cstu (get_gcov_unsigned_t (), n_fns),
- value);
+ CONSTRUCTOR_APPEND_ELT (v1, field,
+ build_int_cstu (get_gcov_unsigned_t (), n_fns));
/* fn_info table */
- field = build_decl (FIELD_DECL, NULL_TREE, fn_info_ptr_type);
+ field = build_decl (BUILTINS_LOCATION,
+ FIELD_DECL, NULL_TREE, fn_info_ptr_type);
TREE_CHAIN (field) = fields;
fields = field;
- value = tree_cons (field, fn_info_value, value);
+ CONSTRUCTOR_APPEND_ELT (v1, field, fn_info_value);
/* counter_mask */
- field = build_decl (FIELD_DECL, NULL_TREE, get_gcov_unsigned_t ());
+ field = build_decl (BUILTINS_LOCATION,
+ FIELD_DECL, NULL_TREE, get_gcov_unsigned_t ());
TREE_CHAIN (field) = fields;
fields = field;
- value = tree_cons (field,
- build_int_cstu (get_gcov_unsigned_t (), prg_ctr_mask),
- value);
+ CONSTRUCTOR_APPEND_ELT (v1, field,
+ build_int_cstu (get_gcov_unsigned_t (),
+ prg_ctr_mask));
/* counters */
ctr_info_type = build_ctr_info_type ();
ctr_info_ary_type = build_index_type (build_int_cst (NULL_TREE,
n_ctr_types));
ctr_info_ary_type = build_array_type (ctr_info_type, ctr_info_ary_type);
+ v2 = NULL;
for (ix = 0; ix != GCOV_COUNTERS; ix++)
if (prg_ctr_mask & (1 << ix))
- ctr_info_value = tree_cons (NULL_TREE,
- build_ctr_info_value (ix, ctr_info_type),
- ctr_info_value);
- /* FIXME: use build_constructor directly. */
- ctr_info_value = build_constructor_from_list (ctr_info_ary_type,
- nreverse (ctr_info_value));
-
- field = build_decl (FIELD_DECL, NULL_TREE, ctr_info_ary_type);
+ CONSTRUCTOR_APPEND_ELT (v2, NULL_TREE,
+ build_ctr_info_value (ix, ctr_info_type));
+ ctr_info_value = build_constructor (ctr_info_ary_type, v2);
+
+ field = build_decl (BUILTINS_LOCATION,
+ FIELD_DECL, NULL_TREE, ctr_info_ary_type);
TREE_CHAIN (field) = fields;
fields = field;
- value = tree_cons (field, ctr_info_value, value);
+ CONSTRUCTOR_APPEND_ELT (v1, field, ctr_info_value);
finish_builtin_struct (type, "__gcov_info", fields, NULL_TREE);
- /* FIXME: use build_constructor directly. */
- value = build_constructor_from_list (type, nreverse (value));
-
- return value;
+ return build_constructor (type, v1);
}
/* Write out the structure which libgcov uses to locate all the
t = build_gcov_info ();
- gcov_info = build_decl (VAR_DECL, NULL_TREE, TREE_TYPE (t));
+ gcov_info = build_decl (BUILTINS_LOCATION,
+ VAR_DECL, NULL_TREE, TREE_TYPE (t));
TREE_STATIC (gcov_info) = 1;
ASM_GENERATE_INTERNAL_LABEL (name_buf, "LPBX", 0);
DECL_NAME (gcov_info) = get_identifier (name_buf);
DECL_INITIAL (gcov_info) = t;
/* Build structure. */
- assemble_variable (gcov_info, 0, 0, 0);
+ varpool_finalize_decl (gcov_info);
/* Build a decl for __gcov_init. */
t = build_pointer_type (TREE_TYPE (gcov_info));
t = build_function_type_list (void_type_node, t, NULL);
- t = build_decl (FUNCTION_DECL, get_identifier ("__gcov_init"), t);
+ t = build_decl (BUILTINS_LOCATION,
+ FUNCTION_DECL, get_identifier ("__gcov_init"), t);
TREE_PUBLIC (t) = 1;
DECL_EXTERNAL (t) = 1;
+ DECL_ASSEMBLER_NAME (t); /* Initialize assembler name so we can stream out. */
gcov_init = t;
/* Generate a call to __gcov_init(&gcov_info). */
int len = strlen (filename);
/* + 1 for extra '/', in case prefix doesn't end with /. */
int prefix_len;
-
+
if (profile_data_prefix == 0 && filename[0] != '/')
profile_data_prefix = getpwd ();
prefix_len = (profile_data_prefix) ? strlen (profile_data_prefix) + 1 : 0;
/* Name of da file. */
- da_file_name = XNEWVEC (char, len + strlen (GCOV_DATA_SUFFIX)
+ da_file_name = XNEWVEC (char, len + strlen (GCOV_DATA_SUFFIX)
+ prefix_len + 1);
if (profile_data_prefix)
OSDN Git Service
