2011-03-31 Vladimir Makarov <vmakarov@redhat.com>

	PR rtl-optimization/48381
	* ira-color.c (assign_hard_reg): Use hard reg set intersection
	instead of ira_class_hard_reg_index for calculating conflicting
	hard registers.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a0ba31a..3fe316c 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2011-03-31  Vladimir Makarov  <vmakarov@redhat.com>
+
+       PR rtl-optimization/48381
+       * ira-color.c (assign_hard_reg): Use hard reg set intersection
+       instead of ira_class_hard_reg_index for calculating conflicting
+       hard registers.
+
 2011-03-31  Steven Bosscher  <steven@gcc.gnu.org>
 
        * cprop.c: Clean up hash table building.

diff --git a/gcc/ira-color.c b/gcc/ira-color.c
index 6c09dc3..8fa3393 100644 (file)
--- a/gcc/ira-color.c
+++ b/gcc/ira-color.c
@@ -1620,7 +1620,9 @@ assign_hard_reg (ira_allocno_t a, bool retry_p)
            {
              hard_regno = ALLOCNO_HARD_REGNO (conflict_a);
              if (hard_regno >= 0
-                 && ira_class_hard_reg_index[aclass][hard_regno] >= 0)
+                 && (ira_hard_reg_set_intersection_p
+                     (hard_regno, ALLOCNO_MODE (conflict_a),
+                      reg_class_contents[aclass])))
                {
                  int n_objects = ALLOCNO_NUM_OBJECTS (conflict_a);
                  int conflict_nregs;