Successfully bootstrapped & regrtested on x86_64-pc-linux-gnu.
Pushed to master as 13e3ba14eccc0b1ccf1ba9de90443ec7e524f2a6.
gcc/analyzer/ChangeLog:
* engine.cc (worklist::worklist): Remove unused field m_eg.
(class viz_callgraph_edge): Remove unused field m_call_sedge.
(class viz_callgraph): Remove unused field m_sg.
* exploded-graph.h (worklist::::m_eg): Remove unused field.
---
gcc/analyzer/engine.cc | 18 +++++-------------
gcc/analyzer/exploded-graph.h | 1 -
2 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/gcc/analyzer/engine.cc b/gcc/analyzer/engine.cc
index 9c3b5adc09b..e411d5b40e7 100644
--- a/gcc/analyzer/engine.cc
+++ b/gcc/analyzer/engine.cc
@@ -1654,8 +1654,7 @@ strongly_connected_components::strong_connect (unsigned
index)
/* worklist's ctor. */
worklist::worklist (const exploded_graph &eg, const analysis_plan &plan)
-: m_eg (eg),
- m_scc (eg.get_supergraph (), eg.get_logger ()),
+: m_scc (eg.get_supergraph (), eg.get_logger ()),
m_plan (plan),
m_queue (key_t (*this, NULL))
{
@@ -3602,10 +3601,8 @@ private:
class viz_callgraph_edge : public dedge<viz_callgraph_traits>
{
public:
- viz_callgraph_edge (viz_callgraph_node *src, viz_callgraph_node *dest,
- const call_superedge *call_sedge)
- : dedge<viz_callgraph_traits> (src, dest),
- m_call_sedge (call_sedge)
+ viz_callgraph_edge (viz_callgraph_node *src, viz_callgraph_node *dest)
+ : dedge<viz_callgraph_traits> (src, dest)
{}
void dump_dot (graphviz_out *gv, const dump_args_t &) const
@@ -3627,9 +3624,6 @@ public:
style, color, weight, constraint);
pp_printf (pp, "\"];\n");
}
-
-private:
- const call_superedge * const m_call_sedge;
};
/* Subclass of digraph representing the callgraph. */
@@ -3650,7 +3644,6 @@ public:
}
private:
- const supergraph &m_sg;
hash_map<function *, viz_callgraph_node *> m_map;
};
@@ -3663,7 +3656,6 @@ class viz_callgraph_cluster : public
cluster<viz_callgraph_traits>
/* viz_callgraph's ctor. */
viz_callgraph::viz_callgraph (const supergraph &sg)
-: m_sg (sg)
{
cgraph_node *node;
FOR_EACH_FUNCTION_WITH_GIMPLE_BODY (node)
@@ -3682,11 +3674,11 @@ viz_callgraph::viz_callgraph (const supergraph &sg)
viz_callgraph_node *vcg_src = get_vcg_node_for_snode (sedge->m_src);
if (vcg_src->m_fun)
get_vcg_node_for_function (vcg_src->m_fun)->m_num_superedges++;
- if (const call_superedge *call_sedge = sedge->dyn_cast_call_superedge ())
+ if (sedge->dyn_cast_call_superedge ())
{
viz_callgraph_node *vcg_dest = get_vcg_node_for_snode (sedge->m_dest);
viz_callgraph_edge *vcg_edge
- = new viz_callgraph_edge (vcg_src, vcg_dest, call_sedge);
+ = new viz_callgraph_edge (vcg_src, vcg_dest);
add_edge (vcg_edge);
}
}
diff --git a/gcc/analyzer/exploded-graph.h b/gcc/analyzer/exploded-graph.h
index c3bd383e924..c0a520a9961 100644
--- a/gcc/analyzer/exploded-graph.h
+++ b/gcc/analyzer/exploded-graph.h
@@ -710,7 +710,6 @@ private:
/* The order is important here: m_scc needs to stick around
until after m_queue has finished being cleaned up (the dtor
calls the ordering fns). */
- const exploded_graph &m_eg;
strongly_connected_components m_scc;
const analysis_plan &m_plan;
--
2.21.0
