From: sayle <sayle@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 21 Mar 2005 22:11:11 +0000 (+0000)
Subject: 	PR middle-end/20557
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5856543033ba7dc29cd9480a656e113389d413ff;p=thirdparty%2Fgcc.git

	PR middle-end/20557
	* bb-reorder.c (duplicate_computed_gotos): Use can_duplicate_block_p
	to determine whether a block can be duplicated, rather than test
	whether the block contains noncopyable insns ourselves.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@96836 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0e9becd8de2d..c0b07e314b02 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2005-03-21  Roger Sayle  <roger@eyesopen.com>
+
+	PR middle-end/20557
+	* bb-reorder.c (duplicate_computed_gotos): Use can_duplicate_block_p
+	to determine whether a block can be duplicated, rather than test
+	whether the block contains noncopyable insns ourselves.
+
 2005-03-21  Kazu Hirata  <kazu@cs.umass.edu>
 
 	* config/i860/i860.h (PREDICATE_CODES): Remove nonexistent
diff --git a/gcc/bb-reorder.c b/gcc/bb-reorder.c
index a94c9e4e4688..b7223d7d1aa7 100644
--- a/gcc/bb-reorder.c
+++ b/gcc/bb-reorder.c
@@ -2047,24 +2047,15 @@ duplicate_computed_gotos (void)
 	  int size = 0;
 
 	  FOR_BB_INSNS (bb, insn)
-	    {
-	      if (INSN_P (insn))
-		{
-		  /* If the insn isn't copyable, don't duplicate
-		     the block.  */
-		  if (targetm.cannot_copy_insn_p
-		      && targetm.cannot_copy_insn_p (insn))
-		    {
-		      size = max_size + 1;
-		      break;
-		    }
-		  size += get_attr_length (insn);
-		}
-	      if (size > max_size)
-		break;
-	    }
+	    if (INSN_P (insn))
+	      {
+		size += get_attr_length (insn);
+		if (size > max_size)
+		  break;
+	      }
 
-	  if (size <= max_size)
+	  if (size <= max_size
+	      && can_duplicate_block_p (bb))
 	    bitmap_set_bit (candidates, bb->index);
 	}
     }