From 58aca9d95cbd0535a99a9642e2e997ea0fd30788 Mon Sep 17 00:00:00 2001 From: Nathan Sidwell Date: Mon, 22 May 2017 12:25:06 +0000 Subject: [PATCH] invoke.texi (fdump-translation-unit): Delete documentation. gcc/ * doc/invoke.texi (fdump-translation-unit): Delete documentation. (fdump-lang): Document 'raw' option. * dumpfile.h (TDI_tu): Delete. * dumpfile.c (dump_files): Remove translation-unit. (FIRST_AUTO_NUMBERED_DUMP): Decrement. gcc/cp/ * cp-objcp-common.c (cp_register_dumps): Register raw dumper. * cp-tree.h (raw_dump_id): Declare. * decl2.c (raw_dump_id): Define. (dump_tu): Use raw_dump_id. gcc/c/ * c-decl.c (c_parse_final_cleanups): Drop TDI_tu handling. From-SVN: r248333 --- gcc/ChangeLog | 8 ++++++++ gcc/c/ChangeLog | 4 ++++ gcc/c/c-decl.c | 12 ------------ gcc/cp/ChangeLog | 5 +++++ gcc/cp/cp-objcp-common.c | 3 +++ gcc/cp/cp-tree.h | 1 + gcc/cp/decl2.c | 9 +++++---- gcc/doc/invoke.texi | 16 ++++------------ gcc/dumpfile.c | 3 +-- gcc/dumpfile.h | 1 - 10 files changed, 31 insertions(+), 31 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 13845877a02..46f39ae486c 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2017-05-22 Nathan Sidwell + + * doc/invoke.texi (fdump-translation-unit): Delete documentation. + (fdump-lang): Document 'raw' option. + * dumpfile.h (TDI_tu): Delete. + * dumpfile.c (dump_files): Remove translation-unit. + (FIRST_AUTO_NUMBERED_DUMP): Decrement. + 2017-05-22 Georg-Johann Lay * config/avr/t-avr (AWK) [t-multilib]: Remove "-v FORMAT=Makefile" diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog index a70eaf910b0..0318bcf043b 100644 --- a/gcc/c/ChangeLog +++ b/gcc/c/ChangeLog @@ -1,3 +1,7 @@ +2017-05-22 Nathan Sidwell + + * c-decl.c (c_parse_final_cleanups): Drop TDI_tu handling. + 2017-05-19 Thomas Schwinge * c-parser.c (c_parser_omp_clause_default): Handle diff --git a/gcc/c/c-decl.c b/gcc/c/c-decl.c index 237e910df96..f2b8096d84a 100644 --- a/gcc/c/c-decl.c +++ b/gcc/c/c-decl.c @@ -11214,18 +11214,6 @@ c_parse_final_cleanups (void) dump_ada_specs (collect_all_refs, NULL); } - if (ext_block) - { - tree tmp = BLOCK_VARS (ext_block); - dump_flags_t flags; - FILE * stream = dump_begin (TDI_tu, &flags); - if (stream && tmp) - { - dump_node (tmp, flags & ~TDF_SLIM, stream); - dump_end (TDI_tu, stream); - } - } - /* Process all file scopes in this compilation, and the external_scope, through wrapup_global_declarations. */ FOR_EACH_VEC_ELT (*all_translation_units, i, t) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 09805ca1417..8b272c84d25 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,10 @@ 2017-05-22 Nathan Sidwell + * cp-objcp-common.c (cp_register_dumps): Register raw dumper. + * cp-tree.h (raw_dump_id): Declare. + * decl2.c (raw_dump_id): Define. + (dump_tu): Use raw_dump_id. + * config-lang.in (gtfiles): Sort list, break lines. * cp-tree.h (CPTI_TERMINATE, CPTI_CALL_UNEXPECTED): Rename to ... diff --git a/gcc/cp/cp-objcp-common.c b/gcc/cp/cp-objcp-common.c index 40e9ccbe510..5a7da5b4957 100644 --- a/gcc/cp/cp-objcp-common.c +++ b/gcc/cp/cp-objcp-common.c @@ -359,6 +359,9 @@ cp_register_dumps (gcc::dump_manager *dumps) { class_dump_id = dumps->dump_register (".class", "lang-class", "lang-class", DK_lang, OPTGROUP_NONE, false); + + raw_dump_id = dumps->dump_register + (".raw", "lang-raw", "lang-raw", DK_lang, OPTGROUP_NONE, false); } void diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index 1981fc01e91..0064222599f 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -5776,6 +5776,7 @@ extern cp_parameter_declarator *no_parameters; /* Various dump ids. */ extern int class_dump_id; +extern int raw_dump_id; /* in call.c */ extern bool check_dtor_name (tree, tree); diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c index a950d5e970e..7247b0fb4fa 100644 --- a/gcc/cp/decl2.c +++ b/gcc/cp/decl2.c @@ -49,6 +49,9 @@ along with GCC; see the file COPYING3. If not see #include "c-family/c-ada-spec.h" #include "asan.h" +/* Id for dumping the raw trees. */ +int raw_dump_id; + extern cpp_reader *parse_in; /* This structure contains information about the initializations @@ -4362,12 +4365,10 @@ static void dump_tu (void) { dump_flags_t flags; - FILE *stream = dump_begin (TDI_tu, &flags); - - if (stream) + if (FILE *stream = dump_begin (raw_dump_id, &flags)) { dump_node (global_namespace, flags & ~TDF_SLIM, stream); - dump_end (TDI_tu, stream); + dump_end (raw_dump_id, stream); } } diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi index 4b7304ec025..a65e78f4376 100644 --- a/gcc/doc/invoke.texi +++ b/gcc/doc/invoke.texi @@ -550,7 +550,6 @@ Objective-C and Objective-C++ Dialects}. -fdump-passes @gol -fdump-rtl-@var{pass} -fdump-rtl-@var{pass}=@var{filename} @gol -fdump-statistics @gol --fdump-translation-unit@r{[}-@var{n}@r{]} @gol -fdump-tree-all @gol -fdump-tree-@var{switch} @gol -fdump-tree-@var{switch}-@var{options} @gol @@ -12972,7 +12971,7 @@ Dump after function inlining. @opindex fdump-lang Control the dumping of language-specific information. The @var{options} and @var{filename} portions behave as described in the -`@option{-fdump-tree} option. The following @var{switch} values are +@option{-fdump-tree} option. The following @var{switch} values are accepted: @table @samp @@ -12984,6 +12983,9 @@ Enable all language-specific dumps. Dump class hierarchy information. Virtual table information is emitted unless '@option{slim}' is specified. This option is applicable to C++ only. +@item raw +Dump the raw internal tree data. This option is applicable to C++ only. + @end table @item -fdump-passes @@ -13002,16 +13004,6 @@ whole compilation unit while @samp{-details} dumps every event as the passes generate them. The default with no option is to sum counters for each function compiled. -@item -fdump-translation-unit @r{(C++ only)} -@itemx -fdump-translation-unit-@var{options} @r{(C++ only)} -@opindex fdump-translation-unit -Dump a representation of the tree structure for the entire translation -unit to a file. The file name is made by appending @file{.tu} to the -source file name, and the file is created in the same directory as the -output file. If the @samp{-@var{options}} form is used, @var{options} -controls the details of the dump as described for the -@option{-fdump-tree} options. - @item -fdump-tree-all @itemx -fdump-tree-@var{switch} @itemx -fdump-tree-@var{switch}-@var{options} diff --git a/gcc/dumpfile.c b/gcc/dumpfile.c index 45e47b2d4e8..13a711345b4 100644 --- a/gcc/dumpfile.c +++ b/gcc/dumpfile.c @@ -73,11 +73,10 @@ static struct dump_file_info dump_files[TDI_end] = dump_file_info (".cgraph", "ipa-cgraph", DK_ipa, 0), dump_file_info (".type-inheritance", "ipa-type-inheritance", DK_ipa, 0), dump_file_info (".ipa-clones", "ipa-clones", DK_ipa, 0), - dump_file_info (".tu", "translation-unit", DK_lang, 1), dump_file_info (".original", "tree-original", DK_tree, 3), dump_file_info (".gimple", "tree-gimple", DK_tree, 4), dump_file_info (".nested", "tree-nested", DK_tree, 5), -#define FIRST_AUTO_NUMBERED_DUMP 4 +#define FIRST_AUTO_NUMBERED_DUMP 3 dump_file_info (NULL, "lang-all", DK_lang, 0), dump_file_info (NULL, "tree-all", DK_tree, 0), diff --git a/gcc/dumpfile.h b/gcc/dumpfile.h index 1f7c8de682b..a1e4720156d 100644 --- a/gcc/dumpfile.h +++ b/gcc/dumpfile.h @@ -30,7 +30,6 @@ enum tree_dump_index TDI_cgraph, /* dump function call graph. */ TDI_inheritance, /* dump type inheritance graph. */ TDI_clones, /* dump IPA cloning decisions. */ - TDI_tu, /* dump the whole translation unit. */ TDI_original, /* dump each function before optimizing it */ TDI_generic, /* dump each function after genericizing it */ TDI_nested, /* dump each function after unnesting it */ -- 2.30.2