diff options
| author | ktkachov <ktkachov@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-09-24 08:25:13 +0000 |
|---|---|---|
| committer | ktkachov <ktkachov@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-09-24 08:25:13 +0000 |
| commit | 100f989efbe490fea5f594226f720b5951e07ed3 (patch) | |
| tree | cdafb25aaf26090659e358891173245c121cbd7b | |
| parent | 842c7753947bbce821b21863a7f7404c0543028b (diff) | |
| download | gcc-100f989efbe490fea5f594226f720b5951e07ed3.tar.gz | |
[tree-inline][obvious] Delete redundant count_insns_seq
* tree-inline.h (count_insns_seq): Delete prototype.
(estimate_num_insns_seq): Define prototype.
* tree-inline.c (count_insns_seq): Delete.
(estimate_num_insns_seq): Remove static qualifier.
* tree-eh.c (decide_copy_try_finally): Replace use of count_insns_seq
with estimate_num_insns_seq.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@228075 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/tree-eh.c | 2 | ||||
| -rw-r--r-- | gcc/tree-inline.c | 17 | ||||
| -rw-r--r-- | gcc/tree-inline.h | 2 |
4 files changed, 13 insertions, 17 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 8481677df62..e3120f30d20 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2015-09-24 Kyrylo Tkachov <kyrylo.tkachov@arm.com> + + * tree-inline.h (count_insns_seq): Delete prototype. + (estimate_num_insns_seq): Define prototype. + * tree-inline.c (count_insns_seq): Delete. + (estimate_num_insns_seq): Remove static qualifier. + * tree-eh.c (decide_copy_try_finally): Replace use of count_insns_seq + with estimate_num_insns_seq. + 2015-09-24 Richard Biener <rguenther@suse.de> * tree-ssa-sccvn.h (vn_reference_op_struct): Add clique and base diff --git a/gcc/tree-eh.c b/gcc/tree-eh.c index c19d2bea748..cb1f08a76c4 100644 --- a/gcc/tree-eh.c +++ b/gcc/tree-eh.c @@ -1621,7 +1621,7 @@ decide_copy_try_finally (int ndests, bool may_throw, gimple_seq finally) } /* Finally estimate N times, plus N gotos. */ - f_estimate = count_insns_seq (finally, &eni_size_weights); + f_estimate = estimate_num_insns_seq (finally, &eni_size_weights); f_estimate = (f_estimate + 1) * ndests; /* Switch statement (cost 10), N variable assignments, N gotos. */ diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c index b7874668fb3..ac9586ecdbf 100644 --- a/gcc/tree-inline.c +++ b/gcc/tree-inline.c @@ -3972,8 +3972,8 @@ estimate_operator_cost (enum tree_code code, eni_weights *weights, the statements in the statement sequence STMTS. WEIGHTS contains weights attributed to various constructs. */ -static -int estimate_num_insns_seq (gimple_seq stmts, eni_weights *weights) +int +estimate_num_insns_seq (gimple_seq stmts, eni_weights *weights) { int cost; gimple_stmt_iterator gsi; @@ -4262,19 +4262,6 @@ init_inline_once (void) eni_time_weights.return_cost = 2; } -/* Estimate the number of instructions in a gimple_seq. */ - -int -count_insns_seq (gimple_seq seq, eni_weights *weights) -{ - gimple_stmt_iterator gsi; - int n = 0; - for (gsi = gsi_start (seq); !gsi_end_p (gsi); gsi_next (&gsi)) - n += estimate_num_insns (gsi_stmt (gsi), weights); - - return n; -} - /* Install new lexical TREE_BLOCK underneath 'current_block'. */ diff --git a/gcc/tree-inline.h b/gcc/tree-inline.h index f0e5436dd4e..b8fb2a2a38c 100644 --- a/gcc/tree-inline.h +++ b/gcc/tree-inline.h @@ -207,7 +207,7 @@ tree copy_decl_no_change (tree decl, copy_body_data *id); int estimate_move_cost (tree type, bool); int estimate_num_insns (gimple *, eni_weights *); int estimate_num_insns_fn (tree, eni_weights *); -int count_insns_seq (gimple_seq, eni_weights *); +int estimate_num_insns_seq (gimple_seq, eni_weights *); bool tree_versionable_function_p (tree); extern tree remap_decl (tree decl, copy_body_data *id); extern tree remap_type (tree type, copy_body_data *id); |