graph.c (init_graph_slim_pretty_print): Remove.

	* graph.c (init_graph_slim_pretty_print): Remove.
	(print_graph_cfg): Do not call it.  Use local pretty printer.
	(start_graph_dump): Likewise.

From-SVN: r201483

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2fe5ac5e6604b4857c5c3b6be05141a9335342fe..fb908485684adb386662d96245ab45cf7dad0dda 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2013-08-05  Gabriel Dos Reis  <gdr@integrable-solutions.net>
+
+       * graph.c (init_graph_slim_pretty_print): Remove.
+       (print_graph_cfg): Do not call it.  Use local pretty printer.
+       (start_graph_dump): Likewise.
+
 2013-08-05  Gabriel Dos Reis  <gdr@integrable-solutions.net>
 
        * gimple-pretty-print.c (buffer): Remove.

diff --git a/gcc/graph.c b/gcc/graph.c
index 5cfc27e7922b4da20c0cb2fe6d2077eafc11c891..91391a67afcd52d4251f0df116752756ade3b828 100644 (file)
--- a/gcc/graph.c
+++ b/gcc/graph.c
@@ -56,26 +56,6 @@ open_graph_file (const char *base, const char *mode)
   return fp;
 }
 
-/* Return a pretty-print buffer for output to file FP.  */
-
-static pretty_printer *
-init_graph_slim_pretty_print (FILE *fp)
-{
-  static bool initialized = false;
-  static pretty_printer graph_slim_pp;
-
-  if (! initialized)
-    {
-      pp_construct (&graph_slim_pp, /*prefix=*/NULL, /*linewidth=*/0);
-      initialized = true;
-    }
-  else
-    gcc_assert (! pp_last_position_in_text (&graph_slim_pp));
-
-  graph_slim_pp.buffer->stream = fp;
-  return &graph_slim_pp;
-}
-
 /* Draw a basic block BB belonging to the function with FUNCDEF_NO
    as its unique number.  */
 static void
@@ -297,7 +277,10 @@ print_graph_cfg (const char *base, struct function *fun)
 {
   const char *funcname = function_name (fun);
   FILE *fp = open_graph_file (base, "a");
-  pretty_printer *pp = init_graph_slim_pretty_print (fp);
+  pretty_printer graph_slim_pp;
+  pp_construct (&graph_slim_pp, /*prefix=*/NULL, /*linewidth=*/0);
+  graph_slim_pp.buffer->stream = fp;
+  pretty_printer *const pp = &graph_slim_pp;
   pp_printf (pp, "subgraph \"%s\" {\n"
                 "\tcolor=\"black\";\n"
                 "\tlabel=\"%s\";\n",
@@ -313,7 +296,10 @@ print_graph_cfg (const char *base, struct function *fun)
 static void
 start_graph_dump (FILE *fp, const char *base)
 {
-  pretty_printer *pp = init_graph_slim_pretty_print (fp);
+  pretty_printer graph_slim_pp;
+  pp_construct (&graph_slim_pp, /*prefix=*/NULL, /*linewidth=*/0);
+  graph_slim_pp.buffer->stream = fp;
+  pretty_printer *const pp = &graph_slim_pp;
   pp_string (pp, "digraph \"");
   pp_write_text_to_stream (pp);
   pp_string (pp, base);