From: Jakub Jelinek <jakub@redhat.com>
Date: Mon, 6 Dec 2010 19:30:31 +0000 (+0100)
Subject: re PR bootstrap/46528 (profiledbootstrap failure)
X-Git-Tag: releases/gcc-4.6.0~2104
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1c8b9983c4ea83e9dc9cc8b9043ab7bd57e8d25b;p=thirdparty%2Fgcc.git

re PR bootstrap/46528 (profiledbootstrap failure)

	PR tree-optimization/46528
	PR debug/46338
	* profile.c (branch_prob): Make sure last is never set to a debug
	stmt.

From-SVN: r167515
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7412c201f7c4..48c60c039c32 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
 2010-12-06  Jakub Jelinek  <jakub@redhat.com>
 
+	PR tree-optimization/46528
+	PR debug/46338
+	* profile.c (branch_prob): Make sure last is never set to a debug
+	stmt.
+
 	PR debug/46771
 	* reginfo.c (init_subregs_of_mode): Don't call find_subregs_of_mode
 	on DEBUG_INSNs.
diff --git a/gcc/profile.c b/gcc/profile.c
index 9e8c2036ca1d..606e3b2e8664 100644
--- a/gcc/profile.c
+++ b/gcc/profile.c
@@ -936,11 +936,12 @@ branch_prob (void)
 	  /* It may happen that there are compiler generated statements
 	     without a locus at all.  Go through the basic block from the
 	     last to the first statement looking for a locus.  */
-	  for (gsi = gsi_last_bb (bb); !gsi_end_p (gsi); gsi_prev (&gsi))
+	  for (gsi = gsi_last_nondebug_bb (bb);
+	       !gsi_end_p (gsi);
+	       gsi_prev_nondebug (&gsi))
 	    {
 	      last = gsi_stmt (gsi);
-	      if (!is_gimple_debug (last)
-		  && gimple_has_location (last))
+	      if (gimple_has_location (last))
 		break;
 	    }