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

gcc/ChangeLog

 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.

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.  */