diff options
| author | Bernd Schmidt <bernds@codesourcery.com> | 2010-07-14 01:56:32 +0000 |
|---|---|---|
| committer | Bernd Schmidt <bernds@gcc.gnu.org> | 2010-07-14 01:56:32 +0000 |
| commit | fa86d337f691f622a4ff946b8b8e87deffb72f7f (patch) | |
| tree | bf075ab760c9643d5d25be8ef2552f0bf9631b4a /gcc/ira-conflicts.c | |
| parent | 9140d27b2a52d6f3f0422c3391fbce84efad4442 (diff) | |
| download | gcc-fa86d337f691f622a4ff946b8b8e87deffb72f7f.tar.gz | |
ira-int.h (ira_object_conflict_iterator): Rename from ira_allocno_conflict_iterator.
* ira-int.h (ira_object_conflict_iterator): Rename from
ira_allocno_conflict_iterator.
(ira_object_conflict_iter_init): Rename from
ira_allocno_conflict_iter_init, second arg changed to
* ira.c (check_allocation): Use FOR_EACH_OBJECT_CONFLICT rather than
FOR_EACH_ALLOCNO_CONFLICT.
* ira-color.c (assign_hard_reg, push_allocno_to_stack)
setup_allocno_left_conflicts_size, coalesced_allocno_conflict_p,
ira_reassign_conflict_allocnos, ira_reassign_pseudos): Likewise.
* ira-conflicts.c (print_allocno_conflicts): Likewise.
From-SVN: r162168
Diffstat (limited to 'gcc/ira-conflicts.c')
| -rw-r--r-- | gcc/ira-conflicts.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gcc/ira-conflicts.c b/gcc/ira-conflicts.c index fc2e8426608..c75069da5c4 100644 --- a/gcc/ira-conflicts.c +++ b/gcc/ira-conflicts.c @@ -700,9 +700,8 @@ static void print_allocno_conflicts (FILE * file, bool reg_p, ira_allocno_t a) { HARD_REG_SET conflicting_hard_regs; - ira_object_t obj; - ira_allocno_t conflict_a; - ira_allocno_conflict_iterator aci; + ira_object_t obj, conflict_obj; + ira_object_conflict_iterator oci; basic_block bb; if (reg_p) @@ -720,8 +719,9 @@ print_allocno_conflicts (FILE * file, bool reg_p, ira_allocno_t a) fputs (" conflicts:", file); obj = ALLOCNO_OBJECT (a); if (OBJECT_CONFLICT_ARRAY (obj) != NULL) - FOR_EACH_ALLOCNO_CONFLICT (a, conflict_a, aci) + FOR_EACH_OBJECT_CONFLICT (obj, conflict_obj, oci) { + ira_allocno_t conflict_a = OBJECT_ALLOCNO (conflict_obj); if (reg_p) fprintf (file, " r%d,", ALLOCNO_REGNO (conflict_a)); else |