profile.c (rest_of_handle_branch_prob): Fix handling of estimation after RTL profiling.

	* profile.c (rest_of_handle_branch_prob): Fix handling of estimation
	after RTL profiling.

From-SVN: r102069

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bbb9248bb5b6958cd262afd9f04463758af89c27..25cc46d351daee1675b9c6315394e71b3696e759 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-16  Jan Hubicka  <jh@suse.cz>
+
+       * profile.c (rest_of_handle_branch_prob): Fix handling of estimation
+       after RTL profiling.
+
 2005-07-11  Andrew Pinski  <pinskia@physics.uc.edu>
 
        PR middle-end/22398

diff --git a/gcc/profile.c b/gcc/profile.c
index 054f0771f47e0442c89aac4f754e4bad39163fa1..1e0c3b87d93a150f989f6c2e92ad6d9fbc56d70f 100644 (file)
--- a/gcc/profile.c
+++ b/gcc/profile.c
@@ -1381,7 +1381,9 @@ rest_of_handle_branch_prob (void)
     flow_loops_dump (&loops, dump_file, NULL, 0);
 
   /* Estimate using heuristics if no profiling info is available.  */
-  if (flag_guess_branch_prob && profile_status == PROFILE_ABSENT)
+  if (flag_guess_branch_prob
+      && (profile_status == PROFILE_ABSENT
+          || (profile_status == PROFILE_READ && !flag_tree_based_profiling)))
     estimate_probability (&loops);
 
   flow_loops_free (&loops);