[gcc(refs/vendors/redhat/heads/gcc-10-branch)] analyzer: tweaks to superedge::dump

[Jakub Jelinek]

https://gcc.gnu.org/g:4d661bb7a2e1fdfd856140f1b86266ca524df9e2

commit 4d661bb7a2e1fdfd856140f1b86266ca524df9e2
Author: David Malcolm <dmalcolm@redhat.com>
Date:   Thu Mar 19 10:13:25 2020 -0400

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

Diff:
---
 gcc/analyzer/ChangeLog     |  5 +++++
 gcc/analyzer/supergraph.cc | 10 ++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/gcc/analyzer/ChangeLog b/gcc/analyzer/ChangeLog
index 0219cb3de75..fd3d4e03311 100644
--- 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 e4c067606e0..4ed016e1898 100644
--- 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);
 }