diff options
94 files changed, 780 insertions, 252 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 239064c12d8..2033f79cf9b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,194 @@ +2010-05-21 Joseph Myers <joseph@codesourcery.com> + + * diagnostic.c: Don't include tm.h, tree.h, tm_p.h, langhooks.h or + langhooks-def.h. + (diagnostic_initialize): Initialize x_data not last_function. + (diagnostic_report_current_function): Move to tree-diagnostic.c. + (default_diagnostic_starter): Call + diagnostic_report_current_module not + diagnostic_report_current_function. + (diagnostic_report_diagnostic): Initialize x_data not + abstract_origin. + (verbatim): Likewise. + * diagnostic.h (struct diagnostic_info): Change abstract_origin to + x_data. + (struct diagnostic_context): Change last_function to x_data. + (diagnostic_auxiliary_data): Replace with + diagnostic_context_auxiliary_data and + diagnostic_info_auxiliary_data. + (diagnostic_last_function_changed, diagnostic_set_last_function, + diagnostic_report_current_function): Move to tree-diagnostic.h. + (print_declaration, dump_generic_node, print_generic_stmt, + print_generic_stmt_indented, print_generic_expr, + print_generic_decl, debug_c_tree, dump_omp_clauses, + print_call_name, debug_generic_expr, debug_generic_stmt, + debug_tree_chain, default_tree_printer): Move to + tree-pretty-print.h. + (debug_gimple_stmt, debug_gimple_seq, print_gimple_seq, + print_gimple_stmt, print_gimple_expr, dump_gimple_stmt): Move to + gimple-pretty-print.h. + * pretty-print.c: Don't include tree.h + (pp_base_format): Don't handle %K here. + (pp_base_tree_identifier): Move to tree-pretty-print.c. + * pretty-print.h (text_info): Change abstract_origin to x_data. + (pp_tree_identifier, pp_unsupported_tree, + pp_base_tree_identifier): Move to tree-pretty-print.h. + * gimple-pretty-print.h, tree-diagnostic.c, tree-diagnostic.h, + tree-pretty-print.h: New files. + * tree-pretty-print.c: Include tree-pretty-print.h. + (percent_K_format): New. Moved from pretty-print.c. + (pp_base_tree_identifier): Move from pretty-print.c. + * c-objc-common.c: Include tree-pretty-print.h. + (c_tree_printer): Handle %K here. + * langhooks.c: Include tree-diagnostic.h. + (lhd_print_error_function): Use diagnostic_abstract_origin macro. + * toplev.c: Include tree-diagnostic.h and tree-pretty-print.h. + (default_tree_printer): Handle %K using percent_K_format. + (general_init): Use default_tree_diagnostic_starter. + * tree.c: Include tree-diagnostic.h and tree-pretty-print.h. + (free_lang_data): Use default_tree_diagnostic_starter. + * c-pretty-print.c: Include tree-pretty-print.h. + * cfgexpand.c: Include tree-pretty-print.h and + gimple-pretty-print.h. + * cgraphunit.c: Include tree-pretty-print.h and + gimple-pretty-print.h. + * dwarf2out.c: Include tree-pretty-print.h. + * except.c: Include tree-pretty-print.h. + * gimple-pretty-print.c: Include tree-pretty-print.h and + gimple-pretty-print.h. + * gimplify.c: Include tree-pretty-print.h. + * graphite-poly.c: Include tree-pretty-print.h and + gimple-pretty-print.h. + * ipa-cp.c: Include tree-pretty-print.h. + * ipa-inline.c: Include gimple-pretty-print.h. + * ipa-prop.c: Include tree-pretty-print.h and + gimple-pretty-print.h. + * ipa-pure-const.c: Include gimple-pretty-print.h. + * ipa-struct-reorg.c: Include tree-pretty-print.h and + gimple-pretty-print.h. + * ipa-type-escape.c: Include tree-pretty-print.h. + * print-rtl.c: Include tree-pretty-print.h. + * print-tree.c: Include gimple-pretty-print.h. + * sese.c: Include tree-pretty-print.h. + * tree-affine.c: Include tree-pretty-print.h. + * tree-browser.c: Include tree-pretty-print.h. + * tree-call-cdce.c: Include gimple-pretty-print.h. + * tree-cfg.c: Include tree-pretty-print.h and + gimple-pretty-print.h. + * tree-chrec.c: Include tree-pretty-print.h. + * tree-data-ref.c: Include tree-pretty-print.h and + gimple-pretty-print.h. + * tree-dfa.c: Include tree-pretty-print.h. + * tree-if-conv.c: Include tree-pretty-print.h and + gimple-pretty-print.h. + * tree-inline.c: Include tree-pretty-print.h. + * tree-into-ssa.c: Include tree-pretty-print.h and + gimple-pretty-print.h. + * tree-nrv.c: Include tree-pretty-print.h. + * tree-object-size.c: Include tree-pretty-print.h and + gimple-pretty-print.h. + * tree-outof-ssa.c: Include tree-pretty-print.h and + gimple-pretty-print.h. + * tree-parloops.c: Include tree-pretty-print.h and + gimple-pretty-print.h. + * tree-predcom.c: Include tree-pretty-print.h and + gimple-pretty-print.h. + * tree-scalar-evolution.c: Include tree-pretty-print.h and + gimple-pretty-print.h. + * tree-sra.c: Include tree-pretty-print.h. + * tree-ssa-address.c: Include tree-pretty-print.h. + * tree-ssa-alias.c: Include tree-pretty-print.h. + * tree-ssa-ccp.c: Include tree-pretty-print.h and + gimple-pretty-print.h. + * tree-ssa-coalesce.c: Include tree-pretty-print.h. + * tree-ssa-copy.c: Include tree-pretty-print.h and + gimple-pretty-print.h. + * tree-ssa-copyrename.c: Include tree-pretty-print.h. + * tree-ssa-dce.c: Include tree-pretty-print.h and + gimple-pretty-print.h. + * tree-ssa-dom.c: Include tree-pretty-print.h and + gimple-pretty-print.h. + * tree-ssa-dse.c: Include gimple-pretty-print.h. + * tree-ssa-forwprop.c: Include tree-pretty-print.h. + * tree-ssa-ifcombine.c: Include tree-pretty-print.h. + * tree-ssa-live.c: Include tree-pretty-print.h and + gimple-pretty-print.h. + * tree-ssa-loop-im.c: Include tree-pretty-print.h and + gimple-pretty-print.h. + * tree-ssa-loop-ivcanon.c: Include tree-pretty-print.h and + gimple-pretty-print.h. + * tree-ssa-loop-ivopts.c: Include tree-pretty-print.h and + gimple-pretty-print.h. + * tree-ssa-loop-niter.c: Include tree-pretty-print.h and + gimple-pretty-print.h. + * tree-ssa-loop-prefetch.c: Include tree-pretty-print.h. + * tree-ssa-math-opts.c: Include gimple-pretty-print.h. + * tree-ssa-operands.c: Include tree-pretty-print.h and + gimple-pretty-print.h. + * tree-ssa-phiprop.c: Include tree-pretty-print.h and + gimple-pretty-print.h. + * tree-ssa-pre.c: Include tree-pretty-print.h and + gimple-pretty-print.h. + * tree-ssa-propagate.c: Include gimple-pretty-print.h. + * tree-ssa-reassoc.c: Include tree-pretty-print.h and + gimple-pretty-print.h. + * tree-ssa-sccvn.c: Include tree-pretty-print.h and + gimple-pretty-print.h. + * tree-ssa-sink.c: Include gimple-pretty-print.h. + * tree-ssa-ter.c: Include tree-pretty-print.h and + gimple-pretty-print.h. + * tree-ssa-uninit.c: Include gimple-pretty-print.h. + * tree-ssa.c: Include tree-pretty-print.h and + gimple-pretty-print.h. + * tree-stdarg.c: Include gimple-pretty-print.h. + * tree-switch-conversion.c: Include gimple-pretty-print.h. + * tree-tailcall.c: Include tree-pretty-print.h and + gimple-pretty-print.h. + * tree-vect-data-refs.c: Include tree-pretty-print.h and + gimple-pretty-print.h. + * tree-vect-loop-manip.c: Include tree-pretty-print.h and + gimple-pretty-print.h. + * tree-vect-loop.c: Include tree-pretty-print.h and + gimple-pretty-print.h. + * tree-vect-patterns.c: Include gimple-pretty-print.h. + * tree-vect-slp.c: Include tree-pretty-print.h and + gimple-pretty-print.h. + * tree-vect-stmts.c: Include tree-pretty-print.h and + gimple-pretty-print.h. + * tree-vectorizer.c: Include tree-pretty-print.h. + * tree-vrp.c: Include tree-pretty-print.h and + gimple-pretty-print.h. + * value-prof.c: Include tree-pretty-print.h and + gimple-pretty-print.h. + * var-tracking.c: Include tree-pretty-print.h. + * Makefile.in (OBJS-common): Add tree-diagnostic.o. + (tree-diagnostic.o): New dependencies. + (c-objc-common.o, c-pretty-print.o, langhooks.o, tree.o, + tree-inline.o, print-tree.o, stor-layout.o, tree-ssa-uninit.o, + tree-ssa.o, tree-into-ssa.o, tree-ssa-ter.o, tree-ssa-coalesce.o, + tree-outof-ssa.o, tree-ssa-forwprop.o, tree-ssa-phiprop.o, + tree-ssa-ifcombine.o, tree-nrv.o, tree-ssa-copy.o, + tree-ssa-propagate.o, tree-ssa-dom.o, tree-ssa-uncprop.o, + tree-ssa-live.o, tree-ssa-copyrename.o, tree-ssa-pre.o, + tree-ssa-sccvn.o, tree-vrp.o, tree-cfg.o, tree-tailcall.o, + tree-ssa-sink.o, tree-if-conv.o, tree-dfa.o, tree-ssa-operands.o, + tree-ssa-address.o, tree-ssa-loop-niter.o, + tree-ssa-loop-ivcanon.o, tree-ssa-loop-prefetch.o, tree-predcom.o, + tree-ssa-loop-ivopts.o, tree-affine.o, tree-ssa-loop-im.o, + tree-ssa-math-opts.o, tree-ssa-alias.o, tree-ssa-reassoc.o, + gimplify.o, tree-browser.o, tree-chrec.o, tree-scalar-evolution.o, + tree-data-ref.o, sese.o, graphite-poly.o, tree-vect-loop.o, + tree-vect-loop-manip.o, tree-vect-patterns.o, tree-vect-slp.o, + tree-vect-stmts.o, tree-vect-data-refs.o, tree-vectorizer.o, + tree-parloops.o, tree-stdarg.o, tree-object-size.o, + gimple-pretty-print.o, tree-pretty-print.o, diagnostic.o, + toplev.o, print-rtl.o, except.o, dwarf2out.o, cgraphunit.o, + ipa-prop.o, ipa-cp.o, ipa-inline.o, ipa-pure-const.o, + ipa-type-escape.o, ipa-struct-reorg.o, tree-ssa-dce.o, + tree-call-cdce.o, tree-ssa-ccp.o, tree-sra.o, + tree-switch-conversion.o, var-tracking.o, value-prof.o, + cfgexpand.o, pretty-print.o): Update dependencies. + 2010-05-22 Andreas Tobler <andreast@fgznet.ch> * tree-ssa-structalias.c: Remove tm_p.h from include. diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 2af58035a10..20ab771faa9 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -1332,6 +1332,7 @@ OBJS-common = \ tree-complex.o \ tree-data-ref.o \ tree-dfa.o \ + tree-diagnostic.o \ tree-dump.o \ tree-eh.o \ tree-if-conv.o \ @@ -1996,7 +1997,8 @@ c-ppoutput.o : c-ppoutput.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \ $(C_COMMON_H) $(TREE_H) $(CPPLIB_H) $(CPP_INTERNAL_H) $(C_PRAGMA_H) c-objc-common.o : c-objc-common.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \ $(TREE_H) $(C_TREE_H) $(FLAGS_H) $(DIAGNOSTIC_H) \ - langhooks.h $(GGC_H) $(C_PRETTY_PRINT_H) c-objc-common.h intl.h + langhooks.h $(GGC_H) $(C_PRETTY_PRINT_H) c-objc-common.h intl.h \ + tree-pretty-print.h c-aux-info.o : c-aux-info.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \ $(C_TREE_H) $(FLAGS_H) $(TOPLEV_H) c-convert.o : c-convert.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ @@ -2054,7 +2056,7 @@ c-common.o : c-common.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \ c-pretty-print.o : c-pretty-print.c $(C_PRETTY_PRINT_H) \ $(C_TREE_H) $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ - $(DIAGNOSTIC_H) tree-iterator.h intl.h + $(DIAGNOSTIC_H) tree-iterator.h intl.h tree-pretty-print.h c-opts.o : c-opts.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \ $(TREE_H) $(C_PRAGMA_H) $(FLAGS_H) $(TOPLEV_H) langhooks.h \ @@ -2253,14 +2255,14 @@ lto-streamer.o: lto-streamer.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \ langhooks.o : langhooks.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ $(TREE_H) $(TOPLEV_H) $(TREE_INLINE_H) $(RTL_H) insn-config.h $(INTEGRATE_H) \ langhooks.h $(TARGET_H) $(LANGHOOKS_DEF_H) $(FLAGS_H) $(GGC_H) $(DIAGNOSTIC_H) \ - intl.h $(GIMPLE_H) $(CGRAPH_H) output.h + intl.h $(GIMPLE_H) $(CGRAPH_H) output.h tree-diagnostic.h tree.o: tree.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \ all-tree.def $(FLAGS_H) $(FUNCTION_H) $(PARAMS_H) \ $(TOPLEV_H) $(GGC_H) $(HASHTAB_H) $(TARGET_H) output.h $(TM_P_H) \ langhooks.h gt-tree.h $(TREE_INLINE_H) tree-iterator.h \ $(BASIC_BLOCK_H) $(TREE_FLOW_H) $(OBSTACK_H) pointer-set.h \ tree-pass.h $(LANGHOOKS_DEF_H) $(DIAGNOSTIC_H) $(CGRAPH_H) $(TIMEVAR_H) \ - $(EXCEPT_H) debug.h intl.h + $(EXCEPT_H) debug.h intl.h tree-diagnostic.h tree-pretty-print.h tree-dump.o: tree-dump.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ $(TREE_H) langhooks.h $(TOPLEV_H) $(SPLAY_TREE_H) $(TREE_DUMP_H) \ tree-iterator.h $(TREE_PASS_H) $(DIAGNOSTIC_H) @@ -2269,10 +2271,11 @@ tree-inline.o : tree-inline.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ $(HASHTAB_H) $(TOPLEV_H) langhooks.h $(TREE_INLINE_H) $(CGRAPH_H) \ intl.h $(FUNCTION_H) $(GIMPLE_H) \ debug.h $(DIAGNOSTIC_H) $(EXCEPT_H) $(TREE_FLOW_H) tree-iterator.h tree-mudflap.h \ - $(IPA_PROP_H) value-prof.h $(TREE_PASS_H) $(TARGET_H) $(INTEGRATE_H) + $(IPA_PROP_H) value-prof.h $(TREE_PASS_H) $(TARGET_H) $(INTEGRATE_H) \ + tree-pretty-print.h print-tree.o : print-tree.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \ $(GGC_H) langhooks.h tree-iterator.h \ - $(DIAGNOSTIC_H) $(TREE_FLOW_H) $(TREE_PASS_H) + $(DIAGNOSTIC_H) $(TREE_FLOW_H) $(TREE_PASS_H) gimple-pretty-print.h stor-layout.o : stor-layout.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ $(TREE_H) $(PARAMS_H) $(FLAGS_H) $(FUNCTION_H) $(EXPR_H) output.h $(RTL_H) \ $(GGC_H) $(TM_P_H) $(TARGET_H) langhooks.h $(REGS_H) gt-stor-layout.h \ @@ -2289,29 +2292,34 @@ tree-ssa-uninit.o : tree-ssa-uninit.c $(TREE_FLOW_H) $(CONFIG_H) $(SYSTEM_H) \ $(TOPLEV_H) $(FUNCTION_H) $(TIMEVAR_H) $(TM_H) coretypes.h \ $(TREE_DUMP_H) langhooks.h tree-pass.h $(BASIC_BLOCK_H) $(BITMAP_H) \ $(FLAGS_H) $(HASHTAB_H) pointer-set.h \ - $(GIMPLE_H) $(TREE_INLINE_H) + $(GIMPLE_H) $(TREE_INLINE_H) gimple-pretty-print.h tree-ssa.o : tree-ssa.c $(TREE_FLOW_H) $(CONFIG_H) $(SYSTEM_H) \ $(TREE_H) $(TM_P_H) $(EXPR_H) output.h $(DIAGNOSTIC_H) \ $(TOPLEV_H) $(FUNCTION_H) $(TIMEVAR_H) $(TM_H) coretypes.h \ $(TREE_DUMP_H) langhooks.h $(TREE_PASS_H) $(BASIC_BLOCK_H) $(BITMAP_H) \ $(FLAGS_H) $(GGC_H) $(HASHTAB_H) pointer-set.h \ - $(GIMPLE_H) $(TREE_INLINE_H) $(TARGET_H) + $(GIMPLE_H) $(TREE_INLINE_H) $(TARGET_H) tree-pretty-print.h \ + gimple-pretty-print.h tree-into-ssa.o : tree-into-ssa.c $(TREE_FLOW_H) $(CONFIG_H) $(SYSTEM_H) \ $(TREE_H) $(TM_P_H) $(EXPR_H) output.h $(DIAGNOSTIC_H) \ $(FUNCTION_H) $(TIMEVAR_H) $(TM_H) coretypes.h $(TREE_DUMP_H) \ langhooks.h domwalk.h $(TREE_PASS_H) $(PARAMS_H) $(BASIC_BLOCK_H) \ $(BITMAP_H) $(CFGLOOP_H) $(FLAGS_H) $(HASHTAB_H) \ - $(GIMPLE_H) $(TREE_INLINE_H) vecprim.h + $(GIMPLE_H) $(TREE_INLINE_H) vecprim.h tree-pretty-print.h \ + gimple-pretty-print.h tree-ssa-ter.o : tree-ssa-ter.c $(TREE_FLOW_H) $(CONFIG_H) $(SYSTEM_H) \ $(TREE_H) $(DIAGNOSTIC_H) $(TM_H) coretypes.h $(TREE_DUMP_H) \ - $(TREE_SSA_LIVE_H) $(BITMAP_H) $(FLAGS_H) + $(TREE_SSA_LIVE_H) $(BITMAP_H) $(FLAGS_H) tree-pretty-print.h \ + gimple-pretty-print.h tree-ssa-coalesce.o : tree-ssa-coalesce.c $(TREE_FLOW_H) $(CONFIG_H) \ $(SYSTEM_H) $(TREE_H) $(DIAGNOSTIC_H) $(TM_H) coretypes.h $(TREE_DUMP_H) \ - $(TREE_SSA_LIVE_H) $(BITMAP_H) $(FLAGS_H) $(HASHTAB_H) $(TOPLEV_H) + $(TREE_SSA_LIVE_H) $(BITMAP_H) $(FLAGS_H) $(HASHTAB_H) $(TOPLEV_H) \ + tree-pretty-print.h tree-outof-ssa.o : tree-outof-ssa.c $(TREE_FLOW_H) $(CONFIG_H) $(SYSTEM_H) \ $(TREE_H) $(DIAGNOSTIC_H) $(TIMEVAR_H) $(TM_H) coretypes.h $(TREE_DUMP_H) \ $(TREE_PASS_H) $(TREE_SSA_LIVE_H) $(BASIC_BLOCK_H) $(BITMAP_H) $(GGC_H) \ - $(TOPLEV_H) $(EXPR_H) $(SSAEXPAND_H) + $(TOPLEV_H) $(EXPR_H) $(SSAEXPAND_H) tree-pretty-print.h \ + gimple-pretty-print.h tree-ssa-dse.o : tree-ssa-dse.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \ $(TM_H) $(GGC_H) $(TREE_H) $(RTL_H) $(TM_P_H) $(BASIC_BLOCK_H) \ $(TREE_FLOW_H) $(TREE_PASS_H) $(TREE_DUMP_H) domwalk.h $(FLAGS_H) \ @@ -2319,14 +2327,15 @@ tree-ssa-dse.o : tree-ssa-dse.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \ tree-ssa-forwprop.o : tree-ssa-forwprop.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \ $(TM_H) $(TREE_H) $(TM_P_H) $(BASIC_BLOCK_H) \ $(TREE_FLOW_H) $(TREE_PASS_H) $(TREE_DUMP_H) $(DIAGNOSTIC_H) $(TIMEVAR_H) \ - langhooks.h $(FLAGS_H) $(GIMPLE_H) + langhooks.h $(FLAGS_H) $(GIMPLE_H) tree-pretty-print.h tree-ssa-phiprop.o : tree-ssa-phiprop.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \ $(TM_H) $(TREE_H) $(TM_P_H) $(BASIC_BLOCK_H) \ $(TREE_FLOW_H) $(TREE_PASS_H) $(TREE_DUMP_H) $(DIAGNOSTIC_H) $(TIMEVAR_H) \ - langhooks.h $(FLAGS_H) + langhooks.h $(FLAGS_H) tree-pretty-print.h gimple-pretty-print.h tree-ssa-ifcombine.o : tree-ssa-ifcombine.c $(CONFIG_H) $(SYSTEM_H) \ coretypes.h $(TM_H) $(TREE_H) $(BASIC_BLOCK_H) \ - $(TREE_FLOW_H) $(TREE_PASS_H) $(TREE_DUMP_H) $(DIAGNOSTIC_H) $(TIMEVAR_H) + $(TREE_FLOW_H) $(TREE_PASS_H) $(TREE_DUMP_H) $(DIAGNOSTIC_H) $(TIMEVAR_H) \ + tree-pretty-print.h tree-ssa-phiopt.o : tree-ssa-phiopt.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \ $(TM_H) $(GGC_H) $(TREE_H) $(TM_P_H) $(BASIC_BLOCK_H) \ $(TREE_FLOW_H) $(TREE_PASS_H) $(TREE_DUMP_H) langhooks.h $(FLAGS_H) \ @@ -2334,23 +2343,24 @@ tree-ssa-phiopt.o : tree-ssa-phiopt.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \ tree-nrv.o : tree-nrv.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \ $(TM_H) $(TREE_H) $(FUNCTION_H) $(BASIC_BLOCK_H) $(FLAGS_H) \ $(DIAGNOSTIC_H) $(TREE_FLOW_H) $(TIMEVAR_H) $(TREE_DUMP_H) $(TREE_PASS_H) \ - langhooks.h + langhooks.h tree-pretty-print.h tree-ssa-copy.o : tree-ssa-copy.c $(TREE_FLOW_H) $(CONFIG_H) $(SYSTEM_H) \ $(TREE_H) $(TM_P_H) $(EXPR_H) $(GGC_H) output.h $(DIAGNOSTIC_H) \ $(FUNCTION_H) $(TIMEVAR_H) $(TM_H) coretypes.h $(TREE_DUMP_H) \ $(BASIC_BLOCK_H) $(TREE_PASS_H) langhooks.h tree-ssa-propagate.h \ - $(FLAGS_H) $(CFGLOOP_H) + $(FLAGS_H) $(CFGLOOP_H) tree-pretty-print.h gimple-pretty-print.h tree-ssa-propagate.o : tree-ssa-propagate.c $(TREE_FLOW_H) $(CONFIG_H) \ $(SYSTEM_H) $(TREE_H) $(TM_P_H) $(EXPR_H) output.h \ $(DIAGNOSTIC_H) $(FUNCTION_H) $(TIMEVAR_H) $(TM_H) coretypes.h \ $(TREE_DUMP_H) $(BASIC_BLOCK_H) $(TREE_PASS_H) langhooks.h \ tree-ssa-propagate.h vec.h value-prof.h gt-tree-ssa-propagate.h $(FLAGS_H) \ - $(GIMPLE_H) + $(GIMPLE_H) gimple-pretty-print.h tree-ssa-dom.o : tree-ssa-dom.c $(TREE_FLOW_H) $(CONFIG_H) $(SYSTEM_H) \ $(TREE_H) $(TM_P_H) $(EXPR_H) output.h $(DIAGNOSTIC_H) \ $(FUNCTION_H) $(TIMEVAR_H) $(TM_H) coretypes.h $(TREE_DUMP_H) \ $(BASIC_BLOCK_H) domwalk.h $(TREE_PASS_H) $(FLAGS_H) langhooks.h \ - tree-ssa-propagate.h $(CFGLOOP_H) $(PARAMS_H) + tree-ssa-propagate.h $(CFGLOOP_H) $(PARAMS_H) tree-pretty-print.h \ + gimple-pretty-print.h tree-ssa-uncprop.o : tree-ssa-uncprop.c $(TREE_FLOW_H) $(CONFIG_H) \ $(SYSTEM_H) $(TREE_H) $(TM_P_H) $(EXPR_H) output.h \ $(DIAGNOSTIC_H) $(FUNCTION_H) $(TIMEVAR_H) $(TM_H) coretypes.h \ @@ -2375,34 +2385,38 @@ domwalk.o : domwalk.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ $(BASIC_BLOCK_H) domwalk.h $(GGC_H) tree-ssa-live.o : tree-ssa-live.c $(TREE_FLOW_H) $(CONFIG_H) $(SYSTEM_H) \ $(TREE_H) $(DIAGNOSTIC_H) $(TM_H) coretypes.h $(TREE_DUMP_H) \ - $(TREE_SSA_LIVE_H) $(BITMAP_H) $(TOPLEV_H) debug.h $(FLAGS_H) + $(TREE_SSA_LIVE_H) $(BITMAP_H) $(TOPLEV_H) debug.h $(FLAGS_H) \ + tree-pretty-print.h gimple-pretty-print.h tree-ssa-copyrename.o : tree-ssa-copyrename.c $(TREE_FLOW_H) $(CONFIG_H) \ $(SYSTEM_H) $(TREE_H) $(DIAGNOSTIC_H) $(FUNCTION_H) $(TIMEVAR_H) \ $(TREE_PASS_H) $(TM_H) coretypes.h $(TREE_DUMP_H) $(TREE_SSA_LIVE_H) \ $(BASIC_BLOCK_H) $(BITMAP_H) $(FLAGS_H) $(HASHTAB_H) langhooks.h \ - $(GIMPLE_H) $(TREE_INLINE_H) $(GIMPLE_H) + $(GIMPLE_H) $(TREE_INLINE_H) $(GIMPLE_H) tree-pretty-print.h tree-ssa-pre.o : tree-ssa-pre.c $(TREE_FLOW_H) $(CONFIG_H) \ $(SYSTEM_H) $(TREE_H) $(DIAGNOSTIC_H) $(TIMEVAR_H) $(FIBHEAP_H) \ $(TM_H) coretypes.h $(TREE_DUMP_H) $(TREE_PASS_H) $(FLAGS_H) langhooks.h \ $(CFGLOOP_H) alloc-pool.h $(BASIC_BLOCK_H) $(BITMAP_H) $(HASHTAB_H) \ $(GIMPLE_H) $(TREE_INLINE_H) tree-iterator.h tree-ssa-sccvn.h $(PARAMS_H) \ - $(DBGCNT_H) tree-scalar-evolution.h + $(DBGCNT_H) tree-scalar-evolution.h tree-pretty-print.h \ + gimple-pretty-print.h tree-ssa-sccvn.o : tree-ssa-sccvn.c $(TREE_FLOW_H) $(CONFIG_H) \ $(SYSTEM_H) $(TREE_H) $(DIAGNOSTIC_H) $(TIMEVAR_H) $(FIBHEAP_H) \ $(TM_H) coretypes.h $(TREE_DUMP_H) $(TREE_PASS_H) $(FLAGS_H) $(CFGLOOP_H) \ alloc-pool.h $(BASIC_BLOCK_H) $(BITMAP_H) langhooks.h $(HASHTAB_H) $(GIMPLE_H) \ $(TREE_INLINE_H) tree-iterator.h tree-ssa-propagate.h tree-ssa-sccvn.h \ - $(PARAMS_H) + $(PARAMS_H) tree-pretty-print.h gimple-pretty-print.h tree-vrp.o : tree-vrp.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \ $(TREE_FLOW_H) $(TREE_PASS_H) $(TREE_DUMP_H) $(DIAGNOSTIC_H) $(GGC_H) \ $(BASIC_BLOCK_H) tree-ssa-propagate.h $(FLAGS_H) $(TREE_DUMP_H) \ - $(CFGLOOP_H) $(SCEV_H) $(TIMEVAR_H) $(TOPLEV_H) intl.h + $(CFGLOOP_H) $(SCEV_H) $(TIMEVAR_H) $(TOPLEV_H) intl.h tree-pretty-print.h \ + gimple-pretty-print.h tree-cfg.o : tree-cfg.c $(TREE_FLOW_H) $(CONFIG_H) $(SYSTEM_H) \ $(TREE_H) $(TM_P_H) $(EXPR_H) $(GGC_H) $(FLAGS_H) output.h \ $(DIAGNOSTIC_H) $(FUNCTION_H) $(TIMEVAR_H) $(TM_H) coretypes.h \ $(TREE_DUMP_H) $(EXCEPT_H) langhooks.h $(CFGLOOP_H) $(TREE_PASS_H) \ $(CFGLAYOUT_H) $(BASIC_BLOCK_H) $(TOPLEV_H) \ - value-prof.h tree-ssa-propagate.h $(TREE_INLINE_H) + value-prof.h tree-ssa-propagate.h $(TREE_INLINE_H) tree-pretty-print.h \ + gimple-pretty-print.h tree-cfgcleanup.o : tree-cfgcleanup.c $(TREE_FLOW_H) $(CONFIG_H) $(SYSTEM_H) \ $(TREE_H) $(TM_P_H) $(EXPR_H) $(GGC_H) $(FLAGS_H) output.h \ $(DIAGNOSTIC_H) $(TOPLEV_H) $(FUNCTION_H) $(TIMEVAR_H) $(TM_H) coretypes.h \ @@ -2412,12 +2426,13 @@ tree-cfgcleanup.o : tree-cfgcleanup.c $(TREE_FLOW_H) $(CONFIG_H) $(SYSTEM_H) \ tree-tailcall.o : tree-tailcall.c $(TREE_FLOW_H) $(CONFIG_H) $(SYSTEM_H) \ $(TREE_H) $(TM_P_H) $(FUNCTION_H) $(TM_H) coretypes.h \ $(TREE_DUMP_H) $(DIAGNOSTIC_H) $(EXCEPT_H) $(TREE_PASS_H) $(FLAGS_H) langhooks.h \ - $(BASIC_BLOCK_H) $(DBGCNT_H) + $(BASIC_BLOCK_H) $(DBGCNT_H) gimple-pretty-print.h tree-ssa-sink.o : tree-ssa-sink.c $(TREE_FLOW_H) $(CONFIG_H) \ $(SYSTEM_H) $(TREE_H) $(DIAGNOSTIC_H) $(TIMEVAR_H) \ $(TM_H) coretypes.h $(TREE_DUMP_H) $(TREE_PASS_H) $(FLAGS_H) alloc-pool.h \ $(BASIC_BLOCK_H) $(BITMAP_H) $(CFGLOOP_H) $(FIBHEAP_H) $(HASHTAB_H) \ - langhooks.h $(GIMPLE_H) $(TREE_INLINE_H) tree-iterator.h + langhooks.h $(GIMPLE_H) $(TREE_INLINE_H) tree-iterator.h \ + gimple-pretty-print.h tree-nested.o: tree-nested.c $(CONFIG_H) $(SYSTEM_H) $(TM_H) $(TREE_H) \ $(TM_P_H) $(FUNCTION_H) $(TREE_DUMP_H) $(TREE_INLINE_H) \ tree-iterator.h $(GIMPLE_H) $(CGRAPH_H) $(EXPR_H) langhooks.h \ @@ -2425,18 +2440,20 @@ tree-nested.o: tree-nested.c $(CONFIG_H) $(SYSTEM_H) $(TM_H) $(TREE_H) \ tree-if-conv.o: tree-if-conv.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ $(TREE_H) $(FLAGS_H) $(TIMEVAR_H) $(BASIC_BLOCK_H) $(TREE_FLOW_H) \ $(CFGLOOP_H) $(TREE_DATA_REF_H) $(TREE_PASS_H) $(DIAGNOSTIC_H) \ - $(TREE_DUMP_H) + $(TREE_DUMP_H) tree-pretty-print.h gimple-pretty-print.h tree-iterator.o : tree-iterator.c $(CONFIG_H) $(SYSTEM_H) $(TREE_H) \ coretypes.h $(GGC_H) tree-iterator.h $(GIMPLE_H) gt-tree-iterator.h tree-dfa.o : tree-dfa.c $(TREE_FLOW_H) $(CONFIG_H) $(SYSTEM_H) \ $(TREE_H) $(TM_P_H) $(EXPR_H) $(GGC_H) output.h $(DIAGNOSTIC_H) \ $(TREE_INLINE_H) $(HASHTAB_H) pointer-set.h $(FLAGS_H) $(FUNCTION_H) \ $(TIMEVAR_H) convert.h $(TM_H) coretypes.h langhooks.h $(TREE_DUMP_H) \ - $(TREE_PASS_H) $(PARAMS_H) $(CGRAPH_H) $(BASIC_BLOCK_H) $(GIMPLE_H) + $(TREE_PASS_H) $(PARAMS_H) $(CGRAPH_H) $(BASIC_BLOCK_H) $(GIMPLE_H) \ + tree-pretty-print.h tree-ssa-operands.o : tree-ssa-operands.c $(TREE_FLOW_H) $(CONFIG_H) \ $(SYSTEM_H) $(TREE_H) $(GGC_H) $(DIAGNOSTIC_H) $(TREE_INLINE_H) \ $(FLAGS_H) $(FUNCTION_H) $(TM_H) $(TIMEVAR_H) $(TREE_PASS_H) $(TOPLEV_H) \ - coretypes.h langhooks.h $(IPA_REFERENCE_H) + coretypes.h langhooks.h $(IPA_REFERENCE_H) tree-pretty-print.h \ + gimple-pretty-print.h tree-eh.o : tree-eh.c $(TREE_FLOW_H) $(CONFIG_H) $(SYSTEM_H) \ $(TREE_H) $(TM_H) $(FLAGS_H) $(FUNCTION_H) $(EXCEPT_H) langhooks.h \ $(GGC_H) $(TREE_PASS_H) coretypes.h $(TIMEVAR_H) pointer-set.h \ @@ -2454,16 +2471,18 @@ tree-ssa-address.o : tree-ssa-address.c $(TREE_FLOW_H) $(CONFIG_H) \ $(SYSTEM_H) $(RTL_H) $(TREE_H) $(TM_P_H) \ output.h $(DIAGNOSTIC_H) $(TIMEVAR_H) $(TM_H) coretypes.h $(TREE_DUMP_H) \ $(TREE_PASS_H) $(FLAGS_H) $(TREE_INLINE_H) $(RECOG_H) insn-config.h \ - $(EXPR_H) gt-tree-ssa-address.h $(GGC_H) tree-affine.h $(TARGET_H) + $(EXPR_H) gt-tree-ssa-address.h $(GGC_H) tree-affine.h $(TARGET_H) \ + tree-pretty-print.h tree-ssa-loop-niter.o : tree-ssa-loop-niter.c $(TREE_FLOW_H) $(CONFIG_H) \ $(SYSTEM_H) $(TREE_H) $(TM_P_H) $(CFGLOOP_H) $(PARAMS_H) \ $(TREE_INLINE_H) output.h $(DIAGNOSTIC_H) $(TM_H) coretypes.h $(TREE_DUMP_H) \ $(TOPLEV_H) $(FLAGS_H) $(TREE_PASS_H) $(TREE_DATA_REF_H) \ - $(BASIC_BLOCK_H) $(GGC_H) intl.h + $(BASIC_BLOCK_H) $(GGC_H) intl.h tree-pretty-print.h gimple-pretty-print.h tree-ssa-loop-ivcanon.o : tree-ssa-loop-ivcanon.c $(TREE_FLOW_H) $(CONFIG_H) \ $(SYSTEM_H) $(TREE_H) $(TM_P_H) $(CFGLOOP_H) $(PARAMS_H) \ $(TREE_INLINE_H) output.h $(DIAGNOSTIC_H) $(TM_H) coretypes.h $(TREE_DUMP_H) \ - $(FLAGS_H) $(TREE_PASS_H) $(SCEV_H) $(BASIC_BLOCK_H) $(TARGET_H) + $(FLAGS_H) $(TREE_PASS_H) $(SCEV_H) $(BASIC_BLOCK_H) $(TARGET_H) \ + tree-pretty-print.h gimple-pretty-print.h tree-ssa-loop-ch.o : tree-ssa-loop-ch.c $(TREE_FLOW_H) $(CONFIG_H) \ $(SYSTEM_H) $(RTL_H) $(TREE_H) $(TM_P_H) $(CFGLOOP_H) $(TREE_INLINE_H) \ output.h $(DIAGNOSTIC_H) $(TIMEVAR_H) $(TM_H) coretypes.h $(TREE_DUMP_H) \ @@ -2474,20 +2493,22 @@ tree-ssa-loop-prefetch.o: tree-ssa-loop-prefetch.c $(TREE_FLOW_H) $(CONFIG_H) \ $(TREE_PASS_H) $(RECOG_H) insn-config.h $(HASHTAB_H) \ $(CFGLOOP_H) $(PARAMS_H) langhooks.h $(BASIC_BLOCK_H) \ $(TOPLEV_H) langhooks.h $(TREE_INLINE_H) $(TREE_DATA_REF_H) \ - $(OPTABS_H) + $(OPTABS_H) tree-pretty-print.h tree-predcom.o: tree-predcom.c $(CONFIG_H) $(SYSTEM_H) $(TREE_H) $(TM_P_H) \ $(CFGLOOP_H) $(TREE_FLOW_H) $(GGC_H) $(TREE_DATA_REF_H) \ $(PARAMS_H) $(DIAGNOSTIC_H) $(TREE_PASS_H) $(TM_H) coretypes.h \ - tree-affine.h $(TREE_INLINE_H) + tree-affine.h $(TREE_INLINE_H) tree-pretty-print.h tree-ssa-loop-ivopts.o : tree-ssa-loop-ivopts.c $(TREE_FLOW_H) $(CONFIG_H) \ $(SYSTEM_H) $(TREE_H) $(TM_P_H) $(CFGLOOP_H) $(EXPR_H) \ output.h $(DIAGNOSTIC_H) $(TIMEVAR_H) $(TM_H) coretypes.h $(TREE_DUMP_H) \ $(TREE_PASS_H) $(GGC_H) $(RECOG_H) insn-config.h $(HASHTAB_H) $(SCEV_H) \ $(CFGLOOP_H) $(PARAMS_H) langhooks.h $(BASIC_BLOCK_H) \ - tree-affine.h pointer-set.h $(TARGET_H) + tree-affine.h pointer-set.h $(TARGET_H) tree-pretty-print.h \ + gimple-pretty-print.h tree-affine.o : tree-affine.c tree-affine.h $(CONFIG_H) pointer-set.h \ $(SYSTEM_H) $(TREE_H) $(GIMPLE_H) \ - output.h $(DIAGNOSTIC_H) coretypes.h $(TREE_DUMP_H) $(FLAGS_H) + output.h $(DIAGNOSTIC_H) coretypes.h $(TREE_DUMP_H) $(FLAGS_H) \ + tree-pretty-print.h tree-ssa-loop-manip.o : tree-ssa-loop-manip.c $(TREE_FLOW_H) $(CONFIG_H) \ $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \ $(BASIC_BLOCK_H) output.h $(DIAGNOSTIC_H) $(TREE_FLOW_H) $(TREE_DUMP_H) \ @@ -2497,22 +2518,25 @@ tree-ssa-loop-im.o : tree-ssa-loop-im.c $(TREE_FLOW_H) $(CONFIG_H) \ $(SYSTEM_H) $(TREE_H) $(TM_P_H) $(CFGLOOP_H) domwalk.h \ $(PARAMS_H) output.h $(DIAGNOSTIC_H) $(TIMEVAR_H) $(TM_H) coretypes.h \ $(TREE_DUMP_H) $(TREE_PASS_H) $(FLAGS_H) $(BASIC_BLOCK_H) \ - pointer-set.h tree-affine.h tree-ssa-propagate.h + pointer-set.h tree-affine.h tree-ssa-propagate.h gimple-pretty-print.h \ + tree-pretty-print.h tree-ssa-math-opts.o : tree-ssa-math-opts.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \ $(TM_H) $(FLAGS_H) $(TREE_H) $(TREE_FLOW_H) $(TIMEVAR_H) \ $(TREE_PASS_H) alloc-pool.h $(BASIC_BLOCK_H) $(TARGET_H) \ - $(DIAGNOSTIC_H) $(RTL_H) $(EXPR_H) $(OPTABS_H) + $(DIAGNOSTIC_H) $(RTL_H) $(EXPR_H) $(OPTABS_H) gimple-pretty-print.h tree-ssa-alias.o : tree-ssa-alias.c $(TREE_FLOW_H) $(CONFIG_H) $(SYSTEM_H) \ $(TREE_H) $(TM_P_H) $(EXPR_H) $(GGC_H) $(TREE_INLINE_H) $(FLAGS_H) \ $(FUNCTION_H) $(TIMEVAR_H) convert.h $(TM_H) coretypes.h langhooks.h \ $(TREE_DUMP_H) $(TREE_PASS_H) $(PARAMS_H) $(BASIC_BLOCK_H) $(DIAGNOSTIC_H) \ $(GIMPLE_H) vec.h \ - $(IPA_TYPE_ESCAPE_H) vecprim.h pointer-set.h alloc-pool.h + $(IPA_TYPE_ESCAPE_H) vecprim.h pointer-set.h alloc-pool.h \ + tree-pretty-print.h tree-ssa-reassoc.o : tree-ssa-reassoc.c $(TREE_FLOW_H) $(CONFIG_H) \ $(SYSTEM_H) $(TREE_H) $(DIAGNOSTIC_H) $(TIMEVAR_H) \ $(TM_H) coretypes.h $(TREE_DUMP_H) $(TREE_PASS_H) $(FLAGS_H) \ tree-iterator.h $(BASIC_BLOCK_H) $(GIMPLE_H) $(TREE_INLINE_H) \ - vec.h langhooks.h alloc-pool.h pointer-set.h $(CFGLOOP_H) + vec.h langhooks.h alloc-pool.h pointer-set.h $(CFGLOOP_H) \ + tree-pretty-print.h gimple-pretty-print.h tree-optimize.o : tree-optimize.c $(TREE_FLOW_H) $(CONFIG_H) $(SYSTEM_H) \ $(TREE_H) $(TM_P_H) $(GGC_H) output.h \ $(DIAGNOSTIC_H) $(BASIC_BLOCK_H) $(FLAGS_H) $(TIMEVAR_H) $(TM_H) \ @@ -2531,7 +2555,7 @@ gimplify.o : gimplify.c $(CONFIG_H) $(SYSTEM_H) $(TREE_H) $(GIMPLE_H) \ $(LANGHOOKS_DEF_H) $(TREE_FLOW_H) $(CGRAPH_H) $(TIMEVAR_H) $(TM_H) \ coretypes.h $(EXCEPT_H) $(FLAGS_H) $(RTL_H) $(FUNCTION_H) $(EXPR_H) output.h \ $(GGC_H) gt-gimplify.h $(HASHTAB_H) $(TARGET_H) $(TOPLEV_H) $(OPTABS_H) \ - $(SPLAY_TREE_H) vec.h tree-iterator.h tree-pass.h + $(SPLAY_TREE_H) vec.h tree-iterator.h tree-pass.h tree-pretty-print.h gimple-iterator.o : gimple-iterator.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \ $(TREE_H) $(GIMPLE_H) $(TREE_FLOW_H) value-prof.h gimple-fold.o : gimple-fold.c $(TREE_FLOW_H) $(CONFIG_H) \ @@ -2551,26 +2575,27 @@ omp-low.o : omp-low.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \ $(CFGLOOP_H) tree-iterator.h gt-omp-low.h tree-browser.o : tree-browser.c tree-browser.def $(CONFIG_H) $(SYSTEM_H) \ $(TREE_H) $(TREE_INLINE_H) $(DIAGNOSTIC_H) $(HASHTAB_H) \ - $(TM_H) coretypes.h + $(TM_H) coretypes.h tree-pretty-print.h omega.o : omega.c omega.h $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ $(GGC_H) $(TREE_H) $(DIAGNOSTIC_H) $(TREE_PASS_H) $(PARAMS_H) tree-chrec.o: tree-chrec.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ $(GGC_H) $(TREE_H) $(SCEV_H) $(TREE_PASS_H) $(PARAMS_H) \ - $(DIAGNOSTIC_H) $(CFGLOOP_H) $(TREE_FLOW_H) $(FLAGS_H) + $(DIAGNOSTIC_H) $(CFGLOOP_H) $(TREE_FLOW_H) $(FLAGS_H) tree-pretty-print.h tree-scalar-evolution.o: tree-scalar-evolution.c $(CONFIG_H) $(SYSTEM_H) \ coretypes.h $(TM_H) $(GGC_H) $(TREE_H) \ $(BASIC_BLOCK_H) $(DIAGNOSTIC_H) $(TREE_FLOW_H) $(TREE_DUMP_H) \ $(TIMEVAR_H) $(CFGLOOP_H) $(SCEV_H) $(TREE_PASS_H) $(FLAGS_H) \ - gt-tree-scalar-evolution.h + gt-tree-scalar-evolution.h tree-pretty-print.h gimple-pretty-print.h tree-data-ref.o: tree-data-ref.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ $(GGC_H) $(FLAGS_H) $(TREE_H) $(BASIC_BLOCK_H) $(DIAGNOSTIC_H) \ $(TREE_FLOW_H) $(TREE_DUMP_H) $(TIMEVAR_H) $(CFGLOOP_H) \ - $(TREE_DATA_REF_H) $(TREE_PASS_H) langhooks.h + $(TREE_DATA_REF_H) $(TREE_PASS_H) langhooks.h tree-pretty-print.h \ + gimple-pretty-print.h sese.o: sese.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ $(GGC_H) $(TREE_H) $(RTL_H) $(BASIC_BLOCK_H) $(DIAGNOSTIC_H) $(TOPLEV_H) \ $(TREE_FLOW_H) $(TREE_DUMP_H) $(TIMEVAR_H) $(CFGLOOP_H) tree-chrec.h \ $(TREE_DATA_REF_H) tree-scalar-evolution.h tree-pass.h domwalk.h value-prof.h \ - pointer-set.h $(GIMPLE_H) sese.h + pointer-set.h $(GIMPLE_H) sese.h tree-pretty-print.h graphite.o: graphite.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ $(GGC_H) $(TREE_H) $(RTL_H) $(BASIC_BLOCK_H) $(DIAGNOSTIC_H) $(TOPLEV_H) \ $(TREE_FLOW_H) $(TREE_DUMP_H) $(TIMEVAR_H) $(CFGLOOP_H) $(GIMPLE_H) \ @@ -2608,7 +2633,8 @@ graphite-poly.o: graphite-poly.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ $(GGC_H) $(TREE_H) $(RTL_H) $(BASIC_BLOCK_H) $(DIAGNOSTIC_H) $(TOPLEV_H) \ $(TREE_FLOW_H) $(TREE_DUMP_H) $(TIMEVAR_H) $(CFGLOOP_H) $(GIMPLE_H) \ $(TREE_DATA_REF_H) tree-pass.h domwalk.h graphite.h graphite-dependences.h \ - pointer-set.h value-prof.h graphite-ppl.h sese.h output.h graphite-poly.h + pointer-set.h value-prof.h graphite-ppl.h sese.h output.h graphite-poly.h \ + tree-pretty-print.h gimple-pretty-print.h graphite-ppl.o: graphite-ppl.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ $(GGC_H) graphite-ppl.h graphite-scop-detection.o: graphite-scop-detection.c $(CONFIG_H) $(SYSTEM_H) \ @@ -2628,30 +2654,37 @@ graphite-sese-to-poly.o: graphite-sese-to-poly.c $(CONFIG_H) \ tree-vect-loop.o: tree-vect-loop.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \ $(TM_H) $(GGC_H) $(TREE_H) $(BASIC_BLOCK_H) $(DIAGNOSTIC_H) $(TREE_FLOW_H) \ $(TREE_DUMP_H) $(CFGLOOP_H) $(CFGLAYOUT_H) $(EXPR_H) $(RECOG_H) $(OPTABS_H) \ - $(TOPLEV_H) $(SCEV_H) $(TREE_VECTORIZER_H) + $(TOPLEV_H) $(SCEV_H) $(TREE_VECTORIZER_H) tree-pretty-print.h \ + gimple-pretty-print.h tree-vect-loop-manip.o: tree-vect-loop-manip.c $(CONFIG_H) $(SYSTEM_H) \ coretypes.h $(TM_H) $(GGC_H) $(TREE_H) $(BASIC_BLOCK_H) $(DIAGNOSTIC_H) \ $(TREE_FLOW_H) $(TREE_DUMP_H) $(CFGLOOP_H) $(CFGLAYOUT_H) $(EXPR_H) $(TOPLEV_H) \ - $(SCEV_H) $(TREE_VECTORIZER_H) langhooks.h + $(SCEV_H) $(TREE_VECTORIZER_H) langhooks.h tree-pretty-print.h \ + gimple-pretty-print.h tree-vect-patterns.o: tree-vect-patterns.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \ $(TM_H) $(GGC_H) $(TREE_H) $(TARGET_H) $(BASIC_BLOCK_H) $(DIAGNOSTIC_H) \ $(TREE_FLOW_H) $(TREE_DUMP_H) $(CFGLOOP_H) $(EXPR_H) $(OPTABS_H) $(PARAMS_H) \ - $(TREE_DATA_REF_H) $(TREE_VECTORIZER_H) $(RECOG_H) $(TOPLEV_H) + $(TREE_DATA_REF_H) $(TREE_VECTORIZER_H) $(RECOG_H) $(TOPLEV_H) \ + gimple-pretty-print.h tree-vect-slp.o: tree-vect-slp.c $(CONFIG_H) $(SYSTEM_H) \ coretypes.h $(TM_H) $(GGC_H) $(TREE_H) $(TARGET_H) $(BASIC_BLOCK_H) \ $(DIAGNOSTIC_H) $(TREE_FLOW_H) $(TREE_DUMP_H) $(CFGLOOP_H) $(CFGLAYOUT_H) \ - $(EXPR_H) $(RECOG_H) $(OPTABS_H) $(TREE_VECTORIZER_H) + $(EXPR_H) $(RECOG_H) $(OPTABS_H) $(TREE_VECTORIZER_H) tree-pretty-print.h \ + gimple-pretty-print.h tree-vect-stmts.o: tree-vect-stmts.c $(CONFIG_H) $(SYSTEM_H) \ coretypes.h $(TM_H) $(GGC_H) $(TREE_H) $(TARGET_H) $(BASIC_BLOCK_H) \ $(DIAGNOSTIC_H) $(TREE_FLOW_H) $(TREE_DUMP_H) $(CFGLOOP_H) $(CFGLAYOUT_H) \ - $(EXPR_H) $(RECOG_H) $(OPTABS_H) $(TOPLEV_H) $(TREE_VECTORIZER_H) langhooks.h + $(EXPR_H) $(RECOG_H) $(OPTABS_H) $(TOPLEV_H) $(TREE_VECTORIZER_H) \ + langhooks.h tree-pretty-print.h gimple-pretty-print.h tree-vect-data-refs.o: tree-vect-data-refs.c $(CONFIG_H) $(SYSTEM_H) \ coretypes.h $(TM_H) $(GGC_H) $(TREE_H) $(TARGET_H) $(BASIC_BLOCK_H) \ $(DIAGNOSTIC_H) $(TREE_FLOW_H) $(TREE_DUMP_H) $(CFGLOOP_H) \ - $(EXPR_H) $(OPTABS_H) $(SCEV_H) $(TREE_VECTORIZER_H) $(TOPLEV_H) + $(EXPR_H) $(OPTABS_H) $(SCEV_H) $(TREE_VECTORIZER_H) $(TOPLEV_H) \ + tree-pretty-print.h gimple-pretty-print.h tree-vectorizer.o: tree-vectorizer.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \ $(TM_H) $(GGC_H) $(TREE_H) $(DIAGNOSTIC_H) $(TREE_FLOW_H) $(TREE_DUMP_H) \ - $(CFGLOOP_H) $(TREE_PASS_H) $(TREE_VECTORIZER_H) $(TIMEVAR_H) + $(CFGLOOP_H) $(TREE_PASS_H) $(TREE_VECTORIZER_H) $(TIMEVAR_H) \ + tree-pretty-print.h tree-loop-linear.o: tree-loop-linear.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \ $(TM_H) $(OPTABS_H) $(TREE_H) $(BASIC_BLOCK_H) \ $(DIAGNOSTIC_H) $(TREE_FLOW_H) $(TREE_DUMP_H) $(TIMEVAR_H) $(CFGLOOP_H) \ @@ -2665,20 +2698,22 @@ tree-loop-distribution.o: tree-loop-distribution.c $(CONFIG_H) $(SYSTEM_H) coret tree-parloops.o: tree-parloops.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ $(TREE_FLOW_H) $(TREE_H) $(CFGLOOP_H) $(TREE_DATA_REF_H) \ $(DIAGNOSTIC_H) $(TREE_PASS_H) langhooks.h gt-tree-parloops.h \ - $(TREE_VECTORIZER_H) + $(TREE_VECTORIZER_H) tree-pretty-print.h gimple-pretty-print.h tree-stdarg.o: tree-stdarg.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ $(TREE_H) $(FUNCTION_H) $(DIAGNOSTIC_H) $(TREE_FLOW_H) $(TREE_PASS_H) \ - tree-stdarg.h $(TARGET_H) langhooks.h + tree-stdarg.h $(TARGET_H) langhooks.h gimple-pretty-print.h tree-object-size.o: tree-object-size.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \ $(TM_H) $(TREE_H) $(TOPLEV_H) $(DIAGNOSTIC_H) $(TREE_FLOW_H) \ - $(TREE_PASS_H) tree-ssa-propagate.h + $(TREE_PASS_H) tree-ssa-propagate.h tree-pretty-print.h \ + gimple-pretty-print.h gimple.o : gimple.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TREE_H) \ $(GGC_H) $(GIMPLE_H) $(TOPLEV_H) $(DIAGNOSTIC_H) gt-gimple.h \ $(TREE_FLOW_H) value-prof.h $(FLAGS_H) $(DEMANGLE_H) \ $(TARGET_H) $(ALIAS_H) gimple-pretty-print.o : gimple-pretty-print.c $(CONFIG_H) $(SYSTEM_H) \ $(TREE_H) $(DIAGNOSTIC_H) $(HASHTAB_H) $(TREE_FLOW_H) \ - $(TM_H) coretypes.h $(TREE_PASS_H) $(GIMPLE_H) value-prof.h + $(TM_H) coretypes.h $(TREE_PASS_H) $(GIMPLE_H) value-prof.h \ + tree-pretty-print.h gimple-pretty-print.h tree-mudflap.o : $(CONFIG_H) $(SYSTEM_H) $(TREE_H) $(TREE_INLINE_H) \ $(GIMPLE_H) $(DIAGNOSTIC_H) $(DEMANGLE_H) $(HASHTAB_H) langhooks.h tree-mudflap.h \ $(TM_H) coretypes.h $(TREE_DUMP_H) $(TREE_PASS_H) $(CGRAPH_H) $(GGC_H) \ @@ -2691,15 +2726,16 @@ tree-nomudflap.o : $(CONFIG_H) $(SYSTEM_H) $(TREE_H) $(TREE_INLINE_H) \ tree-pretty-print.o : tree-pretty-print.c $(CONFIG_H) $(SYSTEM_H) \ $(TREE_H) $(DIAGNOSTIC_H) $(HASHTAB_H) $(TREE_FLOW_H) \ $(TM_H) coretypes.h tree-iterator.h $(SCEV_H) langhooks.h \ - $(TREE_PASS_H) value-prof.h output.h + $(TREE_PASS_H) value-prof.h output.h tree-pretty-print.h +tree-diagnostic.o : tree-diagnostic.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \ + $(TREE_H) $(DIAGNOSTIC_H) tree-diagnostic.h langhooks.h $(LANGHOOKS_DEF_H) fold-const.o : fold-const.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ $(TREE_H) $(FLAGS_H) $(TOPLEV_H) $(HASHTAB_H) $(EXPR_H) $(RTL_H) \ $(GGC_H) $(TM_P_H) langhooks.h $(MD5_H) intl.h $(TARGET_H) \ $(GIMPLE_H) realmpfr.h -diagnostic.o : diagnostic.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ - $(TREE_H) version.h $(TM_P_H) $(FLAGS_H) $(INPUT_H) $(TOPLEV_H) intl.h \ - $(DIAGNOSTIC_H) langhooks.h $(LANGHOOKS_DEF_H) diagnostic.def opts.h \ - $(PLUGIN_H) +diagnostic.o : diagnostic.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \ + version.h $(FLAGS_H) $(INPUT_H) $(TOPLEV_H) intl.h $(DIAGNOSTIC_H) \ + diagnostic.def opts.h $(PLUGIN_H) opts.o : opts.c opts.h options.h $(TOPLEV_H) $(CONFIG_H) $(SYSTEM_H) \ coretypes.h $(TREE_H) $(TM_H) langhooks.h $(GGC_H) $(EXPR_H) $(RTL_H) \ output.h $(DIAGNOSTIC_H) $(TM_P_H) $(INSN_ATTR_H) intl.h $(TARGET_H) \ @@ -2729,7 +2765,8 @@ toplev.o : toplev.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \ langhooks.h insn-flags.h $(CFGLAYOUT_H) $(CFGLOOP_H) hosthooks.h \ $(CGRAPH_H) $(COVERAGE_H) alloc-pool.h $(GGC_H) $(INTEGRATE_H) \ opts.h params.def tree-mudflap.h $(TREE_PASS_H) $(GIMPLE_H) \ - tree-ssa-alias.h $(PLUGIN_H) realmpfr.h + tree-ssa-alias.h $(PLUGIN_H) realmpfr.h tree-diagnostic.h \ + tree-pretty-print.h $(COMPILER) $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) \ -DTARGET_NAME=\"$(target_noncanonical)\" \ -c $(srcdir)/toplev.c $(OUTPUT_OPTION) @@ -2763,7 +2800,7 @@ rtl.o : rtl.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) \ print-rtl.o : print-rtl.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ $(RTL_H) $(TREE_H) hard-reg-set.h $(BASIC_BLOCK_H) $(FLAGS_H) \ - $(BCONFIG_H) $(DIAGNOSTIC_H) cselib.h $(TREE_PASS_H) + $(BCONFIG_H) $(DIAGNOSTIC_H) cselib.h $(TREE_PASS_H) tree-pretty-print.h rtlanal.o : rtlanal.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TOPLEV_H) \ $(RTL_H) hard-reg-set.h $(TM_P_H) insn-config.h $(RECOG_H) \ $(FLAGS_H) $(REGS_H) output.h $(TARGET_H) $(FUNCTION_H) $(TREE_H) \ @@ -2793,7 +2830,8 @@ except.o : except.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) \ langhooks.h insn-config.h hard-reg-set.h $(BASIC_BLOCK_H) output.h \ dwarf2asm.h dwarf2out.h $(TOPLEV_H) $(HASHTAB_H) intl.h $(GGC_H) \ gt-except.h $(CGRAPH_H) $(INTEGRATE_H) $(DIAGNOSTIC_H) $(DWARF2_H) \ - $(TARGET_H) $(TM_P_H) $(TREE_PASS_H) $(TIMEVAR_H) $(TREE_FLOW_H) + $(TARGET_H) $(TM_P_H) $(TREE_PASS_H) $(TIMEVAR_H) $(TREE_FLOW_H) \ + tree-pretty-print.h expr.o : expr.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) \ $(TREE_H) $(FLAGS_H) $(FUNCTION_H) $(REGS_H) $(EXPR_H) $(OPTABS_H) \ libfuncs.h $(INSN_ATTR_H) insn-config.h $(RECOG_H) output.h \ @@ -2839,7 +2877,8 @@ dwarf2out.o : dwarf2out.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ output.h $(DIAGNOSTIC_H) hard-reg-set.h $(REGS_H) $(EXPR_H) \ libfuncs.h $(TOPLEV_H) dwarf2out.h reload.h $(GGC_H) $(EXCEPT_H) dwarf2asm.h \ $(TM_P_H) langhooks.h $(HASHTAB_H) gt-dwarf2out.h $(TARGET_H) $(CGRAPH_H) \ - $(MD5_H) $(INPUT_H) $(FUNCTION_H) $(GIMPLE_H) $(TREE_PASS_H) $(TREE_FLOW_H) + $(MD5_H) $(INPUT_H) $(FUNCTION_H) $(GIMPLE_H) $(TREE_PASS_H) \ + $(TREE_FLOW_H) tree-pretty-print.h dwarf2asm.o : dwarf2asm.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ $(FLAGS_H) $(RTL_H) $(TREE_H) output.h dwarf2asm.h $(TM_P_H) $(GGC_H) \ gt-dwarf2asm.h $(DWARF2_H) $(SPLAY_TREE_H) $(TARGET_H) @@ -2884,7 +2923,8 @@ cgraphunit.o : cgraphunit.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ $(TARGET_H) $(CGRAPH_H) intl.h pointer-set.h $(FUNCTION_H) $(GIMPLE_H) \ $(TREE_FLOW_H) $(TREE_PASS_H) debug.h $(DIAGNOSTIC_H) \ $(FIBHEAP_H) output.h $(PARAMS_H) $(RTL_H) $(TIMEVAR_H) $(IPA_PROP_H) \ - gt-cgraphunit.h tree-iterator.h $(COVERAGE_H) $(TREE_DUMP_H) + gt-cgraphunit.h tree-iterator.h $(COVERAGE_H) $(TREE_DUMP_H) \ + tree-pretty-print.h gimple-pretty-print.h cgraphbuild.o : cgraphbuild.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ $(TREE_H) langhooks.h $(CGRAPH_H) intl.h pointer-set.h $(GIMPLE_H) \ $(TREE_FLOW_H) $(TREE_PASS_H) $(IPA_UTILS_H) $(EXCEPT_H) @@ -2897,14 +2937,15 @@ ipa.o : ipa.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(CGRAPH_H) \ ipa-prop.o : ipa-prop.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \ langhooks.h $(GGC_H) $(TARGET_H) $(CGRAPH_H) $(IPA_PROP_H) $(DIAGNOSTIC_H) \ $(TREE_FLOW_H) $(TM_H) $(TREE_PASS_H) $(FLAGS_H) $(TREE_H) \ - $(TREE_INLINE_H) $(GIMPLE_H) $(GIMPLE_FOLD_H) $(TIMEVAR_H) + $(TREE_INLINE_H) $(GIMPLE_H) $(GIMPLE_FOLD_H) $(TIMEVAR_H) \ + tree-pretty-print.h gimple-pretty-print.h ipa-ref.o : ipa-ref.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \ langhooks.h $(GGC_H) $(TARGET_H) $(CGRAPH_H) $(TREE_H) $(TARGET_H) \ $(TREE_FLOW_H) $(TM_H) $(TREE_PASS_H) $(FLAGS_H) $(TREE_H) $(GGC_H) ipa-cp.o : ipa-cp.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \ $(TREE_H) $(TARGET_H) $(CGRAPH_H) $(IPA_PROP_H) $(TREE_FLOW_H) \ $(TREE_PASS_H) $(FLAGS_H) $(TIMEVAR_H) $(DIAGNOSTIC_H) $(TREE_DUMP_H) \ - $(TREE_INLINE_H) $(FIBHEAP_H) $(PARAMS_H) + $(TREE_INLINE_H) $(FIBHEAP_H) $(PARAMS_H) tree-pretty-print.h matrix-reorg.o : matrix-reorg.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \ $(TM_H) $(TREE_H) $(RTL_H) $(TREE_INLINE_H) $(TREE_FLOW_H) \ tree-flow-inline.h langhooks.h $(HASHTAB_H) $(TOPLEV_H) $(FLAGS_H) $(GGC_H) \ @@ -2914,7 +2955,8 @@ matrix-reorg.o : matrix-reorg.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \ ipa-inline.o : ipa-inline.c gt-ipa-inline.h $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ $(TREE_H) langhooks.h $(TREE_INLINE_H) $(FLAGS_H) $(CGRAPH_H) intl.h \ $(DIAGNOSTIC_H) $(FIBHEAP_H) $(PARAMS_H) $(TIMEVAR_H) $(TREE_PASS_H) \ - $(HASHTAB_H) $(COVERAGE_H) $(GGC_H) $(TREE_FLOW_H) $(RTL_H) $(IPA_PROP_H) $(EXCEPT_H) + $(HASHTAB_H) $(COVERAGE_H) $(GGC_H) $(TREE_FLOW_H) $(RTL_H) $(IPA_PROP_H) \ + $(EXCEPT_H) gimple-pretty-print.h ipa-utils.o : ipa-utils.c $(IPA_UTILS_H) $(CONFIG_H) $(SYSTEM_H) \ coretypes.h $(TM_H) $(TREE_H) $(TREE_FLOW_H) $(TREE_INLINE_H) langhooks.h \ pointer-set.h $(GGC_H) $(GIMPLE_H) $(SPLAY_TREE_H) \ @@ -2928,19 +2970,20 @@ ipa-pure-const.o : ipa-pure-const.c $(CONFIG_H) $(SYSTEM_H) \ coretypes.h $(TM_H) $(TREE_H) $(TREE_FLOW_H) $(TREE_INLINE_H) langhooks.h \ pointer-set.h $(GGC_H) $(IPA_UTILS_H) $(TARGET_H) \ $(GIMPLE_H) $(CGRAPH_H) output.h $(FLAGS_H) $(TREE_PASS_H) $(TIMEVAR_H) \ - $(DIAGNOSTIC_H) $(CFGLOOP_H) $(SCEV_H) $(LTO_STREAMER_H) + $(DIAGNOSTIC_H) $(CFGLOOP_H) $(SCEV_H) $(LTO_STREAMER_H) \ + gimple-pretty-print.h ipa-type-escape.o : ipa-type-escape.c $(CONFIG_H) $(SYSTEM_H) \ coretypes.h $(TM_H) $(TREE_H) $(TREE_FLOW_H) $(TREE_INLINE_H) langhooks.h \ pointer-set.h $(GGC_H) $(IPA_TYPE_ESCAPE_H) $(IPA_UTILS_H) $(SPLAY_TREE_H) \ $(GIMPLE_H) $(CGRAPH_H) output.h $(FLAGS_H) $(TREE_PASS_H) \ - $(TIMEVAR_H) $(DIAGNOSTIC_H) $(FUNCTION_H) + $(TIMEVAR_H) $(DIAGNOSTIC_H) $(FUNCTION_H) tree-pretty-print.h ipa-struct-reorg.o: ipa-struct-reorg.c ipa-struct-reorg.h $(CONFIG_H) $(SYSTEM_H) \ coretypes.h $(TM_H) $(GGC_H) $(TREE_H) $(RTL_H) $(GIMPLE_H) tree-inline.h \ $(TREE_FLOW_H) langhooks.h pointer-set.h $(HASHTAB_H) $(TOPLEV_H) \ $(FLAGS_H) debug.h $(TARGET_H) $(CGRAPH_H) $(DIAGNOSTIC_H) $(TIMEVAR_H) \ $(PARAMS_H) $(FIBHEAP_H) intl.h $(FUNCTION_H) $(BASIC_BLOCK_H) tree-iterator.h \ $(TREE_PASS_H) opts.h $(IPA_TYPE_ESCAPE_H) $(TREE_DUMP_H) \ - $(GIMPLE_H) + $(GIMPLE_H) tree-pretty-print.h gimple-pretty-print.h coverage.o : coverage.c $(GCOV_IO_H) $(CONFIG_H) $(SYSTEM_H) coretypes.h \ $(TM_H) $(RTL_H) $(TREE_H) $(FLAGS_H) output.h $(REGS_H) $(EXPR_H) \ @@ -2999,26 +3042,28 @@ mode-switching.o : mode-switching.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \ tree-ssa-dce.o : tree-ssa-dce.c $(CONFIG_H) $(SYSTEM_H) $(TREE_H) \ $(TREE_FLOW_H) $(DIAGNOSTIC_H) $(TIMEVAR_H) $(TM_H) \ coretypes.h $(TREE_DUMP_H) $(TREE_PASS_H) $(FLAGS_H) $(BASIC_BLOCK_H) \ - $(GGC_H) $(GIMPLE_H) $(CFGLOOP_H) $(SCEV_H) + $(GGC_H) $(GIMPLE_H) $(CFGLOOP_H) $(SCEV_H) tree-pretty-print.h \ + gimple-pretty-print.h tree-call-cdce.o : tree-call-cdce.c $(CONFIG_H) $(SYSTEM_H) $(TREE_H) \ $(TREE_FLOW_H) $(DIAGNOSTIC_H) $(TIMEVAR_H) $(TM_H) \ coretypes.h $(TREE_DUMP_H) $(TREE_PASS_H) $(FLAGS_H) $(BASIC_BLOCK_H) \ - $(GIMPLE_H) + $(GIMPLE_H) gimple-pretty-print.h tree-ssa-ccp.o : tree-ssa-ccp.c $(TREE_FLOW_H) $(CONFIG_H) \ $(SYSTEM_H) $(TREE_H) $(TM_P_H) $(EXPR_H) output.h \ $(DIAGNOSTIC_H) $(FUNCTION_H) $(TIMEVAR_H) $(TM_H) coretypes.h \ $(TREE_DUMP_H) $(BASIC_BLOCK_H) $(TREE_PASS_H) langhooks.h \ tree-ssa-propagate.h value-prof.h $(FLAGS_H) $(TARGET_H) $(TOPLEV_H) \ - $(DBGCNT_H) + $(DBGCNT_H) tree-pretty-print.h gimple-pretty-print.h tree-sra.o : tree-sra.c $(CONFIG_H) $(SYSTEM_H) coretypes.h alloc-pool.h \ $(TM_H) $(TREE_H) $(GIMPLE_H) $(CGRAPH_H) $(TREE_FLOW_H) $(IPA_PROP_H) \ $(DIAGNOSTIC_H) statistics.h $(TREE_DUMP_H) $(TIMEVAR_H) $(PARAMS_H) \ - $(TARGET_H) $(FLAGS_H) $(EXPR_H) + $(TARGET_H) $(FLAGS_H) $(EXPR_H) tree-pretty-print.h tree-switch-conversion.o : tree-switch-conversion.c $(CONFIG_H) $(SYSTEM_H) \ $(TREE_H) $(TM_P_H) $(TREE_FLOW_H) $(DIAGNOSTIC_H) $(TREE_INLINE_H) \ $(TIMEVAR_H) $(TM_H) coretypes.h $(TREE_DUMP_H) $(GIMPLE_H) \ $(TREE_PASS_H) $(FLAGS_H) $(EXPR_H) $(BASIC_BLOCK_H) output.h \ - $(GGC_H) $(OBSTACK_H) $(PARAMS_H) $(CPPLIB_H) $(PARAMS_H) + $(GGC_H) $(OBSTACK_H) $(PARAMS_H) $(CPPLIB_H) $(PARAMS_H) \ + gimple-pretty-print.h tree-complex.o : tree-complex.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TREE_H) \ $(TM_H) $(FLAGS_H) $(TREE_FLOW_H) $(GIMPLE_H) \ tree-iterator.h $(TREE_PASS_H) tree-ssa-propagate.h $(DIAGNOSTIC_H) @@ -3050,7 +3095,7 @@ var-tracking.o : var-tracking.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ $(BASIC_BLOCK_H) output.h sbitmap.h alloc-pool.h $(FIBHEAP_H) $(HASHTAB_H) \ $(REGS_H) $(EXPR_H) $(TIMEVAR_H) $(TREE_PASS_H) $(TREE_FLOW_H) \ cselib.h $(TARGET_H) $(TOPLEV_H) $(PARAMS_H) $(DIAGNOSTIC_H) pointer-set.h \ - $(RECOG_H) + $(RECOG_H) tree-pretty-print.h profile.o : profile.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) \ $(TREE_H) $(FLAGS_H) output.h $(REGS_H) $(EXPR_H) $(FUNCTION_H) \ $(TOPLEV_H) $(COVERAGE_H) $(TREE_FLOW_H) value-prof.h cfghooks.h \ @@ -3065,7 +3110,8 @@ value-prof.o : value-prof.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ $(BASIC_BLOCK_H) hard-reg-set.h value-prof.h $(EXPR_H) output.h $(FLAGS_H) \ $(RECOG_H) insn-config.h $(OPTABS_H) $(REGS_H) $(GGC_H) $(DIAGNOSTIC_H) \ $(TREE_H) $(COVERAGE_H) $(RTL_H) $(GCOV_IO_H) $(TREE_FLOW_H) \ - tree-flow-inline.h $(TIMEVAR_H) $(TREE_PASS_H) $(TOPLEV_H) pointer-set.h + tree-flow-inline.h $(TIMEVAR_H) $(TREE_PASS_H) $(TOPLEV_H) pointer-set.h \ + tree-pretty-print.h gimple-pretty-print.h loop-doloop.o : loop-doloop.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ $(RTL_H) $(FLAGS_H) $(EXPR_H) hard-reg-set.h $(BASIC_BLOCK_H) $(TM_P_H) \ $(TOPLEV_H) $(CFGLOOP_H) output.h $(PARAMS_H) $(TARGET_H) @@ -3084,7 +3130,8 @@ cfgexpand.o : cfgexpand.c $(TREE_FLOW_H) $(CONFIG_H) $(SYSTEM_H) \ $(RTL_H) $(TREE_H) $(TM_P_H) $(EXPR_H) $(FUNCTION_H) $(TIMEVAR_H) $(TM_H) \ coretypes.h $(TREE_DUMP_H) $(EXCEPT_H) langhooks.h $(TREE_PASS_H) $(RTL_H) \ $(DIAGNOSTIC_H) $(TOPLEV_H) $(BASIC_BLOCK_H) $(FLAGS_H) debug.h $(PARAMS_H) \ - value-prof.h $(TREE_INLINE_H) $(TARGET_H) $(SSAEXPAND_H) + value-prof.h $(TREE_INLINE_H) $(TARGET_H) $(SSAEXPAND_H) \ + tree-pretty-print.h gimple-pretty-print.h cfgrtl.o : cfgrtl.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) \ $(FLAGS_H) insn-config.h $(BASIC_BLOCK_H) $(REGS_H) hard-reg-set.h \ output.h $(TOPLEV_H) $(FUNCTION_H) $(EXCEPT_H) $(TM_P_H) $(INSN_ATTR_H) \ @@ -3350,7 +3397,7 @@ params.o : params.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(PARAMS_H) \ pointer-set.o: pointer-set.c pointer-set.h $(CONFIG_H) $(SYSTEM_H) hooks.o: hooks.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(HOOKS_H) pretty-print.o: $(CONFIG_H) $(SYSTEM_H) coretypes.h intl.h $(PRETTY_PRINT_H) \ - $(TREE_H) $(GGC_H) + $(GGC_H) errors.o : errors.c $(CONFIG_H) $(SYSTEM_H) errors.h $(BCONFIG_H) dbgcnt.o: dbgcnt.c $(CONFIG_H) $(SYSTEM_H) coretypes.h errors.h $(DBGCNT_H) \ $(TM_H) $(RTL_H) output.h diff --git a/gcc/c-objc-common.c b/gcc/c-objc-common.c index 277e97bcab2..fccc2635fa8 100644 --- a/gcc/c-objc-common.c +++ b/gcc/c-objc-common.c @@ -1,6 +1,6 @@ /* Some code common to C and ObjC front ends. Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007, - 2009 Free Software Foundation, Inc. + 2009, 2010 Free Software Foundation, Inc. This file is part of GCC. @@ -27,6 +27,7 @@ along with GCC; see the file COPYING3. If not see #include "c-pretty-print.h" #include "flags.h" #include "diagnostic.h" +#include "tree-pretty-print.h" #include "langhooks.h" #include "c-objc-common.h" @@ -87,7 +88,7 @@ static bool c_tree_printer (pretty_printer *pp, text_info *text, const char *spec, int precision, bool wide, bool set_locus, bool hash) { - tree t = va_arg (*text->args_ptr, tree); + tree t; tree name; c_pretty_printer *cpp = (c_pretty_printer *) pp; pp->padding = pp_none; @@ -95,6 +96,14 @@ c_tree_printer (pretty_printer *pp, text_info *text, const char *spec, if (precision != 0 || wide || hash) return false; + if (*spec == 'K') + { + percent_K_format (text); + return true; + } + + t = va_arg (*text->args_ptr, tree); + if (set_locus && text->locus) *text->locus = DECL_SOURCE_LOCATION (t); diff --git a/gcc/c-pretty-print.c b/gcc/c-pretty-print.c index af62c3cfda0..f94f2c9f273 100644 --- a/gcc/c-pretty-print.c +++ b/gcc/c-pretty-print.c @@ -26,6 +26,7 @@ along with GCC; see the file COPYING3. If not see #include "tree.h" #include "intl.h" #include "c-pretty-print.h" +#include "tree-pretty-print.h" #include "c-tree.h" #include "tree-iterator.h" #include "diagnostic.h" diff --git a/gcc/cfgexpand.c b/gcc/cfgexpand.c index 5c42c1c1bf1..1d3ec849826 100644 --- a/gcc/cfgexpand.c +++ b/gcc/cfgexpand.c @@ -36,6 +36,8 @@ along with GCC; see the file COPYING3. If not see #include "except.h" #include "flags.h" #include "diagnostic.h" +#include "tree-pretty-print.h" +#include "gimple-pretty-print.h" #include "toplev.h" #include "debug.h" #include "params.h" diff --git a/gcc/cgraphunit.c b/gcc/cgraphunit.c index c811d497afd..8cd622176e7 100644 --- a/gcc/cgraphunit.c +++ b/gcc/cgraphunit.c @@ -123,6 +123,8 @@ along with GCC; see the file COPYING3. If not see #include "target.h" #include "cgraph.h" #include "diagnostic.h" +#include "tree-pretty-print.h" +#include "gimple-pretty-print.h" #include "timevar.h" #include "params.h" #include "fibheap.h" diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index bfb4456a22d..072cda0c05f 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,12 @@ +2010-05-21 Joseph Myers <joseph@codesourcery.com> + + * error.c: Include tree-diagnostic.h and tree-pretty-print.h. + (cp_print_error_function): Use diagnostic_abstract_origin macro. + (cp_printer): Handle %K here using percent_K_format. + * cxx-pretty-print.c: Include tree-pretty-print.h. + * Make-lang.in (cp/error.o, cp/cxx-pretty-print.o): Update + dependencies. + 2010-05-21 Steven Bosscher <steven@gcc.gnu.org> * error.c, tree.c, typeck2.c, cxx-pretty-print.c, mangle.c: diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in index a65c078301f..e0553a0eca7 100644 --- a/gcc/cp/Make-lang.in +++ b/gcc/cp/Make-lang.in @@ -296,7 +296,8 @@ cp/pt.o: cp/pt.c $(CXX_TREE_H) $(TM_H) cp/decl.h cp/cp-objcp-common.h \ toplev.h $(RTL_H) except.h $(TREE_INLINE_H) pointer-set.h gt-cp-pt.h \ vecprim.h intl.h cp/error.o: cp/error.c $(CXX_TREE_H) $(TM_H) toplev.h $(DIAGNOSTIC_H) \ - $(FLAGS_H) $(REAL_H) $(LANGHOOKS_DEF_H) $(CXX_PRETTY_PRINT_H) + $(FLAGS_H) $(REAL_H) $(LANGHOOKS_DEF_H) $(CXX_PRETTY_PRINT_H) \ + tree-diagnostic.h tree-pretty-print.h cp/repo.o: cp/repo.c $(CXX_TREE_H) $(TM_H) toplev.h $(DIAGNOSTIC_H) \ gt-cp-repo.h cp/semantics.o: cp/semantics.c $(CXX_TREE_H) $(TM_H) except.h toplev.h \ @@ -319,4 +320,4 @@ cp/name-lookup.o: cp/name-lookup.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \ $(DIAGNOSTIC_H) $(FLAGS_H) debug.h cp/cxx-pretty-print.o: cp/cxx-pretty-print.c $(CXX_PRETTY_PRINT_H) \ - $(CONFIG_H) $(SYSTEM_H) $(TM_H) coretypes.h $(CXX_TREE_H) + $(CONFIG_H) $(SYSTEM_H) $(TM_H) coretypes.h $(CXX_TREE_H) tree-pretty-print.h diff --git a/gcc/cp/cxx-pretty-print.c b/gcc/cp/cxx-pretty-print.c index 1c376670d60..803257d36b4 100644 --- a/gcc/cp/cxx-pretty-print.c +++ b/gcc/cp/cxx-pretty-print.c @@ -1,6 +1,6 @@ /* Implementation of subroutines for the GNU C++ pretty-printer. Copyright (C) 2003, 2004, 2005, 2007, 2008, - 2009 Free Software Foundation, Inc. + 2009, 2010 Free Software Foundation, Inc. Contributed by Gabriel Dos Reis <gdr@integrable-solutions.net> This file is part of GCC. @@ -24,6 +24,7 @@ along with GCC; see the file COPYING3. If not see #include "coretypes.h" #include "tm.h" #include "intl.h" +#include "tree-pretty-print.h" #include "cp-tree.h" #include "cxx-pretty-print.h" #include "toplev.h" diff --git a/gcc/cp/error.c b/gcc/cp/error.c index b62cfcf662c..dcdfe8921b2 100644 --- a/gcc/cp/error.c +++ b/gcc/cp/error.c @@ -1,7 +1,7 @@ /* Call-backs for C++ error reporting. This code is non-reentrant. - Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2002, - 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. + Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2003, + 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. This file is part of GCC. GCC is free software; you can redistribute it and/or modify @@ -27,9 +27,11 @@ along with GCC; see the file COPYING3. If not see #include "toplev.h" #include "flags.h" #include "diagnostic.h" +#include "tree-diagnostic.h" #include "langhooks-def.h" #include "intl.h" #include "cxx-pretty-print.h" +#include "tree-pretty-print.h" #include "pointer-set.h" #define pp_separate_with_comma(PP) pp_cxx_separate_with (PP, ',') @@ -2568,7 +2570,7 @@ cp_print_error_function (diagnostic_context *context, { const char *old_prefix = context->printer->prefix; const char *file = LOCATION_FILE (diagnostic->location); - tree abstract_origin = diagnostic->abstract_origin; + tree abstract_origin = diagnostic_abstract_origin (diagnostic); char *new_prefix = (file && abstract_origin == NULL) ? file_name_as_prefix (file) : NULL; @@ -2926,6 +2928,10 @@ cp_printer (pretty_printer *pp, text_info *text, const char *spec, case 'T': result = type_to_string (next_tree, verbose); break; case 'V': result = cv_to_string (next_tree, verbose); break; + case 'K': + percent_K_format (text); + return true; + default: return false; } diff --git a/gcc/diagnostic.c b/gcc/diagnostic.c index 4bf9b716b2f..eee97cecd33 100644 --- a/gcc/diagnostic.c +++ b/gcc/diagnostic.c @@ -26,17 +26,12 @@ along with GCC; see the file COPYING3. If not see #include "config.h" #include "system.h" #include "coretypes.h" -#include "tm.h" -#include "tree.h" #include "version.h" -#include "tm_p.h" #include "flags.h" #include "input.h" #include "toplev.h" #include "intl.h" #include "diagnostic.h" -#include "langhooks.h" -#include "langhooks-def.h" #include "opts.h" #include "plugin.h" @@ -105,7 +100,7 @@ diagnostic_initialize (diagnostic_context *context) diagnostic_starter (context) = default_diagnostic_starter; diagnostic_finalizer (context) = default_diagnostic_finalizer; context->last_module = 0; - context->last_function = NULL; + context->x_data = NULL; context->lock = 0; context->inhibit_notes_p = false; } @@ -230,16 +225,6 @@ diagnostic_action_after_output (diagnostic_context *context, } } -/* Prints out, if necessary, the name of the current function - that caused an error. Called from all error and warning functions. */ -void -diagnostic_report_current_function (diagnostic_context *context, - diagnostic_info *diagnostic) -{ - diagnostic_report_current_module (context); - lang_hooks.print_error_function (context, input_filename, diagnostic); -} - void diagnostic_report_current_module (diagnostic_context *context) { @@ -287,7 +272,7 @@ void default_diagnostic_starter (diagnostic_context *context, diagnostic_info *diagnostic) { - diagnostic_report_current_function (context, diagnostic); + diagnostic_report_current_module (context); pp_set_prefix (context->printer, diagnostic_build_prefix (diagnostic)); } @@ -460,8 +445,8 @@ diagnostic_report_diagnostic (diagnostic_context *context, NULL)); } diagnostic->message.locus = &diagnostic->location; - diagnostic->message.abstract_origin = &diagnostic->abstract_origin; - diagnostic->abstract_origin = NULL; + diagnostic->message.x_data = &diagnostic->x_data; + diagnostic->x_data = NULL; pp_format (context->printer, &diagnostic->message); (*diagnostic_starter (context)) (context, diagnostic); pp_output_formatted_text (context->printer); @@ -469,7 +454,7 @@ diagnostic_report_diagnostic (diagnostic_context *context, pp_flush (context->printer); diagnostic_action_after_output (context, diagnostic); diagnostic->message.format_spec = saved_format_spec; - diagnostic->abstract_origin = NULL; + diagnostic->x_data = NULL; context->lock--; @@ -522,7 +507,7 @@ verbatim (const char *gmsgid, ...) text.args_ptr = ≈ text.format_spec = _(gmsgid); text.locus = NULL; - text.abstract_origin = NULL; + text.x_data = NULL; pp_format_verbatim (global_dc->printer, &text); pp_flush (global_dc->printer); va_end (ap); diff --git a/gcc/diagnostic.h b/gcc/diagnostic.h index 65e8c7f0886..89c1271bf84 100644 --- a/gcc/diagnostic.h +++ b/gcc/diagnostic.h @@ -42,9 +42,8 @@ typedef struct diagnostic_info text_info message; location_t location; unsigned int override_column; - /* TREE_BLOCK if the diagnostic is to be reported in some inline - function inlined into other function, otherwise NULL. */ - tree abstract_origin; + /* Auxiliary data for client. */ + void *x_data; /* The kind of diagnostic it is about. */ diagnostic_t kind; /* Which OPT_* directly controls this diagnostic. */ @@ -103,10 +102,8 @@ struct diagnostic_context /* Client hook to report an internal error. */ void (*internal_error) (const char *, va_list *); - /* Function of last diagnostic message; more generally, function such that - if next diagnostic message is in it then we don't have to mention the - function name. */ - tree last_function; + /* Auxiliary data for client. */ + void *x_data; /* Used to detect when the input file stack has changed since last described. */ @@ -131,8 +128,9 @@ diagnostic_inhibit_notes (diagnostic_context * context) displayed. */ #define diagnostic_finalizer(DC) (DC)->end_diagnostic -/* Extension hook for client. */ -#define diagnostic_auxiliary_data(DC) (DC)->x_data +/* Extension hooks for client. */ +#define diagnostic_context_auxiliary_data(DC) (DC)->x_data +#define diagnostic_info_auxiliary_data(DI) (DI)->x_data /* Same as pp_format_decoder. Works on 'diagnostic_context *'. */ #define diagnostic_format_decoder(DC) ((DC)->printer->format_decoder) @@ -146,18 +144,6 @@ diagnostic_inhibit_notes (diagnostic_context * context) #define diagnostic_flush_buffer(DC) pp_base_flush ((DC)->printer) -/* True if the last function in which a diagnostic was reported is - different from the current one. */ -#define diagnostic_last_function_changed(DC, DI) \ - ((DC)->last_function != ((DI)->abstract_origin \ - ? (DI)->abstract_origin : current_function_decl)) - -/* Remember the current function as being the last one in which we report - a diagnostic. */ -#define diagnostic_set_last_function(DC, DI) \ - (DC)->last_function = (((DI) && (DI)->abstract_origin) \ - ? (DI)->abstract_origin : current_function_decl) - /* True if the last module or file in which a diagnostic was reported is different from the current one. */ #define diagnostic_last_module_changed(DC, MAP) \ @@ -208,8 +194,6 @@ extern diagnostic_context *global_dc; extern void diagnostic_initialize (diagnostic_context *); extern void diagnostic_finish (diagnostic_context *); extern void diagnostic_report_current_module (diagnostic_context *); -extern void diagnostic_report_current_function (diagnostic_context *, - diagnostic_info *); /* Force diagnostics controlled by OPTIDX to be kind KIND. */ extern diagnostic_t diagnostic_classify_diagnostic (diagnostic_context *, @@ -234,30 +218,4 @@ void default_diagnostic_finalizer (diagnostic_context *, diagnostic_info *); /* Pure text formatting support functions. */ extern char *file_name_as_prefix (const char *); -/* In tree-pretty-print.c */ -extern void print_declaration (pretty_printer *, tree, int, int); -extern int dump_generic_node (pretty_printer *, tree, int, int, bool); -extern void print_generic_stmt (FILE *, tree, int); -extern void print_generic_stmt_indented (FILE *, tree, int, int); -extern void print_generic_expr (FILE *, tree, int); -extern void print_generic_decl (FILE *, tree, int); -extern void debug_c_tree (tree); -extern void dump_omp_clauses (pretty_printer *, tree, int, int); -extern void print_call_name (pretty_printer *, tree, int); - -/* In gimple-pretty-print.c */ -extern void debug_generic_expr (tree); -extern void debug_generic_stmt (tree); -extern void debug_tree_chain (tree); -extern void debug_gimple_stmt (gimple); -extern void debug_gimple_seq (gimple_seq); -extern void print_gimple_seq (FILE *, gimple_seq, int, int); -extern void print_gimple_stmt (FILE *, gimple, int, int); -extern void print_gimple_expr (FILE *, gimple, int, int); -extern void dump_gimple_stmt (pretty_printer *, gimple, int, int); - -/* In toplev.c */ -extern bool default_tree_printer (pretty_printer *, text_info *, const char *, - int, bool, bool, bool); - #endif /* ! GCC_DIAGNOSTIC_H */ diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c index df9cccebec3..fbf581bc2f6 100644 --- a/gcc/dwarf2out.c +++ b/gcc/dwarf2out.c @@ -82,6 +82,7 @@ along with GCC; see the file COPYING3. If not see #include "md5.h" #include "tm_p.h" #include "diagnostic.h" +#include "tree-pretty-print.h" #include "debug.h" #include "target.h" #include "langhooks.h" diff --git a/gcc/except.c b/gcc/except.c index fccfb735d6a..d7efa93c8b3 100644 --- a/gcc/except.c +++ b/gcc/except.c @@ -139,6 +139,7 @@ along with GCC; see the file COPYING3. If not see #include "langhooks.h" #include "cgraph.h" #include "diagnostic.h" +#include "tree-pretty-print.h" #include "tree-pass.h" #include "timevar.h" #include "tree-flow.h" diff --git a/gcc/gimple-pretty-print.c b/gcc/gimple-pretty-print.c index 371e35e851f..0480f9d4396 100644 --- a/gcc/gimple-pretty-print.c +++ b/gcc/gimple-pretty-print.c @@ -1,5 +1,5 @@ /* Pretty formatting of GIMPLE statements and expressions. - Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 + Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. Contributed by Aldy Hernandez <aldyh@redhat.com> and Diego Novillo <dnovillo@google.com> @@ -26,6 +26,8 @@ along with GCC; see the file COPYING3. If not see #include "tm.h" #include "tree.h" #include "diagnostic.h" +#include "tree-pretty-print.h" +#include "gimple-pretty-print.h" #include "hashtab.h" #include "tree-flow.h" #include "tree-pass.h" diff --git a/gcc/gimple-pretty-print.h b/gcc/gimple-pretty-print.h new file mode 100644 index 00000000000..4d2fd4bb942 --- /dev/null +++ b/gcc/gimple-pretty-print.h @@ -0,0 +1,33 @@ +/* Various declarations for pretty formatting of GIMPLE statements and + expressions. + Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 + 2010, Free Software Foundation, Inc. + +This file is part of GCC. + +GCC is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation; either version 3, or (at your option) any later +version. + +GCC is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with GCC; see the file COPYING3. If not see +<http://www.gnu.org/licenses/>. */ + +#ifndef GCC_GIMPLE_PRETTY_PRINT_H +#define GCC_GIMPLE_PRETTY_PRINT_H + +/* In gimple-pretty-print.c */ +extern void debug_gimple_stmt (gimple); +extern void debug_gimple_seq (gimple_seq); +extern void print_gimple_seq (FILE *, gimple_seq, int, int); +extern void print_gimple_stmt (FILE *, gimple, int, int); +extern void print_gimple_expr (FILE *, gimple, int, int); +extern void dump_gimple_stmt (pretty_printer *, gimple, int, int); + +#endif /* ! GCC_GIMPLE_PRETTY_PRINT_H */ diff --git a/gcc/gimplify.c b/gcc/gimplify.c index 17215dc02c0..66b6b520853 100644 --- a/gcc/gimplify.c +++ b/gcc/gimplify.c @@ -31,6 +31,7 @@ along with GCC; see the file COPYING3. If not see #include "tree-iterator.h" #include "tree-inline.h" #include "diagnostic.h" +#include "tree-pretty-print.h" #include "langhooks.h" #include "langhooks-def.h" #include "tree-flow.h" diff --git a/gcc/graphite-poly.c b/gcc/graphite-poly.c index d25796f5dcf..64222809ca2 100644 --- a/gcc/graphite-poly.c +++ b/gcc/graphite-poly.c @@ -28,6 +28,8 @@ along with GCC; see the file COPYING3. If not see #include "output.h" #include "basic-block.h" #include "diagnostic.h" +#include "tree-pretty-print.h" +#include "gimple-pretty-print.h" #include "tree-flow.h" #include "toplev.h" #include "tree-dump.h" diff --git a/gcc/ipa-cp.c b/gcc/ipa-cp.c index a1bfe0e8701..5c953b4c4ba 100644 --- a/gcc/ipa-cp.c +++ b/gcc/ipa-cp.c @@ -131,6 +131,7 @@ along with GCC; see the file COPYING3. If not see #include "flags.h" #include "timevar.h" #include "diagnostic.h" +#include "tree-pretty-print.h" #include "tree-dump.h" #include "tree-inline.h" #include "fibheap.h" diff --git a/gcc/ipa-inline.c b/gcc/ipa-inline.c index 12757f7a2a3..38a9c56b282 100644 --- a/gcc/ipa-inline.c +++ b/gcc/ipa-inline.c @@ -128,6 +128,7 @@ along with GCC; see the file COPYING3. If not see #include "flags.h" #include "cgraph.h" #include "diagnostic.h" +#include "gimple-pretty-print.h" #include "timevar.h" #include "params.h" #include "fibheap.h" diff --git a/gcc/ipa-prop.c b/gcc/ipa-prop.c index db2a47036e9..b3e8cfa61dc 100644 --- a/gcc/ipa-prop.c +++ b/gcc/ipa-prop.c @@ -35,6 +35,8 @@ along with GCC; see the file COPYING3. If not see #include "timevar.h" #include "flags.h" #include "diagnostic.h" +#include "tree-pretty-print.h" +#include "gimple-pretty-print.h" #include "lto-streamer.h" /* Vector where the parameter infos are actually stored. */ diff --git a/gcc/ipa-pure-const.c b/gcc/ipa-pure-const.c index d1fe0595b6c..0bfb7ee51d6 100644 --- a/gcc/ipa-pure-const.c +++ b/gcc/ipa-pure-const.c @@ -51,6 +51,7 @@ along with GCC; see the file COPYING3. If not see #include "timevar.h" #include "toplev.h" #include "diagnostic.h" +#include "gimple-pretty-print.h" #include "langhooks.h" #include "target.h" #include "lto-streamer.h" diff --git a/gcc/ipa-struct-reorg.c b/gcc/ipa-struct-reorg.c index 460c23fc9ed..6ace2fcd0d7 100644 --- a/gcc/ipa-struct-reorg.c +++ b/gcc/ipa-struct-reorg.c @@ -40,6 +40,8 @@ along with GCC; see the file COPYING3. If not see #include "target.h" #include "cgraph.h" #include "diagnostic.h" +#include "tree-pretty-print.h" +#include "gimple-pretty-print.h" #include "timevar.h" #include "params.h" #include "fibheap.h" diff --git a/gcc/ipa-type-escape.c b/gcc/ipa-type-escape.c index c2cb3e87718..b6744a6e042 100644 --- a/gcc/ipa-type-escape.c +++ b/gcc/ipa-type-escape.c @@ -53,6 +53,7 @@ along with GCC; see the file COPYING3. If not see #include "flags.h" #include "timevar.h" #include "diagnostic.h" +#include "tree-pretty-print.h" #include "langhooks.h" /* Some of the aliasing is called very early, before this phase is diff --git a/gcc/langhooks.c b/gcc/langhooks.c index 92eacd465e0..37baa271e70 100644 --- a/gcc/langhooks.c +++ b/gcc/langhooks.c @@ -1,5 +1,5 @@ /* Default language-specific hooks. - Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 + Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. Contributed by Alexandre Oliva <aoliva@redhat.com> @@ -37,6 +37,7 @@ along with GCC; see the file COPYING3. If not see #include "langhooks-def.h" #include "ggc.h" #include "diagnostic.h" +#include "tree-diagnostic.h" #include "cgraph.h" #include "output.h" @@ -345,7 +346,7 @@ lhd_print_error_function (diagnostic_context *context, const char *file, if (diagnostic_last_function_changed (context, diagnostic)) { const char *old_prefix = context->printer->prefix; - tree abstract_origin = diagnostic->abstract_origin; + tree abstract_origin = diagnostic_abstract_origin (diagnostic); char *new_prefix = (file && abstract_origin == NULL) ? file_name_as_prefix (file) : NULL; diff --git a/gcc/pretty-print.c b/gcc/pretty-print.c index 1d6b2cb2452..af28387b700 100644 --- a/gcc/pretty-print.c +++ b/gcc/pretty-print.c @@ -1,5 +1,6 @@ /* Various declarations for language-independent pretty-print subroutines. - Copyright (C) 2003, 2004, 2005, 2007, 2008 Free Software Foundation, Inc. + Copyright (C) 2003, 2004, 2005, 2007, 2008, 2009, 2010 + Free Software Foundation, Inc. Contributed by Gabriel Dos Reis <gdr@integrable-solutions.net> This file is part of GCC. @@ -23,7 +24,6 @@ along with GCC; see the file COPYING3. If not see #include "coretypes.h" #include "intl.h" #include "pretty-print.h" -#include "tree.h" #include "ggc.h" #if HAVE_ICONV @@ -188,7 +188,6 @@ pp_base_indent (pretty_printer *pp) %.*s: a substring the length of which is specified by an argument integer. %Ns: likewise, but length specified as constant in the format string. - %K: a statement, from which EXPR_LOCATION and TREE_BLOCK will be recorded. Flag 'q': quote formatted text (must come immediately after '%'). Arguments can be used sequentially, or through %N$ resp. *N$ @@ -472,35 +471,6 @@ pp_base_format (pretty_printer *pp, text_info *text) (pp, *text->args_ptr, precision, unsigned, "x"); break; - case 'K': - { - tree t = va_arg (*text->args_ptr, tree), block; - gcc_assert (text->locus != NULL); - *text->locus = EXPR_LOCATION (t); - gcc_assert (text->abstract_origin != NULL); - block = TREE_BLOCK (t); - *text->abstract_origin = NULL; - while (block - && TREE_CODE (block) == BLOCK - && BLOCK_ABSTRACT_ORIGIN (block)) - { - tree ao = BLOCK_ABSTRACT_ORIGIN (block); - - while (TREE_CODE (ao) == BLOCK - && BLOCK_ABSTRACT_ORIGIN (ao) - && BLOCK_ABSTRACT_ORIGIN (ao) != ao) - ao = BLOCK_ABSTRACT_ORIGIN (ao); - - if (TREE_CODE (ao) == FUNCTION_DECL) - { - *text->abstract_origin = block; - break; - } - block = BLOCK_SUPERCONTEXT (block); - } - } - break; - case '.': { int n; @@ -830,21 +800,6 @@ pp_base_maybe_space (pretty_printer *pp) pp_base (pp)->padding = pp_none; } } - -/* Print the identifier ID to PRETTY-PRINTER. */ - -void -pp_base_tree_identifier (pretty_printer *pp, tree id) -{ - if (pp_translate_identifiers (pp)) - { - const char *text = identifier_to_locale (IDENTIFIER_POINTER (id)); - pp_append_text (pp, text, text + strlen (text)); - } - else - pp_append_text (pp, IDENTIFIER_POINTER (id), - IDENTIFIER_POINTER (id) + IDENTIFIER_LENGTH (id)); -} /* The string starting at P has LEN (at least 1) bytes left; if they start with a valid UTF-8 sequence, return the length of that diff --git a/gcc/pretty-print.h b/gcc/pretty-print.h index 3ba50353850..c3c3e6dc4dd 100644 --- a/gcc/pretty-print.h +++ b/gcc/pretty-print.h @@ -1,5 +1,6 @@ /* Various declarations for language-independent pretty-print subroutines. - Copyright (C) 2002, 2003, 2004, 2007, 2008 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2007, 2008, 2009, 2010 + Free Software Foundation, Inc. Contributed by Gabriel Dos Reis <gdr@integrable-solutions.net> This file is part of GCC. @@ -35,7 +36,7 @@ typedef struct va_list *args_ptr; int err_no; /* for %m */ location_t *locus; - tree *abstract_origin; + void **x_data; } text_info; /* How often diagnostics are prefixed by their locations: @@ -284,12 +285,6 @@ struct pretty_print_info #define pp_identifier(PP, ID) pp_string (PP, (pp_translate_identifiers (PP) \ ? identifier_to_locale (ID) \ : (ID))) -#define pp_tree_identifier(PP, T) \ - pp_base_tree_identifier (pp_base (PP), T) - -#define pp_unsupported_tree(PP, T) \ - pp_verbatim (pp_base (PP), "#%qs not supported by %s#", \ - tree_code_name[(int) TREE_CODE (T)], __FUNCTION__) #define pp_buffer(PP) pp_base (PP)->buffer @@ -331,7 +326,6 @@ extern void pp_base_character (pretty_printer *, int); extern void pp_base_string (pretty_printer *, const char *); extern void pp_write_text_to_stream (pretty_printer *pp); extern void pp_base_maybe_space (pretty_printer *); -extern void pp_base_tree_identifier (pretty_printer *, tree); /* Switch into verbatim mode and return the old mode. */ static inline pp_wrapping_mode_t diff --git a/gcc/print-rtl.c b/gcc/print-rtl.c index c5a66471694..c4533509ab1 100644 --- a/gcc/print-rtl.c +++ b/gcc/print-rtl.c @@ -40,6 +40,7 @@ along with GCC; see the file COPYING3. If not see #include "hard-reg-set.h" #include "basic-block.h" #include "diagnostic.h" +#include "tree-pretty-print.h" #include "cselib.h" #include "tree-pass.h" #endif diff --git a/gcc/print-tree.c b/gcc/print-tree.c index d75efa72380..f1a2455b396 100644 --- a/gcc/print-tree.c +++ b/gcc/print-tree.c @@ -29,6 +29,7 @@ along with GCC; see the file COPYING3. If not see #include "langhooks.h" #include "tree-iterator.h" #include "diagnostic.h" +#include "gimple-pretty-print.h" #include "tree-flow.h" #include "tree-pass.h" diff --git a/gcc/sese.c b/gcc/sese.c index e67628e4687..7f71f056ad2 100644 --- a/gcc/sese.c +++ b/gcc/sese.c @@ -29,6 +29,7 @@ along with GCC; see the file COPYING3. If not see #include "rtl.h" #include "basic-block.h" #include "diagnostic.h" +#include "tree-pretty-print.h" #include "tree-flow.h" #include "toplev.h" #include "tree-dump.h" diff --git a/gcc/toplev.c b/gcc/toplev.c index 364a2aafcf5..3cf65bad077 100644 --- a/gcc/toplev.c +++ b/gcc/toplev.c @@ -63,6 +63,8 @@ along with GCC; see the file COPYING3. If not see #include "regs.h" #include "timevar.h" #include "diagnostic.h" +#include "tree-diagnostic.h" +#include "tree-pretty-print.h" #include "params.h" #include "reload.h" #include "ira.h" @@ -1632,6 +1634,10 @@ default_tree_printer (pretty_printer *pp, text_info *text, const char *spec, t = va_arg (*text->args_ptr, tree); break; + case 'K': + percent_K_format (text); + return true; + default: return false; } @@ -1685,6 +1691,7 @@ general_init (const char *argv0) /* Initialize the diagnostics reporting machinery, so option parsing can give warnings and errors. */ diagnostic_initialize (global_dc); + diagnostic_starter (global_dc) = default_tree_diagnostic_starter; /* Set a default printer. Language specific initializations will override it later. */ pp_format_decoder (global_dc->printer) = &default_tree_printer; diff --git a/gcc/tree-affine.c b/gcc/tree-affine.c index 2dc6254a519..c6c28bd970e 100644 --- a/gcc/tree-affine.c +++ b/gcc/tree-affine.c @@ -1,5 +1,5 @@ /* Operations with affine combinations of trees. - Copyright (C) 2005, 2007, 2008 Free Software Foundation, Inc. + Copyright (C) 2005, 2007, 2008, 2010 Free Software Foundation, Inc. This file is part of GCC. @@ -23,6 +23,7 @@ along with GCC; see the file COPYING3. If not see #include "tree.h" #include "output.h" #include "diagnostic.h" +#include "tree-pretty-print.h" #include "tree-dump.h" #include "pointer-set.h" #include "tree-affine.h" diff --git a/gcc/tree-browser.c b/gcc/tree-browser.c index 188bea6cde5..0180d3ae4f7 100644 --- a/gcc/tree-browser.c +++ b/gcc/tree-browser.c @@ -1,5 +1,6 @@ /* Tree browser. - Copyright (C) 2002, 2003, 2004, 2007, 2008 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2007, 2008, 2010 + Free Software Foundation, Inc. Contributed by Sebastian Pop <s.pop@laposte.net> This file is part of GCC. @@ -25,6 +26,7 @@ along with GCC; see the file COPYING3. If not see #include "tree.h" #include "tree-inline.h" #include "diagnostic.h" +#include "tree-pretty-print.h" #include "hashtab.h" diff --git a/gcc/tree-call-cdce.c b/gcc/tree-call-cdce.c index 25a0dfc4958..6517742ca70 100644 --- a/gcc/tree-call-cdce.c +++ b/gcc/tree-call-cdce.c @@ -1,5 +1,5 @@ /* Conditional Dead Call Elimination pass for the GNU compiler. - Copyright (C) 2008 + Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. Contributed by Xinliang David Li <davidxl@google.com> @@ -26,6 +26,7 @@ along with GCC; see the file COPYING3. If not see #include "basic-block.h" #include "tree.h" #include "diagnostic.h" +#include "gimple-pretty-print.h" #include "tree-flow.h" #include "gimple.h" #include "tree-dump.h" diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c index ba734150fc3..ec69dd89070 100644 --- a/gcc/tree-cfg.c +++ b/gcc/tree-cfg.c @@ -33,6 +33,8 @@ along with GCC; see the file COPYING3. If not see #include "ggc.h" #include "langhooks.h" #include "diagnostic.h" +#include "tree-pretty-print.h" +#include "gimple-pretty-print.h" #include "tree-flow.h" #include "timevar.h" #include "tree-dump.h" diff --git a/gcc/tree-chrec.c b/gcc/tree-chrec.c index e7b674559b7..b0cc8b22b01 100644 --- a/gcc/tree-chrec.c +++ b/gcc/tree-chrec.c @@ -31,6 +31,7 @@ along with GCC; see the file COPYING3. If not see #include "ggc.h" #include "tree.h" #include "diagnostic.h" +#include "tree-pretty-print.h" #include "cfgloop.h" #include "tree-flow.h" #include "tree-chrec.h" diff --git a/gcc/tree-data-ref.c b/gcc/tree-data-ref.c index 0c7990b2866..40f7a4407c7 100644 --- a/gcc/tree-data-ref.c +++ b/gcc/tree-data-ref.c @@ -85,6 +85,8 @@ along with GCC; see the file COPYING3. If not see /* These RTL headers are needed for basic-block.h. */ #include "basic-block.h" #include "diagnostic.h" +#include "tree-pretty-print.h" +#include "gimple-pretty-print.h" #include "tree-flow.h" #include "tree-dump.h" #include "timevar.h" diff --git a/gcc/tree-dfa.c b/gcc/tree-dfa.c index bb5fd5467a1..ed70d745e01 100644 --- a/gcc/tree-dfa.c +++ b/gcc/tree-dfa.c @@ -1,5 +1,5 @@ /* Data flow functions for trees. - Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009 + Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. Contributed by Diego Novillo <dnovillo@redhat.com> @@ -36,6 +36,7 @@ along with GCC; see the file COPYING3. If not see #include "flags.h" #include "function.h" #include "diagnostic.h" +#include "tree-pretty-print.h" #include "tree-dump.h" #include "gimple.h" #include "tree-flow.h" diff --git a/gcc/tree-diagnostic.c b/gcc/tree-diagnostic.c new file mode 100644 index 00000000000..76fd129d52d --- /dev/null +++ b/gcc/tree-diagnostic.c @@ -0,0 +1,48 @@ +/* Language-independent diagnostic subroutines for the GNU Compiler + Collection that are only for use in the compilers proper and not + the driver or other programs. + Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, + 2009, 2010 Free Software Foundation, Inc. + +This file is part of GCC. + +GCC is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation; either version 3, or (at your option) any later +version. + +GCC is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with GCC; see the file COPYING3. If not see +<http://www.gnu.org/licenses/>. */ + +#include "config.h" +#include "system.h" +#include "coretypes.h" +#include "tree.h" +#include "diagnostic.h" +#include "tree-diagnostic.h" +#include "langhooks.h" +#include "langhooks-def.h" + +/* Prints out, if necessary, the name of the current function + that caused an error. Called from all error and warning functions. */ +void +diagnostic_report_current_function (diagnostic_context *context, + diagnostic_info *diagnostic) +{ + diagnostic_report_current_module (context); + lang_hooks.print_error_function (context, input_filename, diagnostic); +} + +void +default_tree_diagnostic_starter (diagnostic_context *context, + diagnostic_info *diagnostic) +{ + diagnostic_report_current_function (context, diagnostic); + pp_set_prefix (context->printer, diagnostic_build_prefix (diagnostic)); +} diff --git a/gcc/tree-diagnostic.h b/gcc/tree-diagnostic.h new file mode 100644 index 00000000000..7d88089069f --- /dev/null +++ b/gcc/tree-diagnostic.h @@ -0,0 +1,56 @@ +/* Various declarations for language-independent diagnostics + subroutines that are only for use in the compilers proper and not + the driver or other programs. + Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 + 2010, Free Software Foundation, Inc. + +This file is part of GCC. + +GCC is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation; either version 3, or (at your option) any later +version. + +GCC is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with GCC; see the file COPYING3. If not see +<http://www.gnu.org/licenses/>. */ + +#ifndef GCC_TREE_DIAGNOSTIC_H +#define GCC_TREE_DIAGNOSTIC_H + +/* TREE_BLOCK if the diagnostic is to be reported in some inline + function inlined into other function, otherwise NULL. */ +#define diagnostic_abstract_origin(DI) \ + ((tree) diagnostic_info_auxiliary_data (DI)) + +/* Function of last diagnostic message; more generally, function such + that if next diagnostic message is in it then we don't have to + mention the function name. */ +#define diagnostic_last_function(DC) \ + ((tree) diagnostic_context_auxiliary_data (DC)) + +/* True if the last function in which a diagnostic was reported is + different from the current one. */ +#define diagnostic_last_function_changed(DC, DI) \ + (diagnostic_last_function (DC) != (diagnostic_abstract_origin (DI) \ + ? diagnostic_abstract_origin (DI) \ + : current_function_decl)) + +/* Remember the current function as being the last one in which we report + a diagnostic. */ +#define diagnostic_set_last_function(DC, DI) \ + diagnostic_context_auxiliary_data (DC) \ + = (((DI) && diagnostic_abstract_origin (DI)) \ + ? diagnostic_abstract_origin (DI) \ + : current_function_decl) + +void default_tree_diagnostic_starter (diagnostic_context *, diagnostic_info *); +extern void diagnostic_report_current_function (diagnostic_context *, + diagnostic_info *); + +#endif /* ! GCC_TREE_DIAGNOSTIC_H */ diff --git a/gcc/tree-if-conv.c b/gcc/tree-if-conv.c index 9084954e5e6..adbdfd8fcc2 100644 --- a/gcc/tree-if-conv.c +++ b/gcc/tree-if-conv.c @@ -1,5 +1,5 @@ /* If-conversion for vectorizer. - Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 + Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. Contributed by Devang Patel <dpatel@apple.com> @@ -90,6 +90,8 @@ along with GCC; see the file COPYING3. If not see #include "timevar.h" #include "basic-block.h" #include "diagnostic.h" +#include "tree-pretty-print.h" +#include "gimple-pretty-print.h" #include "tree-flow.h" #include "tree-dump.h" #include "cfgloop.h" diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c index 468aa011daa..4c51f3b10c8 100644 --- a/gcc/tree-inline.c +++ b/gcc/tree-inline.c @@ -42,6 +42,7 @@ along with GCC; see the file COPYING3. If not see #include "function.h" #include "tree-flow.h" #include "diagnostic.h" +#include "tree-pretty-print.h" #include "except.h" #include "debug.h" #include "pointer-set.h" diff --git a/gcc/tree-into-ssa.c b/gcc/tree-into-ssa.c index 98ad1a1526d..ddb3c24b7da 100644 --- a/gcc/tree-into-ssa.c +++ b/gcc/tree-into-ssa.c @@ -32,6 +32,8 @@ along with GCC; see the file COPYING3. If not see #include "expr.h" #include "function.h" #include "diagnostic.h" +#include "tree-pretty-print.h" +#include "gimple-pretty-print.h" #include "bitmap.h" #include "tree-flow.h" #include "gimple.h" diff --git a/gcc/tree-nrv.c b/gcc/tree-nrv.c index ba22e60a988..06b13511e25 100644 --- a/gcc/tree-nrv.c +++ b/gcc/tree-nrv.c @@ -1,5 +1,6 @@ /* Language independent return value optimizations - Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation, Inc. + Copyright (C) 2004, 2005, 2007, 2008, 2009, 2010 + Free Software Foundation, Inc. This file is part of GCC. @@ -25,6 +26,7 @@ along with GCC; see the file COPYING3. If not see #include "function.h" #include "basic-block.h" #include "diagnostic.h" +#include "tree-pretty-print.h" #include "tree-flow.h" #include "timevar.h" #include "tree-dump.h" diff --git a/gcc/tree-object-size.c b/gcc/tree-object-size.c index 2892e84600c..35b3c44707e 100644 --- a/gcc/tree-object-size.c +++ b/gcc/tree-object-size.c @@ -1,5 +1,5 @@ /* __builtin_object_size (ptr, object_size_type) computation - Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 + Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. Contributed by Jakub Jelinek <jakub@redhat.com> @@ -26,6 +26,8 @@ along with GCC; see the file COPYING3. If not see #include "tree.h" #include "toplev.h" #include "diagnostic.h" +#include "tree-pretty-print.h" +#include "gimple-pretty-print.h" #include "tree-flow.h" #include "tree-pass.h" #include "tree-ssa-propagate.h" diff --git a/gcc/tree-outof-ssa.c b/gcc/tree-outof-ssa.c index 227b06fad85..26395710eb8 100644 --- a/gcc/tree-outof-ssa.c +++ b/gcc/tree-outof-ssa.c @@ -27,6 +27,8 @@ along with GCC; see the file COPYING3. If not see #include "ggc.h" #include "basic-block.h" #include "diagnostic.h" +#include "tree-pretty-print.h" +#include "gimple-pretty-print.h" #include "bitmap.h" #include "tree-flow.h" #include "timevar.h" diff --git a/gcc/tree-parloops.c b/gcc/tree-parloops.c index 3c9a1d2826a..f38ae17d89a 100644 --- a/gcc/tree-parloops.c +++ b/gcc/tree-parloops.c @@ -29,6 +29,8 @@ along with GCC; see the file COPYING3. If not see #include "cfgloop.h" #include "tree-data-ref.h" #include "diagnostic.h" +#include "tree-pretty-print.h" +#include "gimple-pretty-print.h" #include "tree-pass.h" #include "tree-scalar-evolution.h" #include "hashtab.h" diff --git a/gcc/tree-predcom.c b/gcc/tree-predcom.c index 41873cefb8c..dd7b6e2cdde 100644 --- a/gcc/tree-predcom.c +++ b/gcc/tree-predcom.c @@ -199,6 +199,8 @@ along with GCC; see the file COPYING3. If not see #include "tree-chrec.h" #include "params.h" #include "diagnostic.h" +#include "tree-pretty-print.h" +#include "gimple-pretty-print.h" #include "tree-pass.h" #include "tree-affine.h" #include "tree-inline.h" diff --git a/gcc/tree-pretty-print.c b/gcc/tree-pretty-print.c index 8d75c949fbd..8852c05cb85 100644 --- a/gcc/tree-pretty-print.c +++ b/gcc/tree-pretty-print.c @@ -1,5 +1,5 @@ /* Pretty formatting of GENERIC trees in C syntax. - Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 + Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. Adapted from c-pretty-print.c by Diego Novillo <dnovillo@redhat.com> @@ -26,6 +26,7 @@ along with GCC; see the file COPYING3. If not see #include "tree.h" #include "output.h" #include "diagnostic.h" +#include "tree-pretty-print.h" #include "hashtab.h" #include "tree-flow.h" #include "langhooks.h" @@ -2855,3 +2856,52 @@ newline_and_indent (pretty_printer *buffer, int spc) pp_newline (buffer); INDENT (spc); } + +/* Handle a %K format for TEXT. Separate from default_tree_printer so + it can also be used in front ends. + %K: a statement, from which EXPR_LOCATION and TREE_BLOCK will be recorded. +*/ + +void +percent_K_format (text_info *text) +{ + tree t = va_arg (*text->args_ptr, tree), block; + gcc_assert (text->locus != NULL); + *text->locus = EXPR_LOCATION (t); + gcc_assert (pp_ti_abstract_origin (text) != NULL); + block = TREE_BLOCK (t); + *pp_ti_abstract_origin (text) = NULL; + while (block + && TREE_CODE (block) == BLOCK + && BLOCK_ABSTRACT_ORIGIN (block)) + { + tree ao = BLOCK_ABSTRACT_ORIGIN (block); + + while (TREE_CODE (ao) == BLOCK + && BLOCK_ABSTRACT_ORIGIN (ao) + && BLOCK_ABSTRACT_ORIGIN (ao) != ao) + ao = BLOCK_ABSTRACT_ORIGIN (ao); + + if (TREE_CODE (ao) == FUNCTION_DECL) + { + *pp_ti_abstract_origin (text) = block; + break; + } + block = BLOCK_SUPERCONTEXT (block); + } +} + +/* Print the identifier ID to PRETTY-PRINTER. */ + +void +pp_base_tree_identifier (pretty_printer *pp, tree id) +{ + if (pp_translate_identifiers (pp)) + { + const char *text = identifier_to_locale (IDENTIFIER_POINTER (id)); + pp_append_text (pp, text, text + strlen (text)); + } + else + pp_append_text (pp, IDENTIFIER_POINTER (id), + IDENTIFIER_POINTER (id) + IDENTIFIER_LENGTH (id)); +} diff --git a/gcc/tree-pretty-print.h b/gcc/tree-pretty-print.h new file mode 100644 index 00000000000..ef4cd27f8b5 --- /dev/null +++ b/gcc/tree-pretty-print.h @@ -0,0 +1,56 @@ +/* Various declarations for language-independent pretty-print + subroutines that are only for use in the compilers proper and not + the driver or other programs. + Copyright (C) 2002, 2003, 2004, 2007, 2008, 2009, 2010 + Free Software Foundation, Inc. + +This file is part of GCC. + +GCC is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation; either version 3, or (at your option) any later +version. + +GCC is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with GCC; see the file COPYING3. If not see +<http://www.gnu.org/licenses/>. */ + +#ifndef GCC_TREE_PRETTY_PRINT_H +#define GCC_TREE_PRETTY_PRINT_H + +#define pp_tree_identifier(PP, T) \ + pp_base_tree_identifier (pp_base (PP), T) + +#define pp_unsupported_tree(PP, T) \ + pp_verbatim (pp_base (PP), "#%qs not supported by %s#", \ + tree_code_name[(int) TREE_CODE (T)], __FUNCTION__) + +#define pp_ti_abstract_origin(TI) ((tree *) (TI)->x_data) + +extern void pp_base_tree_identifier (pretty_printer *, tree); + +/* In tree-pretty-print.c */ +extern void print_declaration (pretty_printer *, tree, int, int); +extern int dump_generic_node (pretty_printer *, tree, int, int, bool); +extern void print_generic_stmt (FILE *, tree, int); +extern void print_generic_stmt_indented (FILE *, tree, int, int); +extern void print_generic_expr (FILE *, tree, int); +extern void print_generic_decl (FILE *, tree, int); +extern void debug_c_tree (tree); +extern void dump_omp_clauses (pretty_printer *, tree, int, int); +extern void print_call_name (pretty_printer *, tree, int); +extern void debug_generic_expr (tree); +extern void debug_generic_stmt (tree); +extern void debug_tree_chain (tree); +extern void percent_K_format (text_info *); + +/* In toplev.c */ +extern bool default_tree_printer (pretty_printer *, text_info *, const char *, + int, bool, bool, bool); + +#endif /* ! GCC_TREE_PRETTY_PRINT_H */ diff --git a/gcc/tree-scalar-evolution.c b/gcc/tree-scalar-evolution.c index b924ef1a07c..e2ed1f59ee2 100644 --- a/gcc/tree-scalar-evolution.c +++ b/gcc/tree-scalar-evolution.c @@ -262,6 +262,8 @@ along with GCC; see the file COPYING3. If not see #include "tree.h" #include "basic-block.h" #include "diagnostic.h" +#include "tree-pretty-print.h" +#include "gimple-pretty-print.h" #include "tree-flow.h" #include "tree-dump.h" #include "timevar.h" diff --git a/gcc/tree-sra.c b/gcc/tree-sra.c index 08c03e17781..ae038f9a441 100644 --- a/gcc/tree-sra.c +++ b/gcc/tree-sra.c @@ -83,6 +83,7 @@ along with GCC; see the file COPYING3. If not see #include "tree-flow.h" #include "ipa-prop.h" #include "diagnostic.h" +#include "tree-pretty-print.h" #include "statistics.h" #include "tree-dump.h" #include "timevar.h" diff --git a/gcc/tree-ssa-address.c b/gcc/tree-ssa-address.c index 17257ab3ffa..f22b07d2ad2 100644 --- a/gcc/tree-ssa-address.c +++ b/gcc/tree-ssa-address.c @@ -30,6 +30,7 @@ along with GCC; see the file COPYING3. If not see #include "basic-block.h" #include "output.h" #include "diagnostic.h" +#include "tree-pretty-print.h" #include "tree-flow.h" #include "tree-dump.h" #include "tree-pass.h" diff --git a/gcc/tree-ssa-alias.c b/gcc/tree-ssa-alias.c index a68ec10ec64..2db30587324 100644 --- a/gcc/tree-ssa-alias.c +++ b/gcc/tree-ssa-alias.c @@ -33,6 +33,7 @@ along with GCC; see the file COPYING3. If not see #include "flags.h" #include "function.h" #include "diagnostic.h" +#include "tree-pretty-print.h" #include "tree-dump.h" #include "gimple.h" #include "tree-flow.h" diff --git a/gcc/tree-ssa-ccp.c b/gcc/tree-ssa-ccp.c index 1d47fa3f8ed..d4a7a31c101 100644 --- a/gcc/tree-ssa-ccp.c +++ b/gcc/tree-ssa-ccp.c @@ -197,6 +197,8 @@ along with GCC; see the file COPYING3. If not see #include "expr.h" #include "function.h" #include "diagnostic.h" +#include "tree-pretty-print.h" +#include "gimple-pretty-print.h" #include "timevar.h" #include "tree-dump.h" #include "tree-flow.h" diff --git a/gcc/tree-ssa-coalesce.c b/gcc/tree-ssa-coalesce.c index 4a040152dd4..6c843605573 100644 --- a/gcc/tree-ssa-coalesce.c +++ b/gcc/tree-ssa-coalesce.c @@ -26,6 +26,7 @@ along with GCC; see the file COPYING3. If not see #include "tree.h" #include "flags.h" #include "diagnostic.h" +#include "tree-pretty-print.h" #include "bitmap.h" #include "tree-flow.h" #include "hashtab.h" diff --git a/gcc/tree-ssa-copy.c b/gcc/tree-ssa-copy.c index 43dec41176f..afa9acef335 100644 --- a/gcc/tree-ssa-copy.c +++ b/gcc/tree-ssa-copy.c @@ -30,6 +30,8 @@ along with GCC; see the file COPYING3. If not see #include "expr.h" #include "function.h" #include "diagnostic.h" +#include "tree-pretty-print.h" +#include "gimple-pretty-print.h" #include "timevar.h" #include "tree-dump.h" #include "tree-flow.h" diff --git a/gcc/tree-ssa-copyrename.c b/gcc/tree-ssa-copyrename.c index d62a09416d1..c236de34d96 100644 --- a/gcc/tree-ssa-copyrename.c +++ b/gcc/tree-ssa-copyrename.c @@ -1,5 +1,6 @@ /* Rename SSA copies. - Copyright (C) 2004, 2006, 2007, 2008 Free Software Foundation, Inc. + Copyright (C) 2004, 2006, 2007, 2008, 2009, 2010 + Free Software Foundation, Inc. Contributed by Andrew MacLeod <amacleod@redhat.com> This file is part of GCC. @@ -28,6 +29,7 @@ along with GCC; see the file COPYING3. If not see #include "basic-block.h" #include "function.h" #include "diagnostic.h" +#include "tree-pretty-print.h" #include "bitmap.h" #include "tree-flow.h" #include "gimple.h" diff --git a/gcc/tree-ssa-dce.c b/gcc/tree-ssa-dce.c index 57830a6a710..00bf012d715 100644 --- a/gcc/tree-ssa-dce.c +++ b/gcc/tree-ssa-dce.c @@ -50,6 +50,8 @@ along with GCC; see the file COPYING3. If not see #include "tree.h" #include "diagnostic.h" +#include "tree-pretty-print.h" +#include "gimple-pretty-print.h" #include "basic-block.h" #include "tree-flow.h" #include "gimple.h" diff --git a/gcc/tree-ssa-dom.c b/gcc/tree-ssa-dom.c index c9f74fc1933..b8453256988 100644 --- a/gcc/tree-ssa-dom.c +++ b/gcc/tree-ssa-dom.c @@ -32,6 +32,8 @@ along with GCC; see the file COPYING3. If not see #include "expr.h" #include "function.h" #include "diagnostic.h" +#include "tree-pretty-print.h" +#include "gimple-pretty-print.h" #include "timevar.h" #include "tree-dump.h" #include "tree-flow.h" diff --git a/gcc/tree-ssa-dse.c b/gcc/tree-ssa-dse.c index 8172556c609..858cd5e4203 100644 --- a/gcc/tree-ssa-dse.c +++ b/gcc/tree-ssa-dse.c @@ -28,6 +28,7 @@ along with GCC; see the file COPYING3. If not see #include "basic-block.h" #include "timevar.h" #include "diagnostic.h" +#include "gimple-pretty-print.h" #include "tree-flow.h" #include "tree-pass.h" #include "tree-dump.h" diff --git a/gcc/tree-ssa-forwprop.c b/gcc/tree-ssa-forwprop.c index 3494190e7cd..f7295067801 100644 --- a/gcc/tree-ssa-forwprop.c +++ b/gcc/tree-ssa-forwprop.c @@ -1,5 +1,6 @@ /* Forward propagation of expressions for single use variables. - Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation, Inc. + Copyright (C) 2004, 2005, 2007, 2008, 2009, 2010 + Free Software Foundation, Inc. This file is part of GCC. @@ -26,6 +27,7 @@ along with GCC; see the file COPYING3. If not see #include "basic-block.h" #include "timevar.h" #include "diagnostic.h" +#include "tree-pretty-print.h" #include "tree-flow.h" #include "tree-pass.h" #include "tree-dump.h" diff --git a/gcc/tree-ssa-ifcombine.c b/gcc/tree-ssa-ifcombine.c index af9b15421be..8b8e0ddc796 100644 --- a/gcc/tree-ssa-ifcombine.c +++ b/gcc/tree-ssa-ifcombine.c @@ -1,5 +1,5 @@ /* Combining of if-expressions on trees. - Copyright (C) 2007, 2008 Free Software Foundation, Inc. + Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc. Contributed by Richard Guenther <rguenther@suse.de> This file is part of GCC. @@ -26,6 +26,7 @@ along with GCC; see the file COPYING3. If not see #include "basic-block.h" #include "timevar.h" #include "diagnostic.h" +#include "tree-pretty-print.h" #include "tree-flow.h" #include "tree-pass.h" #include "tree-dump.h" diff --git a/gcc/tree-ssa-live.c b/gcc/tree-ssa-live.c index c0ccb4fe20d..c3e00713b3a 100644 --- a/gcc/tree-ssa-live.c +++ b/gcc/tree-ssa-live.c @@ -1,6 +1,6 @@ /* Liveness for SSA trees. - Copyright (C) 2003, 2004, 2005, 2007, 2008, 2009 Free Software Foundation, - Inc. + Copyright (C) 2003, 2004, 2005, 2007, 2008, 2009, 2010 + Free Software Foundation, Inc. Contributed by Andrew MacLeod <amacleod@redhat.com> This file is part of GCC. @@ -25,6 +25,8 @@ along with GCC; see the file COPYING3. If not see #include "tm.h" #include "tree.h" #include "diagnostic.h" +#include "tree-pretty-print.h" +#include "gimple-pretty-print.h" #include "bitmap.h" #include "tree-flow.h" #include "tree-dump.h" diff --git a/gcc/tree-ssa-loop-im.c b/gcc/tree-ssa-loop-im.c index 3a65255a177..eb15382e2a1 100644 --- a/gcc/tree-ssa-loop-im.c +++ b/gcc/tree-ssa-loop-im.c @@ -27,6 +27,8 @@ along with GCC; see the file COPYING3. If not see #include "basic-block.h" #include "output.h" #include "diagnostic.h" +#include "gimple-pretty-print.h" +#include "tree-pretty-print.h" #include "tree-flow.h" #include "tree-dump.h" #include "timevar.h" diff --git a/gcc/tree-ssa-loop-ivcanon.c b/gcc/tree-ssa-loop-ivcanon.c index fe213bea949..12383d7b42e 100644 --- a/gcc/tree-ssa-loop-ivcanon.c +++ b/gcc/tree-ssa-loop-ivcanon.c @@ -41,6 +41,8 @@ along with GCC; see the file COPYING3. If not see #include "tm_p.h" #include "basic-block.h" #include "diagnostic.h" +#include "tree-pretty-print.h" +#include "gimple-pretty-print.h" #include "tree-flow.h" #include "tree-dump.h" #include "cfgloop.h" diff --git a/gcc/tree-ssa-loop-ivopts.c b/gcc/tree-ssa-loop-ivopts.c index 80e219db34a..9592832f9b7 100644 --- a/gcc/tree-ssa-loop-ivopts.c +++ b/gcc/tree-ssa-loop-ivopts.c @@ -71,6 +71,8 @@ along with GCC; see the file COPYING3. If not see #include "basic-block.h" #include "output.h" #include "diagnostic.h" +#include "tree-pretty-print.h" +#include "gimple-pretty-print.h" #include "tree-flow.h" #include "tree-dump.h" #include "timevar.h" diff --git a/gcc/tree-ssa-loop-niter.c b/gcc/tree-ssa-loop-niter.c index bbfabea4974..d1c2e4cbb40 100644 --- a/gcc/tree-ssa-loop-niter.c +++ b/gcc/tree-ssa-loop-niter.c @@ -1,6 +1,6 @@ /* Functions to determine/estimate number of iterations of a loop. - Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, - Inc. + Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 + Free Software Foundation, Inc. This file is part of GCC. @@ -27,6 +27,8 @@ along with GCC; see the file COPYING3. If not see #include "basic-block.h" #include "output.h" #include "diagnostic.h" +#include "tree-pretty-print.h" +#include "gimple-pretty-print.h" #include "intl.h" #include "tree-flow.h" #include "tree-dump.h" diff --git a/gcc/tree-ssa-loop-prefetch.c b/gcc/tree-ssa-loop-prefetch.c index 1f8225e0468..633dd337c74 100644 --- a/gcc/tree-ssa-loop-prefetch.c +++ b/gcc/tree-ssa-loop-prefetch.c @@ -1,5 +1,5 @@ /* Array prefetching. - Copyright (C) 2005, 2007, 2008 Free Software Foundation, Inc. + Copyright (C) 2005, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. This file is part of GCC. @@ -26,6 +26,7 @@ along with GCC; see the file COPYING3. If not see #include "basic-block.h" #include "output.h" #include "diagnostic.h" +#include "tree-pretty-print.h" #include "tree-flow.h" #include "tree-dump.h" #include "timevar.h" diff --git a/gcc/tree-ssa-math-opts.c b/gcc/tree-ssa-math-opts.c index e50967b02fc..f89910b82e5 100644 --- a/gcc/tree-ssa-math-opts.c +++ b/gcc/tree-ssa-math-opts.c @@ -98,6 +98,7 @@ along with GCC; see the file COPYING3. If not see #include "basic-block.h" #include "target.h" #include "diagnostic.h" +#include "gimple-pretty-print.h" /* FIXME: RTL headers have to be included here for optabs. */ #include "rtl.h" /* Because optabs.h wants enum rtx_code. */ diff --git a/gcc/tree-ssa-operands.c b/gcc/tree-ssa-operands.c index cd8b6f8935a..aa37b972628 100644 --- a/gcc/tree-ssa-operands.c +++ b/gcc/tree-ssa-operands.c @@ -26,6 +26,8 @@ along with GCC; see the file COPYING3. If not see #include "flags.h" #include "function.h" #include "diagnostic.h" +#include "tree-pretty-print.h" +#include "gimple-pretty-print.h" #include "tree-flow.h" #include "tree-inline.h" #include "tree-pass.h" diff --git a/gcc/tree-ssa-phiprop.c b/gcc/tree-ssa-phiprop.c index 853eb205378..a7bb01195ef 100644 --- a/gcc/tree-ssa-phiprop.c +++ b/gcc/tree-ssa-phiprop.c @@ -1,5 +1,5 @@ /* Backward propagation of indirect loads through PHIs. - Copyright (C) 2007, 2008 Free Software Foundation, Inc. + Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc. Contributed by Richard Guenther <rguenther@suse.de> This file is part of GCC. @@ -27,6 +27,8 @@ along with GCC; see the file COPYING3. If not see #include "basic-block.h" #include "timevar.h" #include "diagnostic.h" +#include "tree-pretty-print.h" +#include "gimple-pretty-print.h" #include "tree-flow.h" #include "tree-pass.h" #include "tree-dump.h" diff --git a/gcc/tree-ssa-pre.c b/gcc/tree-ssa-pre.c index a89e4d5ddd2..18c75d242d8 100644 --- a/gcc/tree-ssa-pre.c +++ b/gcc/tree-ssa-pre.c @@ -27,6 +27,8 @@ along with GCC; see the file COPYING3. If not see #include "tree.h" #include "basic-block.h" #include "diagnostic.h" +#include "tree-pretty-print.h" +#include "gimple-pretty-print.h" #include "tree-inline.h" #include "tree-flow.h" #include "gimple.h" diff --git a/gcc/tree-ssa-propagate.c b/gcc/tree-ssa-propagate.c index 1eb557ddfd8..d7243e98226 100644 --- a/gcc/tree-ssa-propagate.c +++ b/gcc/tree-ssa-propagate.c @@ -1,5 +1,6 @@ /* Generic SSA value propagation engine. - Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 + Free Software Foundation, Inc. Contributed by Diego Novillo <dnovillo@redhat.com> This file is part of GCC. @@ -30,6 +31,7 @@ #include "expr.h" #include "function.h" #include "diagnostic.h" +#include "gimple-pretty-print.h" #include "timevar.h" #include "tree-dump.h" #include "tree-flow.h" diff --git a/gcc/tree-ssa-reassoc.c b/gcc/tree-ssa-reassoc.c index 67035184438..40152d93e64 100644 --- a/gcc/tree-ssa-reassoc.c +++ b/gcc/tree-ssa-reassoc.c @@ -25,6 +25,8 @@ along with GCC; see the file COPYING3. If not see #include "tree.h" #include "basic-block.h" #include "diagnostic.h" +#include "tree-pretty-print.h" +#include "gimple-pretty-print.h" #include "tree-inline.h" #include "tree-flow.h" #include "gimple.h" diff --git a/gcc/tree-ssa-sccvn.c b/gcc/tree-ssa-sccvn.c index c7181580b27..e1ddc78e531 100644 --- a/gcc/tree-ssa-sccvn.c +++ b/gcc/tree-ssa-sccvn.c @@ -26,6 +26,8 @@ along with GCC; see the file COPYING3. If not see #include "tree.h" #include "basic-block.h" #include "diagnostic.h" +#include "tree-pretty-print.h" +#include "gimple-pretty-print.h" #include "tree-inline.h" #include "tree-flow.h" #include "gimple.h" diff --git a/gcc/tree-ssa-sink.c b/gcc/tree-ssa-sink.c index 14763e5ebab..40d3a2972f4 100644 --- a/gcc/tree-ssa-sink.c +++ b/gcc/tree-ssa-sink.c @@ -1,5 +1,5 @@ /* Code sinking for trees - Copyright (C) 2001, 2002, 2003, 2004, 2007, 2008, 2009 + Copyright (C) 2001, 2002, 2003, 2004, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. Contributed by Daniel Berlin <dan@dberlin.org> @@ -26,6 +26,7 @@ along with GCC; see the file COPYING3. If not see #include "tree.h" #include "basic-block.h" #include "diagnostic.h" +#include "gimple-pretty-print.h" #include "tree-inline.h" #include "tree-flow.h" #include "gimple.h" diff --git a/gcc/tree-ssa-ter.c b/gcc/tree-ssa-ter.c index 902b1f07f36..d9d552c4cd0 100644 --- a/gcc/tree-ssa-ter.c +++ b/gcc/tree-ssa-ter.c @@ -1,6 +1,6 @@ /* Routines for performing Temporary Expression Replacement (TER) in SSA trees. - Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, - Inc. + Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 + Free Software Foundation, Inc. Contributed by Andrew MacLeod <amacleod@redhat.com> This file is part of GCC. @@ -26,6 +26,8 @@ along with GCC; see the file COPYING3. If not see #include "tm.h" #include "tree.h" #include "diagnostic.h" +#include "tree-pretty-print.h" +#include "gimple-pretty-print.h" #include "bitmap.h" #include "tree-flow.h" #include "tree-dump.h" diff --git a/gcc/tree-ssa-uninit.c b/gcc/tree-ssa-uninit.c index 467d6f89ea0..5487cc06b96 100644 --- a/gcc/tree-ssa-uninit.c +++ b/gcc/tree-ssa-uninit.c @@ -1,5 +1,5 @@ /* Predicate aware uninitialized variable warning. - Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007, 2008 Free Software + Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2010 Free Software Foundation, Inc. Contributed by Xinliang David Li <davidxl@google.com> @@ -32,6 +32,7 @@ along with GCC; see the file COPYING3. If not see #include "expr.h" #include "function.h" #include "diagnostic.h" +#include "gimple-pretty-print.h" #include "bitmap.h" #include "pointer-set.h" #include "tree-flow.h" diff --git a/gcc/tree-ssa.c b/gcc/tree-ssa.c index 2a964850ec4..dfea0258ea1 100644 --- a/gcc/tree-ssa.c +++ b/gcc/tree-ssa.c @@ -1,5 +1,5 @@ /* Miscellaneous SSA utility functions. - Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009 + Copyright (C) 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. This file is part of GCC. @@ -33,6 +33,8 @@ along with GCC; see the file COPYING3. If not see #include "expr.h" #include "function.h" #include "diagnostic.h" +#include "tree-pretty-print.h" +#include "gimple-pretty-print.h" #include "bitmap.h" #include "pointer-set.h" #include "tree-flow.h" diff --git a/gcc/tree-stdarg.c b/gcc/tree-stdarg.c index 9e7369fc3c1..8401747a020 100644 --- a/gcc/tree-stdarg.c +++ b/gcc/tree-stdarg.c @@ -1,5 +1,6 @@ /* Pass computing data for optimizing stdarg functions. - Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation, Inc. + Copyright (C) 2004, 2005, 2007, 2008, 2009, 2010 + Free Software Foundation, Inc. Contributed by Jakub Jelinek <jakub@redhat.com> This file is part of GCC. @@ -26,6 +27,7 @@ along with GCC; see the file COPYING3. If not see #include "function.h" #include "langhooks.h" #include "diagnostic.h" +#include "gimple-pretty-print.h" #include "target.h" #include "tree-flow.h" #include "tree-pass.h" diff --git a/gcc/tree-switch-conversion.c b/gcc/tree-switch-conversion.c index 1fd9094c866..0ff937f8030 100644 --- a/gcc/tree-switch-conversion.c +++ b/gcc/tree-switch-conversion.c @@ -1,6 +1,6 @@ /* Switch Conversion converts variable initializations based on switch statements to initializations from a static array. - Copyright (C) 2006, 2008 Free Software Foundation, Inc. + Copyright (C) 2006, 2008, 2009, 2010 Free Software Foundation, Inc. Contributed by Martin Jambor <jamborm@suse.cz> This file is part of GCC. @@ -94,6 +94,7 @@ eight) times the number of the actual switch branches. */ #include "input.h" #include "tree-pass.h" #include "diagnostic.h" +#include "gimple-pretty-print.h" #include "tree-dump.h" #include "timevar.h" diff --git a/gcc/tree-tailcall.c b/gcc/tree-tailcall.c index d651c3b509b..e67f5805d27 100644 --- a/gcc/tree-tailcall.c +++ b/gcc/tree-tailcall.c @@ -29,6 +29,7 @@ along with GCC; see the file COPYING3. If not see #include "tree-flow.h" #include "tree-dump.h" #include "diagnostic.h" +#include "gimple-pretty-print.h" #include "except.h" #include "tree-pass.h" #include "flags.h" diff --git a/gcc/tree-vect-data-refs.c b/gcc/tree-vect-data-refs.c index cf2ac21fca2..76a5c21e255 100644 --- a/gcc/tree-vect-data-refs.c +++ b/gcc/tree-vect-data-refs.c @@ -29,6 +29,8 @@ along with GCC; see the file COPYING3. If not see #include "target.h" #include "basic-block.h" #include "diagnostic.h" +#include "tree-pretty-print.h" +#include "gimple-pretty-print.h" #include "tree-flow.h" #include "tree-dump.h" #include "cfgloop.h" diff --git a/gcc/tree-vect-loop-manip.c b/gcc/tree-vect-loop-manip.c index f4056b05891..8289b363e76 100644 --- a/gcc/tree-vect-loop-manip.c +++ b/gcc/tree-vect-loop-manip.c @@ -28,6 +28,8 @@ along with GCC; see the file COPYING3. If not see #include "tree.h" #include "basic-block.h" #include "diagnostic.h" +#include "tree-pretty-print.h" +#include "gimple-pretty-print.h" #include "tree-flow.h" #include "tree-dump.h" #include "cfgloop.h" diff --git a/gcc/tree-vect-loop.c b/gcc/tree-vect-loop.c index 8acc99289bc..465a95cbf12 100644 --- a/gcc/tree-vect-loop.c +++ b/gcc/tree-vect-loop.c @@ -28,6 +28,8 @@ along with GCC; see the file COPYING3. If not see #include "tree.h" #include "basic-block.h" #include "diagnostic.h" +#include "tree-pretty-print.h" +#include "gimple-pretty-print.h" #include "tree-flow.h" #include "tree-dump.h" #include "cfgloop.h" diff --git a/gcc/tree-vect-patterns.c b/gcc/tree-vect-patterns.c index ea827559195..987c267b7e3 100644 --- a/gcc/tree-vect-patterns.c +++ b/gcc/tree-vect-patterns.c @@ -1,5 +1,5 @@ /* Analysis Utilities for Loop Vectorization. - Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc. + Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. Contributed by Dorit Nuzman <dorit@il.ibm.com> This file is part of GCC. @@ -27,6 +27,7 @@ along with GCC; see the file COPYING3. If not see #include "target.h" #include "basic-block.h" #include "diagnostic.h" +#include "gimple-pretty-print.h" #include "tree-flow.h" #include "tree-dump.h" #include "cfgloop.h" diff --git a/gcc/tree-vect-slp.c b/gcc/tree-vect-slp.c index f313294bd29..f1b6355025f 100644 --- a/gcc/tree-vect-slp.c +++ b/gcc/tree-vect-slp.c @@ -29,6 +29,8 @@ along with GCC; see the file COPYING3. If not see #include "target.h" #include "basic-block.h" #include "diagnostic.h" +#include "tree-pretty-print.h" +#include "gimple-pretty-print.h" #include "tree-flow.h" #include "tree-dump.h" #include "cfgloop.h" diff --git a/gcc/tree-vect-stmts.c b/gcc/tree-vect-stmts.c index a2c2e203fe7..a70ebfe011b 100644 --- a/gcc/tree-vect-stmts.c +++ b/gcc/tree-vect-stmts.c @@ -29,6 +29,8 @@ along with GCC; see the file COPYING3. If not see #include "target.h" #include "basic-block.h" #include "diagnostic.h" +#include "tree-pretty-print.h" +#include "gimple-pretty-print.h" #include "tree-flow.h" #include "tree-dump.h" #include "cfgloop.h" diff --git a/gcc/tree-vectorizer.c b/gcc/tree-vectorizer.c index e337672d034..b4492686821 100644 --- a/gcc/tree-vectorizer.c +++ b/gcc/tree-vectorizer.c @@ -1,6 +1,6 @@ /* Vectorizer - Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software - Foundation, Inc. + Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 + Free Software Foundation, Inc. Contributed by Dorit Naishlos <dorit@il.ibm.com> This file is part of GCC. @@ -62,6 +62,7 @@ along with GCC; see the file COPYING3. If not see #include "ggc.h" #include "tree.h" #include "diagnostic.h" +#include "tree-pretty-print.h" #include "tree-flow.h" #include "tree-dump.h" #include "cfgloop.h" diff --git a/gcc/tree-vrp.c b/gcc/tree-vrp.c index 8cac4dfc45a..8ffde5bf050 100644 --- a/gcc/tree-vrp.c +++ b/gcc/tree-vrp.c @@ -32,6 +32,8 @@ along with GCC; see the file COPYING3. If not see #include "tree-dump.h" #include "timevar.h" #include "diagnostic.h" +#include "tree-pretty-print.h" +#include "gimple-pretty-print.h" #include "toplev.h" #include "intl.h" #include "cfgloop.h" diff --git a/gcc/tree.c b/gcc/tree.c index 805c0525a24..cc4a2d66fc1 100644 --- a/gcc/tree.c +++ b/gcc/tree.c @@ -53,6 +53,8 @@ along with GCC; see the file COPYING3. If not see #include "tree-pass.h" #include "langhooks-def.h" #include "diagnostic.h" +#include "tree-diagnostic.h" +#include "tree-pretty-print.h" #include "cgraph.h" #include "timevar.h" #include "except.h" @@ -5019,7 +5021,7 @@ free_lang_data (void) lang_hooks.set_decl_assembler_name = lhd_set_decl_assembler_name; /* Reset diagnostic machinery. */ - diagnostic_starter (global_dc) = default_diagnostic_starter; + diagnostic_starter (global_dc) = default_tree_diagnostic_starter; diagnostic_finalizer (global_dc) = default_diagnostic_finalizer; diagnostic_format_decoder (global_dc) = default_tree_printer; diff --git a/gcc/value-prof.c b/gcc/value-prof.c index 0dde9bf8041..b819cdcc06f 100644 --- a/gcc/value-prof.c +++ b/gcc/value-prof.c @@ -1,6 +1,6 @@ /* Transformations based on profile information for values. - Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software - Foundation, Inc. + Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 + Free Software Foundation, Inc. This file is part of GCC. @@ -37,6 +37,8 @@ along with GCC; see the file COPYING3. If not see #include "tree-flow.h" #include "tree-flow-inline.h" #include "diagnostic.h" +#include "tree-pretty-print.h" +#include "gimple-pretty-print.h" #include "coverage.h" #include "tree.h" #include "gcov-io.h" diff --git a/gcc/var-tracking.c b/gcc/var-tracking.c index 0c413123264..b5853937316 100644 --- a/gcc/var-tracking.c +++ b/gcc/var-tracking.c @@ -112,6 +112,7 @@ #include "toplev.h" #include "params.h" #include "diagnostic.h" +#include "tree-pretty-print.h" #include "pointer-set.h" #include "recog.h" |