summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog3
-rw-r--r--gcc/predict.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bfbf234c34c..c74589c933f 100644
--- 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 183ae8fa7cb..41a9ee32eb8 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. */