ira-color.c (setup_left_conflict_sizes_p): Process all conflicting objects.

2012-03-29  Vladimir Makarov  <vmakarov@redhat.com>

	* ira-color.c (setup_left_conflict_sizes_p): Process all
	conflicting objects.

From-SVN: r185971

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b3222aade76eea70cb872aa9469ce32719552069..270d48bd7c1d3c2928e2d8d667343a8e140460e6 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-29  Vladimir Makarov  <vmakarov@redhat.com>
+
+       * ira-color.c (setup_left_conflict_sizes_p): Process all
+       conflicting objects.
+
 2012-03-29  Jakub Jelinek  <jakub@redhat.com>
 
        PR tree-optimization/52760

diff --git a/gcc/ira-color.c b/gcc/ira-color.c
index a01d050fbb7b6b67bf8cbddcd0a3d69fa6856a0b..45f5244412287be82ffc94d3a1e744322349b6df 100644 (file)
--- a/gcc/ira-color.c
+++ b/gcc/ira-color.c
@@ -821,7 +821,6 @@ setup_left_conflict_sizes_p (ira_allocno_t a)
   node_preorder_num = node->preorder_num;
   COPY_HARD_REG_SET (node_set, node->hard_regs->set);
   node_check_tick++;
-  curr_allocno_process++;
   for (k = 0; k < nobj; k++)
     {
       ira_object_t obj = ALLOCNO_OBJECT (a, k);
@@ -838,12 +837,10 @@ setup_left_conflict_sizes_p (ira_allocno_t a)
 
          conflict_data = ALLOCNO_COLOR_DATA (conflict_a);
          if (! ALLOCNO_COLOR_DATA (conflict_a)->in_graph_p
-             || conflict_data->last_process == curr_allocno_process
              || ! hard_reg_set_intersect_p (profitable_hard_regs,
                                             conflict_data
                                             ->profitable_hard_regs))
            continue;
-         conflict_data->last_process = curr_allocno_process;
          conflict_node = conflict_data->hard_regs_node;
          COPY_HARD_REG_SET (conflict_node_set, conflict_node->hard_regs->set);
          if (hard_reg_set_subset_p (node_set, conflict_node_set))