From 751e69d51ed74d9504666f843bfaa105c8689f26 Mon Sep 17 00:00:00 2001 From: vmakarov Date: Mon, 18 Jun 2012 18:34:01 +0000 Subject: [PATCH] 2012-06-18 Vladimir Makarov PR rtl-optimization/53700 Backport from mainline 2012-03-29 Vladimir Makarov * ira-color.c (setup_left_conflict_sizes_p): Process all conflicting objects. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_7-branch@188750 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 12 +++++++++++- gcc/ira-color.c | 3 --- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 51b2b13a7b3..14312f81e8a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,6 +1,16 @@ +2012-06-18 Vladimir Makarov + + PR rtl-optimization/53700 + + Backport from mainline + 2012-03-29 Vladimir Makarov + + * ira-color.c (setup_left_conflict_sizes_p): Process all + conflicting objects. + 2012-06-18 Venkataramanan Kumar - Backport from mainline + Backport from mainline 2012-05-09 Uros Bizjak PR target/52908 diff --git a/gcc/ira-color.c b/gcc/ira-color.c index a01d050fbb7..45f52444122 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)) -- 2.11.0