diff options
| -rw-r--r-- | gcc/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/ira-conflicts.c | 10 | ||||
| -rw-r--r-- | gcc/mcf.c | 11 |
3 files changed, 13 insertions, 16 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 4e401479587..c0883035d9d 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2012-07-08 Steven Bosscher <steven@gcc.gnu.org> + + * mcf.c: Do not include tm.h, tree.h, and langhooks.h. + (dump_fixup_graph): Use current_function_name. + (adjust_cfg_counts): Likewise. + * ira-conflicts.c: Do not include tree.h. + (ira_build_conflicts): Use REG_USERVAR_P instead of DECL_ARTIFICIAL. + 2012-07-08 Oleg Endo <olegendo@gcc.gnu.org> PR target/51244 diff --git a/gcc/ira-conflicts.c b/gcc/ira-conflicts.c index 1d740797ecf..583629bf5a0 100644 --- a/gcc/ira-conflicts.c +++ b/gcc/ira-conflicts.c @@ -25,7 +25,6 @@ along with GCC; see the file COPYING3. If not see #include "tm.h" #include "regs.h" #include "rtl.h" -#include "tree.h" /* For DECL_ARTIFICIAL and friends. */ #include "tm_p.h" #include "target.h" #include "flags.h" @@ -893,17 +892,12 @@ ira_build_conflicts (void) for (i = 0; i < n; i++) { ira_object_t obj = ALLOCNO_OBJECT (a, i); - reg_attrs *attrs = REG_ATTRS (regno_reg_rtx [ALLOCNO_REGNO (a)]); - tree decl; + rtx allocno_reg = regno_reg_rtx [ALLOCNO_REGNO (a)]; if ((! flag_caller_saves && ALLOCNO_CALLS_CROSSED_NUM (a) != 0) /* For debugging purposes don't put user defined variables in callee-clobbered registers. */ - || (optimize == 0 - && attrs != NULL - && (decl = attrs->decl) != NULL - && VAR_OR_FUNCTION_DECL_P (decl) - && ! DECL_ARTIFICIAL (decl))) + || (optimize == 0 && REG_USERVAR_P (allocno_reg))) { IOR_HARD_REG_SET (OBJECT_TOTAL_CONFLICT_HARD_REGS (obj), call_used_reg_set); diff --git a/gcc/mcf.c b/gcc/mcf.c index b6112100a31..d284fc5a4c2 100644 --- a/gcc/mcf.c +++ b/gcc/mcf.c @@ -46,13 +46,8 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" -#include "tm.h" #include "basic-block.h" -#include "tree.h" /* FIXME: Only for langhooks.h. */ -#include "langhooks.h" -#include "tree.h" #include "gcov-io.h" - #include "profile.h" /* CAP_INFINITY: Constant to represent infinite capacity. */ @@ -290,7 +285,7 @@ dump_fixup_graph (FILE *file, fixup_graph_type *fixup_graph, const char *msg) fnum_edges = fixup_graph->num_edges; fprintf (file, "\nDump fixup graph for %s(): %s.\n", - lang_hooks.decl_printable_name (current_function_decl, 2), msg); + current_function_name (), msg); fprintf (file, "There are %d vertices and %d edges. new_exit_index is %d.\n\n", fnum_vertices, fnum_edges, fixup_graph->new_exit_index); @@ -1280,8 +1275,8 @@ adjust_cfg_counts (fixup_graph_type *fixup_graph) if (dump_file) { fprintf (dump_file, "\nCheck %s() CFG flow conservation:\n", - lang_hooks.decl_printable_name (current_function_decl, 2)); - FOR_BB_BETWEEN (bb, ENTRY_BLOCK_PTR->next_bb, EXIT_BLOCK_PTR, next_bb) + current_function_name ()); + FOR_EACH_BB (bb) { if ((bb->count != sum_edge_counts (bb->preds)) || (bb->count != sum_edge_counts (bb->succs))) |