2010-03-23 Vladimir Makarov <vmakarov@redhat.com>

	PR rtl-optimization/43413
	* ira-color.c (setup_allocno_available_regs_num): Count prohibited
	hard regs too.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 656f9c8..bd91922 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2010-03-23  Vladimir Makarov  <vmakarov@redhat.com>
+
+       PR rtl-optimization/43413
+       * ira-color.c (setup_allocno_available_regs_num): Count prohibited
+       hard regs too.
+
 2010-03-22  James E. Wilson  <wilson@codesourcery.com>
 
        PR target/43348

diff --git a/gcc/ira-color.c b/gcc/ira-color.c
index 4ba7112..70a1d8f 100644 (file)
--- a/gcc/ira-color.c
+++ b/gcc/ira-color.c
@@ -1354,7 +1354,8 @@ pop_allocnos_from_stack (void)
 static void
 setup_allocno_available_regs_num (ira_allocno_t allocno)
 {
-  int i, n, hard_regs_num;
+  int i, n, hard_regs_num, hard_regno;
+  enum machine_mode mode;
   enum reg_class cover_class;
   ira_allocno_t a;
   HARD_REG_SET temp_set;
@@ -1373,9 +1374,15 @@ setup_allocno_available_regs_num (ira_allocno_t allocno)
       if (a == allocno)
        break;
     }
+  mode = ALLOCNO_MODE (allocno);
   for (n = 0, i = hard_regs_num - 1; i >= 0; i--)
-    if (TEST_HARD_REG_BIT (temp_set, ira_class_hard_regs[cover_class][i]))
-      n++;
+    {
+      hard_regno = ira_class_hard_regs[cover_class][i];
+      if (TEST_HARD_REG_BIT (temp_set, hard_regno)
+         || TEST_HARD_REG_BIT (prohibited_class_mode_regs[cover_class][mode],
+                               hard_regno))
+       n++;
+    }
   if (internal_flag_ira_verbose > 2 && n > 0 && ira_dump_file != NULL)
     fprintf (ira_dump_file, "    Reg %d of %s has %d regs less\n",
             ALLOCNO_REGNO (allocno), reg_class_names[cover_class], n);