tree-cfg.c (gimple_merge_blocks): Updates bb count with max count.

2014-05-16  Dehao Chen  <dehao@google.com>

	* tree-cfg.c (gimple_merge_blocks): Updates bb count with max count.

From-SVN: r210538

gcc/ChangeLog

+2014-05-16  Dehao Chen  <dehao@google.com>
+
+	* tree-cfg.c (gimple_merge_blocks): Updates bb count with max count.
+
 2014-05-16  Oleg Endo  <olegendo@gcc.gnu.org>
 
 	PR target/54089

gcc/tree-cfg.c

@@ -1877,6 +1877,12 @@ gimple_merge_blocks (basic_block a, basic_block b)
 	}
     }
 
+  /* When merging two BBs, if their counts are different, the larger count
+     is selected as the new bb count. This is to handle inconsistent
+     profiles.  */
+  a->count = MAX (a->count, b->count);
+  a->frequency = MAX (a->frequency, b->frequency);
+
   /* Merge the sequences.  */
   last = gsi_last_bb (a);
   gsi_insert_seq_after (&last, bb_seq (b), GSI_NEW_STMT);