diff options
| author | Guozhi Wei <carrot@google.com> | 2013-05-04 01:26:52 +0000 |
|---|---|---|
| committer | Wei Guozhi <carrot@gcc.gnu.org> | 2013-05-04 01:26:52 +0000 |
| commit | d6d7eee17485d8e2b9ca4a3cc072defbab21ed55 (patch) | |
| tree | 05c685ce86de0cc60a8cd32359155af10f9bfaaf | |
| parent | 898ca809f55faec456713a0bef9861e2ccd8d3a0 (diff) | |
| download | gcc-d6d7eee17485d8e2b9ca4a3cc072defbab21ed55.zip gcc-d6d7eee17485d8e2b9ca4a3cc072defbab21ed55.tar.gz gcc-d6d7eee17485d8e2b9ca4a3cc072defbab21ed55.tar.bz2 | |
coverage.c (coverage_obj_init): Move the construction of gcov constructor to
* coverage.c (coverage_obj_init): Move the construction of gcov
constructor to
(build_init_ctor): here.
From-SVN: r198591
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/coverage.c | 46 |
2 files changed, 34 insertions, 18 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f1d6fb4..bb1a3bb 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2013-05-03 Guozhi Wei <carrot@google.com> + + * coverage.c (coverage_obj_init): Move the construction of gcov + constructor to + (build_init_ctor): here. + 2013-05-03 Bill Schmidt <wschmidt@linux.vnet.ibm.com> * gimple-ssa-strength-reduction.c (cand_kind): Add CAND_PHI. diff --git a/gcc/coverage.c b/gcc/coverage.c index bc6a46f..7c395f4 100644 --- a/gcc/coverage.c +++ b/gcc/coverage.c @@ -967,6 +967,32 @@ build_info (tree info_type, tree fn_ary) return build_constructor (info_type, v1); } +/* Generate the constructor function to call __gcov_init. */ + +static void +build_init_ctor (tree gcov_info_type) +{ + tree ctor, stmt, init_fn; + + /* Build a decl for __gcov_init. */ + init_fn = build_pointer_type (gcov_info_type); + init_fn = build_function_type_list (void_type_node, init_fn, NULL); + init_fn = build_decl (BUILTINS_LOCATION, FUNCTION_DECL, + get_identifier ("__gcov_init"), init_fn); + TREE_PUBLIC (init_fn) = 1; + DECL_EXTERNAL (init_fn) = 1; + DECL_ASSEMBLER_NAME (init_fn); + + /* Generate a call to __gcov_init(&gcov_info). */ + ctor = NULL; + stmt = build_fold_addr_expr (gcov_info_var); + stmt = build_call_expr (init_fn, 1, stmt); + append_to_statement_list (stmt, &ctor); + + /* Generate a constructor to run it. */ + cgraph_build_static_cdtor ('I', ctor, DEFAULT_INIT_PRIORITY); +} + /* Create the gcov_info types and object. Generate the constructor function to call __gcov_init. Does not generate the initializer for the object. Returns TRUE if coverage data is being emitted. */ @@ -974,7 +1000,7 @@ build_info (tree info_type, tree fn_ary) static bool coverage_obj_init (void) { - tree gcov_info_type, ctor, stmt, init_fn; + tree gcov_info_type; unsigned n_counters = 0; unsigned ix; struct coverage_data *fn; @@ -1020,23 +1046,7 @@ coverage_obj_init (void) ASM_GENERATE_INTERNAL_LABEL (name_buf, "LPBX", 0); DECL_NAME (gcov_info_var) = get_identifier (name_buf); - /* Build a decl for __gcov_init. */ - init_fn = build_pointer_type (gcov_info_type); - init_fn = build_function_type_list (void_type_node, init_fn, NULL); - init_fn = build_decl (BUILTINS_LOCATION, FUNCTION_DECL, - get_identifier ("__gcov_init"), init_fn); - TREE_PUBLIC (init_fn) = 1; - DECL_EXTERNAL (init_fn) = 1; - DECL_ASSEMBLER_NAME (init_fn); - - /* Generate a call to __gcov_init(&gcov_info). */ - ctor = NULL; - stmt = build_fold_addr_expr (gcov_info_var); - stmt = build_call_expr (init_fn, 1, stmt); - append_to_statement_list (stmt, &ctor); - - /* Generate a constructor to run it. */ - cgraph_build_static_cdtor ('I', ctor, DEFAULT_INIT_PRIORITY); + build_init_ctor (gcov_info_type); return true; } |