diff options
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/tree-ssa-tail-merge.c | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 17089b0..a45d72b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2012-11-08 Christian Bruel <christian.bruel@st.com> + + * tree-ssa-tail-merge.c (replace_block_by): Update bb2 profile count. + Do not reset dead bb1->frequency. + 2012-11-08 Steven Bosscher <steven@gcc.gnu.org> PR tree-optimization/55191 @@ -50,6 +55,7 @@ * ipa-prop.c (determine_known_aggregate_parts): Skip writes to different declarations when tracking writes to a declaration. +>>>>>>> .r193349 2012-11-07 David S. Miller <davem@davemloft.net> * config/sparc/constraints.md ("U"): Document, in detail, diff --git a/gcc/tree-ssa-tail-merge.c b/gcc/tree-ssa-tail-merge.c index 1521bad..660b68c 100644 --- a/gcc/tree-ssa-tail-merge.c +++ b/gcc/tree-ssa-tail-merge.c @@ -1488,7 +1488,8 @@ replace_block_by (basic_block bb1, basic_block bb2) bb2->frequency += bb1->frequency; if (bb2->frequency > BB_FREQ_MAX) bb2->frequency = BB_FREQ_MAX; - bb1->frequency = 0; + + bb2->count += bb1->count; /* Do updates that use bb1, before deleting bb1. */ release_last_vdef (bb1); |