From d79318b79c4f0cd65a772a0175a6d6fc88be5e72 Mon Sep 17 00:00:00 2001
From: Vladimir Makarov <vmakarov@redhat.com>
Date: Thu, 29 Mar 2012 17:23:39 +0000
Subject: [PATCH] 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
---
gcc/ChangeLog | 5 +++++
gcc/ira-color.c | 3 ---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b3222aade76e..270d48bd7c1d 100644
--- 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 a01d050fbb7b..45f524441228 100644
--- 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))
--
GitLab