From 3e196fa9b9e3d7ce3b23e11f6517a6439506a2bc Mon Sep 17 00:00:00 2001 From: Jan Hubicka Date: Sun, 31 Aug 2008 20:08:31 +0200 Subject: [PATCH] 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 | 3 +++ gcc/predict.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index bfbf234c34c8..c74589c933f6 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,8 @@ 2008-08-31 Jan Hubicka + * 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 183ae8fa7cb6..41a9ee32eb82 100644 --- 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. */