2017-05-11  Nathan Sidwell  <nathan@acm.org>

	* dumpfle.h (dump_function): Declare here ...
	* tree-dump.h (dump_function): ... not here.
	* dumpfile.c: #include tree-cfg.h.
	(dump_function): Move here from ...
	* tree-dump.c (dump_function): ... here.
	* gimplify.c: #include splay-tree.h, not tree-dump.h.
	* graphite-poly.c: Don't include tree-dump.h.
	* cgraphclones.c: Include dumpfile.h not tree-dump.h.
	* print-tree.c: Likewise.
	* stor-layout.c: Likewise.
	* tree-nested.c: Likewise.

	c/
	* gimple-parser.c: Don't #include tree-dump.h.

	fortran/
	* trans-decl.c: Include dumpfile.h not tree-dump.h,
	
Index: c/gimple-parser.c
===================================================================
--- c/gimple-parser.c	(revision 247909)
+++ c/gimple-parser.c	(working copy)
@@ -53,7 +53,6 @@ along with GCC; see the file COPYING3.
 #include "tree-ssanames.h"
 #include "gimple-ssa.h"
 #include "tree-dfa.h"
-#include "tree-dump.h"
 
 
 /* Gimple parsing functions.  */
Index: cgraphclones.c
===================================================================
--- cgraphclones.c	(revision 247909)
+++ cgraphclones.c	(working copy)
@@ -78,7 +78,7 @@ along with GCC; see the file COPYING3.
 #include "tree-eh.h"
 #include "tree-cfg.h"
 #include "tree-inline.h"
-#include "tree-dump.h"
+#include "dumpfile.h"
 #include "gimple-pretty-print.h"
 
 /* Create clone of edge in the node N represented by CALL_EXPR
Index: dumpfile.c
===================================================================
--- dumpfile.c	(revision 247909)
+++ dumpfile.c	(working copy)
@@ -26,6 +26,7 @@ along with GCC; see the file COPYING3.
 #include "diagnostic-core.h"
 #include "dumpfile.h"
 #include "context.h"
+#include "tree-cfg.h"
 
 /* If non-NULL, return one past-the-end of the matching SUBPART of
    the WHOLE string.  */
@@ -980,6 +981,22 @@ dump_basic_block (int dump_kind, basic_b
     dump_bb (alt_dump_file, bb, indent, TDF_DETAILS);
 }
 
+/* Dump FUNCTION_DECL FN as tree dump PHASE.  */
+
+void
+dump_function (int phase, tree fn)
+{
+  FILE *stream;
+  int flags;
+
+  stream = dump_begin (phase, &flags);
+  if (stream)
+    {
+      dump_function_to_file (fn, stream, flags);
+      dump_end (phase, stream);
+    }
+}
+
 /* Print information from the combine pass on dump_file.  */
 
 void
Index: dumpfile.h
===================================================================
--- dumpfile.h	(revision 247909)
+++ dumpfile.h	(working copy)
@@ -147,6 +147,7 @@ extern const char *dump_flag_name (int);
 extern void dump_printf (int, const char *, ...) ATTRIBUTE_PRINTF_2;
 extern void dump_printf_loc (int, source_location,
 			     const char *, ...) ATTRIBUTE_PRINTF_3;
+extern void dump_function (int phase, tree fn);
 extern void dump_basic_block (int, basic_block, int);
 extern void dump_generic_expr_loc (int, source_location, int, tree);
 extern void dump_generic_expr (int, int, tree);
Index: fortran/trans-decl.c
===================================================================
--- fortran/trans-decl.c	(revision 247909)
+++ fortran/trans-decl.c	(working copy)
@@ -35,7 +35,7 @@ along with GCC; see the file COPYING3.
 #include "stor-layout.h"
 #include "varasm.h"
 #include "attribs.h"
-#include "tree-dump.h"
+#include "dumpfile.h"
 #include "toplev.h"	/* For announce_function.  */
 #include "debug.h"
 #include "constructor.h"
Index: gimplify.c
===================================================================
--- gimplify.c	(revision 247909)
+++ gimplify.c	(working copy)
@@ -56,7 +56,7 @@ along with GCC; see the file COPYING3.
 #include "gimple-low.h"
 #include "cilk.h"
 #include "gomp-constants.h"
-#include "tree-dump.h"
+#include "splay-tree.h"
 #include "gimple-walk.h"
 #include "langhooks-def.h"	/* FIXME: for lhd_set_decl_assembler_name */
 #include "builtins.h"
Index: graphite-poly.c
===================================================================
--- graphite-poly.c	(revision 247909)
+++ graphite-poly.c	(working copy)
@@ -39,7 +39,6 @@ along with GCC; see the file COPYING3.
 #include "tree-data-ref.h"
 #include "pretty-print.h"
 #include "gimple-pretty-print.h"
-#include "tree-dump.h"
 #include "graphite.h"
 
 /* Print to STDERR the GMP value VAL.  */
Index: print-tree.c
===================================================================
--- print-tree.c	(revision 247909)
+++ print-tree.c	(working copy)
@@ -32,7 +32,7 @@ along with GCC; see the file COPYING3.
 #include "tree-iterator.h"
 #include "gimple-pretty-print.h" /* FIXME */
 #include "tree-cfg.h"
-#include "tree-dump.h"
+#include "dumpfile.h"
 #include "print-tree.h"
 
 /* Define the hash table of nodes already seen.
Index: stor-layout.c
===================================================================
--- stor-layout.c	(revision 247909)
+++ stor-layout.c	(working copy)
@@ -38,7 +38,7 @@ along with GCC; see the file COPYING3.
 #include "print-tree.h"
 #include "langhooks.h"
 #include "tree-inline.h"
-#include "tree-dump.h"
+#include "dumpfile.h"
 #include "gimplify.h"
 #include "debug.h"
 
Index: tree-dump.c
===================================================================
--- tree-dump.c	(revision 247909)
+++ tree-dump.c	(working copy)
@@ -153,22 +153,6 @@ dump_maybe_newline (dump_info_p di)
     }
 }
 
-/* Dump FUNCTION_DECL FN as tree dump PHASE.  */
-
-void
-dump_function (int phase, tree fn)
-{
-  FILE *stream;
-  int flags;
-
-  stream = dump_begin (phase, &flags);
-  if (stream)
-    {
-      dump_function_to_file (fn, stream, flags);
-      dump_end (phase, stream);
-    }
-}
-
 /* Dump pointer PTR using FIELD to identify it.  */
 
 void
Index: tree-dump.h
===================================================================
--- tree-dump.h	(revision 247909)
+++ tree-dump.h	(working copy)
@@ -87,7 +87,6 @@ extern void dump_string (dump_info_p, co
 extern void dump_string_field (dump_info_p, const char *, const char *);
 extern void queue_and_dump_index (dump_info_p, const char *, const_tree, int);
 extern void queue_and_dump_type (dump_info_p, const_tree);
-extern void dump_function (int, tree);
 extern int dump_flag (dump_info_p, int, const_tree);
 
 #endif /* ! GCC_TREE_DUMP_H */
Index: tree-nested.c
===================================================================
--- tree-nested.c	(revision 247909)
+++ tree-nested.c	(working copy)
@@ -31,7 +31,7 @@
 #include "cgraph.h"
 #include "fold-const.h"
 #include "stor-layout.h"
-#include "tree-dump.h"
+#include "dumpfile.h"
 #include "tree-inline.h"
 #include "gimplify.h"
 #include "gimple-iterator.h"