From a6a70dcad2d9f329fffb4d5eb39b02699df2e7ed Mon Sep 17 00:00:00 2001 From: Jan Hubicka Date: Sat, 21 Jan 2017 20:36:01 +0100 Subject: [PATCH] re PR lto/78407 (LTO breaks separate overriding of symbol aliases) PR lto/78407 * cfg.c (update_bb_profile_for_threading): Fix updating of probablity. From-SVN: r244749 --- gcc/ChangeLog | 5 +++++ gcc/cfg.c | 9 +++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 95c54e5b82e..2980e46f4b8 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2017-01-21 Jan Hubicka + + PR lto/78407 + * cfg.c (update_bb_profile_for_threading): Fix updating of probablity. + 2017-01-21 Bernd Schmidt rtl-optimization/79125 diff --git a/gcc/cfg.c b/gcc/cfg.c index 97cc755cccd..1bcf9b8227f 100644 --- a/gcc/cfg.c +++ b/gcc/cfg.c @@ -869,6 +869,10 @@ update_bb_profile_for_threading (basic_block bb, int edge_frequency, bb->count = 0; } + bb->frequency -= edge_frequency; + if (bb->frequency < 0) + bb->frequency = 0; + /* Compute the probability of TAKEN_EDGE being reached via threaded edge. Watch for overflows. */ if (bb->frequency) @@ -882,15 +886,12 @@ update_bb_profile_for_threading (basic_block bb, int edge_frequency, "%i->%i too small (it is %i, should be %i).\n", taken_edge->src->index, taken_edge->dest->index, taken_edge->probability, prob); - prob = taken_edge->probability; + prob = taken_edge->probability * 6 / 8; } /* Now rescale the probabilities. */ taken_edge->probability -= prob; prob = REG_BR_PROB_BASE - prob; - bb->frequency -= edge_frequency; - if (bb->frequency < 0) - bb->frequency = 0; if (prob <= 0) { if (dump_file) -- 2.30.2