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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 13845877a026fd2a63268fe0d5c59367f839cf13..46f39ae486cf12b51f16d45957c03119a2384111 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2017-05-22  Nathan Sidwell  <nathan@acm.org>
+
+       * 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  <avr@gjlay.de>
 
        * config/avr/t-avr (AWK) [t-multilib]: Remove "-v FORMAT=Makefile"

diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index a70eaf910b097ad4f5b23ab5fec1bea4e9427344..0318bcf043b5fd0295dca3a5174d334abc2b644b 100644 (file)
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@@ -1,3 +1,7 @@
+2017-05-22  Nathan Sidwell  <nathan@acm.org>
+
+       * c-decl.c (c_parse_final_cleanups): Drop TDI_tu handling.
+
 2017-05-19  Thomas Schwinge  <thomas@codesourcery.com>
 
        * c-parser.c (c_parser_omp_clause_default): Handle

diff --git a/gcc/c/c-decl.c b/gcc/c/c-decl.c
index 237e910df96b7c719c66205c5bf6fface75605c2..f2b8096d84a1ec07a7699662b8727edd2400c734 100644 (file)
--- 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 09805ca14177d3bbaf9e42f71daf34fe50d4e858..8b272c84d25f3c06730666ca686d69adc163dc5a 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,10 @@
 2017-05-22  Nathan Sidwell  <nathan@acm.org>
 
+       * 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 40e9ccbe5104e4b2b0a7e140dab005891e491f9a..5a7da5b495713780fb24cdf817a0ddb865f7202c 100644 (file)
--- 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 1981fc01e91dae4113edbe4623317a11c520c4c9..0064222599fed74a9528a1cbff1205f6bafa8069 100644 (file)
--- 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 a950d5e970eeec1bbbb9f3fcf78b7f5c7a30a517..7247b0fb4fac0322e17590b944d15c8be873de59 100644 (file)
--- 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 4b7304ec02585bba986e6d25c035764439cb3e73..a65e78f4376fff826de4d95b5714f361d33162ab 100644 (file)
--- 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 45e47b2d4e86c02d816af1bcca816391128088e3..13a711345b4442ff316c24fd4a3d51ac2319529d 100644 (file)
--- 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 1f7c8de682b73e78d3ba5c20bbc47d87549bc4c0..a1e4720156dd291d39ada32b9fd880b41acbe76d 100644 (file)
--- 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 */