From b4e7b9fefd966f3654c990f2f84f98d81470e755 Mon Sep 17 00:00:00 2001 From: ian Date: Thu, 6 Sep 2007 05:59:15 +0000 Subject: [PATCH] * tree-pretty-print.c (dump_decl_name): Cast LABEL_DECL_UID to int when printing. (dump_generic_node): Likewise. * print-rtl.c (print_decl_name): Likewise. * print-tree.c (print_node_brief): Likewise. (print_node): Likewise. * Makefile.in (RTL_BASE_H): Add alias.h. (TREE_H): Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@128175 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 11 +++++++++++ gcc/Makefile.in | 4 ++-- gcc/print-rtl.c | 2 +- gcc/print-tree.c | 4 ++-- gcc/tree-pretty-print.c | 6 ++---- 5 files changed, 18 insertions(+), 9 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index cd17c1f6019..c80a635aa00 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,14 @@ +2007-09-05 Ian Lance Taylor + + * tree-pretty-print.c (dump_decl_name): Cast LABEL_DECL_UID to int + when printing. + (dump_generic_node): Likewise. + * print-rtl.c (print_decl_name): Likewise. + * print-tree.c (print_node_brief): Likewise. + (print_node): Likewise. + * Makefile.in (RTL_BASE_H): Add alias.h. + (TREE_H): Likewise. + 2007-09-06 Jesper Nilsson * longlong.h [__CRIS_arch_version >= 8] (count_trailing_zeros): diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 56c79144b81..b010a090c33 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -770,13 +770,13 @@ HOSTHOOKS_DEF_H = hosthooks-def.h $(HOOKS_H) LANGHOOKS_DEF_H = langhooks-def.h $(HOOKS_H) TARGET_DEF_H = target-def.h $(HOOKS_H) RTL_BASE_H = rtl.h rtl.def $(MACHMODE_H) reg-notes.def insn-notes.def \ - input.h $(REAL_H) statistics.h vec.h fixed-value.h + input.h $(REAL_H) statistics.h vec.h fixed-value.h alias.h RTL_H = $(RTL_BASE_H) genrtl.h PARAMS_H = params.h params.def BUILTINS_DEF = builtins.def sync-builtins.def omp-builtins.def TREE_H = tree.h tree.def $(MACHMODE_H) tree-check.h $(BUILTINS_DEF) \ input.h statistics.h vec.h treestruct.def $(HASHTAB_H) \ - double-int.h + double-int.h alias.h BASIC_BLOCK_H = basic-block.h bitmap.h sbitmap.h varray.h $(PARTITION_H) \ hard-reg-set.h cfghooks.h $(OBSTACK_H) GCOV_IO_H = gcov-io.h gcov-iov.h auto-host.h diff --git a/gcc/print-rtl.c b/gcc/print-rtl.c index a946312c091..3dc8762b355 100644 --- a/gcc/print-rtl.c +++ b/gcc/print-rtl.c @@ -75,7 +75,7 @@ print_decl_name (FILE *outfile, const_tree node) else { if (TREE_CODE (node) == LABEL_DECL && LABEL_DECL_UID (node) != -1) - fprintf (outfile, "L." HOST_WIDE_INT_PRINT_DEC, LABEL_DECL_UID (node)); + fprintf (outfile, "L.%d", (int) LABEL_DECL_UID (node)); else { char c = TREE_CODE (node) == CONST_DECL ? 'C' : 'D'; diff --git a/gcc/print-tree.c b/gcc/print-tree.c index 22a1e2e8204..7f3c5a35ac0 100644 --- a/gcc/print-tree.c +++ b/gcc/print-tree.c @@ -92,7 +92,7 @@ print_node_brief (FILE *file, const char *prefix, const_tree node, int indent) fprintf (file, " %s", IDENTIFIER_POINTER (DECL_NAME (node))); else if (TREE_CODE (node) == LABEL_DECL && LABEL_DECL_UID (node) != -1) - fprintf (file, " L." HOST_WIDE_INT_PRINT_DEC, LABEL_DECL_UID (node)); + fprintf (file, " L.%d", (int) LABEL_DECL_UID (node)); else fprintf (file, " %c.%u", TREE_CODE (node) == CONST_DECL ? 'C' : 'D', DECL_UID (node)); @@ -250,7 +250,7 @@ print_node (FILE *file, const char *prefix, tree node, int indent) fprintf (file, " %s", IDENTIFIER_POINTER (DECL_NAME (node))); else if (TREE_CODE (node) == LABEL_DECL && LABEL_DECL_UID (node) != -1) - fprintf (file, " L." HOST_WIDE_INT_PRINT_DEC, LABEL_DECL_UID (node)); + fprintf (file, " L.%d", (int) LABEL_DECL_UID (node)); else fprintf (file, " %c.%u", TREE_CODE (node) == CONST_DECL ? 'C' : 'D', DECL_UID (node)); diff --git a/gcc/tree-pretty-print.c b/gcc/tree-pretty-print.c index bc7ebf4ea79..a7b97cdcb5c 100644 --- a/gcc/tree-pretty-print.c +++ b/gcc/tree-pretty-print.c @@ -179,8 +179,7 @@ dump_decl_name (pretty_printer *buffer, tree node, int flags) { if (TREE_CODE (t) == LABEL_DECL && LABEL_DECL_UID (t) != -1) - pp_printf (buffer, "L.%wd", - LABEL_DECL_UID (t)); + pp_printf (buffer, "L.%d", (int) LABEL_DECL_UID (t)); else { char c = TREE_CODE (t) == CONST_DECL ? 'C' : 'D'; @@ -870,8 +869,7 @@ dump_generic_node (pretty_printer *buffer, tree node, int spc, int flags, if (DECL_NAME (node)) dump_decl_name (buffer, node, flags); else if (LABEL_DECL_UID (node) != -1) - pp_printf (buffer, "", - LABEL_DECL_UID (node)); + pp_printf (buffer, "", (int) LABEL_DECL_UID (node)); else pp_printf (buffer, "", DECL_UID (node)); break; -- 2.11.0