predict.c (maybe_hot_bb_p, [...]): Previous commit mistakely had old version of patch.

	* predict.c (maybe_hot_bb_p, maybe_hot_edge_p): Previous commit
	mistakely had old version of patch.

From-SVN: r139836

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bfbf234c34c85c9a40816bf86b2792a3969e0b8f..c74589c933f610753e17653fbf4c39d12b71913f 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,8 @@
 2008-08-31  Jan Hubicka  <jh@suse.cz>
 
+       * predict.c (maybe_hot_bb_p, maybe_hot_edge_p): Previous commit
+       mistakely had old version of patch.
+
        * ipa-cp.c (ipcp_need_original_clone_p): Remove.
        (ipcp_estimate_growth): New.
        (ipcp_insert_stage): Use ipcp_estimate_growth.

diff --git a/gcc/predict.c b/gcc/predict.c
index 183ae8fa7cb6ad64b04df55ba0a3d01e4247d8a8..41a9ee32eb8208dbc409661d164d88ca5c4027b0 100644 (file)
--- a/gcc/predict.c
+++ b/gcc/predict.c
@@ -148,7 +148,7 @@ maybe_hot_count_p (gcov_type count)
 bool
 maybe_hot_bb_p (const_basic_block bb)
 {
-  return maybe_hot_count_p (bb->count) || maybe_hot_frequency_p (bb->frequency);
+  return maybe_hot_count_p (bb->count) && maybe_hot_frequency_p (bb->frequency);
 }
 
 /* Return true if the call can be hot.  */
@@ -178,7 +178,7 @@ cgraph_maybe_hot_edge_p (struct cgraph_edge *edge)
 bool
 maybe_hot_edge_p (edge e)
 {
-  return maybe_hot_count_p (e->count) || maybe_hot_frequency_p (EDGE_FREQUENCY (e));
+  return maybe_hot_count_p (e->count) && maybe_hot_frequency_p (EDGE_FREQUENCY (e));
 }
 
 /* Return true in case BB is probably never executed.  */