analyzer: tweaks to superedge::dump

gcc/analyzer/ChangeLog:
	* supergraph.cc (superedge::dump): Add space before description;
	move newline to non-pretty_printer overload.

diff --git a/gcc/analyzer/ChangeLog b/gcc/analyzer/ChangeLog
index 0219cb3de756599ca0d898a72d845e9daa0b2d7a..fd3d4e03311d41aa978cf9799c39d4032137bff6 100644 (file)
--- a/gcc/analyzer/ChangeLog
+++ b/gcc/analyzer/ChangeLog
@@ -1,3 +1,8 @@
+2020-03-27  David Malcolm  <dmalcolm@redhat.com>
+
+       * supergraph.cc (superedge::dump): Add space before description;
+       move newline to non-pretty_printer overload.
+
 2020-03-18  David Malcolm  <dmalcolm@redhat.com>
 
        * region-model.cc: Include "stor-layout.h".

diff --git a/gcc/analyzer/supergraph.cc b/gcc/analyzer/supergraph.cc
index e4c067606e0c1330f208d8d24fe76c8cdb115541..4ed016e189831bb2bf15c6f8168eac3b15c7813e 100644 (file)
--- a/gcc/analyzer/supergraph.cc
+++ b/gcc/analyzer/supergraph.cc
@@ -630,8 +630,13 @@ void
 superedge::dump (pretty_printer *pp) const
 {
   pp_printf (pp, "edge: SN: %i -> SN: %i", m_src->m_index, m_dest->m_index);
-  dump_label_to_pp (pp, false);
-  pp_newline (pp);
+  char *desc = get_description (false);
+  if (strlen (desc) > 0)
+    {
+      pp_space (pp);
+      pp_string (pp, desc);
+    }
+  free (desc);
 }
 
 /* Dump this superedge to stderr.  */
@@ -644,6 +649,7 @@ superedge::dump () const
   pp_show_color (&pp) = pp_show_color (global_dc->printer);
   pp.buffer->stream = stderr;
   dump (&pp);
+  pp_newline (&pp);
   pp_flush (&pp);
 }