From: Tom de Vries <tom@codesourcery.com>
Date: Tue, 15 Nov 2011 23:04:39 +0000 (+0000)
Subject: tree-ssa-tail-merge.c (replace_block_by): Add frequency of bb2 to bb1.
X-Git-Tag: releases/gcc-4.7.0~2171
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fa405d7bbec7228ad003a90fb9cc0266cd187db3;p=thirdparty%2Fgcc.git

tree-ssa-tail-merge.c (replace_block_by): Add frequency of bb2 to bb1.

2011-11-16  Tom de Vries  <tom@codesourcery.com>

	* tree-ssa-tail-merge.c (replace_block_by): Add frequency of bb2 to bb1.

From-SVN: r181392
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a7fb9ea48a64..01694e2b94b2 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2011-11-16  Tom de Vries  <tom@codesourcery.com>
+
+	* tree-ssa-tail-merge.c (replace_block_by): Add frequency of bb2 to bb1.
+
 2011-11-16  Alan Modra  <amodra@gmail.com>
 
 	PR rtl-optimization/51051
diff --git a/gcc/tree-ssa-tail-merge.c b/gcc/tree-ssa-tail-merge.c
index 39a3aabb8421..a501b0778a20 100644
--- a/gcc/tree-ssa-tail-merge.c
+++ b/gcc/tree-ssa-tail-merge.c
@@ -1396,6 +1396,11 @@ replace_block_by (basic_block bb1, basic_block bb2)
 		   pred_edge, UNKNOWN_LOCATION);
     }
 
+  bb2->frequency += bb1->frequency;
+  if (bb2->frequency > BB_FREQ_MAX)
+    bb2->frequency = BB_FREQ_MAX;
+  bb1->frequency = 0;
+
   /* Do updates that use bb1, before deleting bb1.  */
   release_last_vdef (bb1);
   same_succ_flush_bb (bb1);