diff options
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/tree-ssa-threadupdate.c | 28 |
2 files changed, 21 insertions, 13 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 16817d4..9dc3188 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2014-10-15 Teresa Johnson <tejohnson@google.com> + + PR bootstrap/63432 + * tree-ssa-threadupdate.c (recompute_probabilities): Better + overflow checking. + 2014-10-15 Renlin Li <renlin.li@arm.com> * config/aarch64/aarch64.h (TARGET_CPU_CPP_BUILTINS): Define diff --git a/gcc/tree-ssa-threadupdate.c b/gcc/tree-ssa-threadupdate.c index 125f6f8..2be3ab2 100644 --- a/gcc/tree-ssa-threadupdate.c +++ b/gcc/tree-ssa-threadupdate.c @@ -871,21 +871,23 @@ recompute_probabilities (basic_block bb) edge_iterator ei; FOR_EACH_EDGE (esucc, ei, bb->succs) { - if (bb->count) + if (!bb->count) + continue; + + /* Prevent overflow computation due to insane profiles. */ + if (esucc->count < bb->count) esucc->probability = GCOV_COMPUTE_SCALE (esucc->count, bb->count); - if (esucc->probability > REG_BR_PROB_BASE) - { - /* Can happen with missing/guessed probabilities, since we - may determine that more is flowing along duplicated - path than joiner succ probabilities allowed. - Counts and freqs will be insane after jump threading, - at least make sure probability is sane or we will - get a flow verification error. - Not much we can do to make counts/freqs sane without - redoing the profile estimation. */ - esucc->probability = REG_BR_PROB_BASE; - } + else + /* Can happen with missing/guessed probabilities, since we + may determine that more is flowing along duplicated + path than joiner succ probabilities allowed. + Counts and freqs will be insane after jump threading, + at least make sure probability is sane or we will + get a flow verification error. + Not much we can do to make counts/freqs sane without + redoing the profile estimation. */ + esucc->probability = REG_BR_PROB_BASE; } } |