diff options
| author | hubicka <hubicka@138bc75d-0d04-0410-961f-82ee72b054a4> | 2017-07-16 16:36:48 +0000 |
|---|---|---|
| committer | hubicka <hubicka@138bc75d-0d04-0410-961f-82ee72b054a4> | 2017-07-16 16:36:48 +0000 |
| commit | 5d31e485eb46f39a97c1c572ab44f7dd2d65eea1 (patch) | |
| tree | eed7bdd0d029b5679e30cd5b47a3f2138e20e1bd | |
| parent | 6cd92c8445e64539a6f830a5db41a0440b9ba366 (diff) | |
| download | gcc-5d31e485eb46f39a97c1c572ab44f7dd2d65eea1.tar.gz | |
* cgraph.c (cgraph_edge::redirect_call_stmt_to_caller): Cleanup.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@250243 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cgraph.c | 22 |
2 files changed, 15 insertions, 11 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index ccceea51091..c6491ffa5b2 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,9 @@ 2017-07-16 Jan Hubicka <hubicka@ucw.cz> + * cgraph.c (cgraph_edge::redirect_call_stmt_to_caller): Cleanup. + +2017-07-16 Jan Hubicka <hubicka@ucw.cz> + * cfgloopmanip.c (scale_loop_profile): Avoid use of REG_BR_PROB_BASE fixpoint arithmetics. diff --git a/gcc/cgraph.c b/gcc/cgraph.c index 6711aeb828e..2f820f1bb67 100644 --- a/gcc/cgraph.c +++ b/gcc/cgraph.c @@ -1315,19 +1315,19 @@ cgraph_edge::redirect_call_stmt_to_callee (void) } gcc_assert (e2->speculative); push_cfun (DECL_STRUCT_FUNCTION (e->caller->decl)); + + profile_probability prob = e->count.probability_in (e->count + + e2->count); + if (prob.initialized_p ()) + ; + else if (e->frequency || e2->frequency) + prob = profile_probability::probability_in_gcov_type + (e->frequency, e->frequency + e2->frequency).guessed (); + else + prob = profile_probability::even (); new_stmt = gimple_ic (e->call_stmt, dyn_cast<cgraph_node *> (ref->referred), - /* FIXME: cleanup. */ - profile_probability::from_reg_br_prob_base ( - e->count > profile_count::zero () - || e2->count > profile_count::zero () - ? e->count.probability_in - (e->count + e2->count).to_reg_br_prob_base () - : e->frequency || e2->frequency - ? RDIV (e->frequency * REG_BR_PROB_BASE, - e->frequency + e2->frequency) - : REG_BR_PROB_BASE / 2), - e->count, e->count + e2->count); + prob, e->count, e->count + e2->count); e->speculative = false; e->caller->set_call_stmt_including_clones (e->call_stmt, new_stmt, false); |