From 32721b2cb51a60291f8a3bbc0d26ffaa14ee63cf Mon Sep 17 00:00:00 2001 From: Zhouyi Zhou Date: Tue, 10 Feb 2015 01:44:18 +0000 Subject: [PATCH] ira-color.c (setup_left_conflict_sizes_p): Simplify initialization/assignment of conflict_size. * ira-color.c (setup_left_conflict_sizes_p): Simplify initialization/assignment of conflict_size. From-SVN: r220560 --- gcc/ChangeLog | 5 +++++ gcc/ira-color.c | 7 +++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 47574709f40..83bc9112535 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2015-02-09 Zhouyi Zhou + + * ira-color.c (setup_left_conflict_sizes_p): Simplify + initialization/assignment of conflict_size. + 2015-02-09 Jan Hubicka PR ipa/64978 diff --git a/gcc/ira-color.c b/gcc/ira-color.c index d04be29ff4f..b77ff69e645 100644 --- a/gcc/ira-color.c +++ b/gcc/ira-color.c @@ -858,7 +858,6 @@ setup_left_conflict_sizes_p (ira_allocno_t a) HARD_REG_SET node_set; nobj = ALLOCNO_NUM_OBJECTS (a); - conflict_size = 0; data = ALLOCNO_COLOR_DATA (a); subnodes = allocno_hard_regs_subnodes + data->hard_regs_subnodes_start; COPY_HARD_REG_SET (profitable_hard_regs, data->profitable_hard_regs); @@ -959,9 +958,9 @@ setup_left_conflict_sizes_p (ira_allocno_t a) } left_conflict_subnodes_size = subnodes[0].left_conflict_subnodes_size; conflict_size - += (left_conflict_subnodes_size - + MIN (subnodes[0].max_node_impact - left_conflict_subnodes_size, - subnodes[0].left_conflict_size)); + = (left_conflict_subnodes_size + + MIN (subnodes[0].max_node_impact - left_conflict_subnodes_size, + subnodes[0].left_conflict_size)); conflict_size += ira_reg_class_max_nregs[ALLOCNO_CLASS (a)][ALLOCNO_MODE (a)]; data->colorable_p = conflict_size <= data->available_regs_num; return data->colorable_p; -- 2.30.2