From 670987874d2aa043a454e112291931e32f4ca8cc Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Tue, 11 Feb 2020 17:13:44 -0500 Subject: [PATCH] analyzer: add diagnostics to output of -fdump-analyzer-exploded-graph gcc/analyzer/ChangeLog: * diagnostic-manager.h (diagnostic_manager::get_saved_diagnostic): Add const overload. * engine.cc (exploded_node::dump_dot): Dump saved_diagnostics. * exploded-graph.h (exploded_graph::get_diagnostic_manager): Add const overload. --- gcc/analyzer/ChangeLog | 8 ++++++++ gcc/analyzer/diagnostic-manager.h | 4 ++++ gcc/analyzer/engine.cc | 14 ++++++++++++++ gcc/analyzer/exploded-graph.h | 4 ++++ 4 files changed, 30 insertions(+) diff --git a/gcc/analyzer/ChangeLog b/gcc/analyzer/ChangeLog index eda1052..9f1e25d 100644 --- a/gcc/analyzer/ChangeLog +++ b/gcc/analyzer/ChangeLog @@ -1,3 +1,11 @@ +2020-02-17 David Malcolm + + * diagnostic-manager.h (diagnostic_manager::get_saved_diagnostic): + Add const overload. + * engine.cc (exploded_node::dump_dot): Dump saved_diagnostics. + * exploded-graph.h (exploded_graph::get_diagnostic_manager): Add + const overload. + 2020-02-11 David Malcolm PR analyzer/93288 diff --git a/gcc/analyzer/diagnostic-manager.h b/gcc/analyzer/diagnostic-manager.h index 0c1d976..171d279 100644 --- a/gcc/analyzer/diagnostic-manager.h +++ b/gcc/analyzer/diagnostic-manager.h @@ -95,6 +95,10 @@ public: { return m_saved_diagnostics[idx]; } + const saved_diagnostic *get_saved_diagnostic (unsigned idx) const + { + return m_saved_diagnostics[idx]; + } private: void build_emission_path (const exploded_graph &eg, diff --git a/gcc/analyzer/engine.cc b/gcc/analyzer/engine.cc index 7860da0..17507c7 100644 --- a/gcc/analyzer/engine.cc +++ b/gcc/analyzer/engine.cc @@ -854,6 +854,20 @@ exploded_node::dump_dot (graphviz_out *gv, const dump_args_t &args) const } } + /* Dump any saved_diagnostics at this enode. */ + { + const diagnostic_manager &dm = args.m_eg.get_diagnostic_manager (); + for (unsigned i = 0; i < dm.get_num_diagnostics (); i++) + { + const saved_diagnostic *sd = dm.get_saved_diagnostic (i); + if (sd->m_enode == this) + { + pp_printf (pp, "DIAGNOSTIC: %s", sd->m_d->get_kind ()); + pp_newline (pp); + } + } + } + pp_write_text_as_dot_label_to_stream (pp, /*for_record=*/true); pp_string (pp, "\"];\n\n"); diff --git a/gcc/analyzer/exploded-graph.h b/gcc/analyzer/exploded-graph.h index 5d69bff..bb1f3cc 100644 --- a/gcc/analyzer/exploded-graph.h +++ b/gcc/analyzer/exploded-graph.h @@ -768,6 +768,10 @@ public: { return m_diagnostic_manager; } + const diagnostic_manager &get_diagnostic_manager () const + { + return m_diagnostic_manager; + } stats *get_global_stats () { return &m_global_stats; } stats *get_or_create_function_stats (function *fn); -- 2.7.4