aboutsummaryrefslogtreecommitdiff
path: root/gcc/analyzer/engine.cc
diff options
context:
space:
mode:
authorDavid Malcolm <dmalcolm@redhat.com>2020-01-24 21:31:21 +0000
committerDavid Malcolm <dmalcolm@redhat.com>2020-01-27 09:43:23 -0500
commit26d949c8c7a757df891ce79162b9bf15087418c6 (patch)
tree0916fe8fd3b6adc1f3fabde821a2cf7a037608d9 /gcc/analyzer/engine.cc
parentfeaa1640b3543c7c3a1f3a788bc449a3638cb780 (diff)
downloadgcc-26d949c8c7a757df891ce79162b9bf15087418c6.zip
gcc-26d949c8c7a757df891ce79162b9bf15087418c6.tar.gz
gcc-26d949c8c7a757df891ce79162b9bf15087418c6.tar.bz2
analyzer: fix build with gcc 4.4 (PR 93276)
This patch fixes various build failures seen with gcc 4.4 gcc prior to 4.6 complains about: error: #pragma GCC diagnostic not allowed inside functions for various uses of PUSH_IGNORE_WFORMAT and POP_IGNORE_WFORMAT. This patch makes them a no-op with such compilers. The patch also fixes various errors with template base initializers and redundant uses of "typename" that older g++ implementations can't cope with. gcc/analyzer/ChangeLog: PR analyzer/93276 * analyzer.h (PUSH_IGNORE_WFORMAT, POP_IGNORE_WFORMAT): Guard these macros with GCC_VERSION >= 4006, making them no-op otherwise. * engine.cc (exploded_edge::exploded_edge): Specify template for base class initializer. (exploded_graph::add_edge): Specify template when chaining up to base class add_edge implementation. (viz_callgraph_node::dump_dot): Drop redundant "typename". (viz_callgraph_edge::viz_callgraph_edge): Specify template for base class initializer. * program-state.cc (sm_state_map::clone_with_remapping): Drop redundant "typename". (sm_state_map::print): Likewise. (sm_state_map::hash): Likewise. (sm_state_map::operator==): Likewise. (sm_state_map::remap_svalue_ids): Likewise. (sm_state_map::on_svalue_purge): Likewise. (sm_state_map::validate): Likewise. * program-state.h (sm_state_map::iterator_t): Likewise. * supergraph.h (superedge::superedge): Specify template for base class initializer. gcc/ChangeLog: PR analyzer/93276 * digraph.cc (test_edge::test_edge): Specify template for base class initializer.
Diffstat (limited to 'gcc/analyzer/engine.cc')
-rw-r--r--gcc/analyzer/engine.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/gcc/analyzer/engine.cc b/gcc/analyzer/engine.cc
index 737ea1d..a2587a3 100644
--- a/gcc/analyzer/engine.cc
+++ b/gcc/analyzer/engine.cc
@@ -1377,7 +1377,7 @@ rewind_info_t::add_events_to_path (checker_path *emission_path,
dst_stack_depth, this));
}
-/* class exploded_edge : public dedge. */
+/* class exploded_edge : public dedge<eg_traits>. */
/* exploded_edge's ctor. */
@@ -1385,7 +1385,7 @@ exploded_edge::exploded_edge (exploded_node *src, exploded_node *dest,
const superedge *sedge,
const state_change &change,
custom_info_t *custom_info)
-: dedge (src, dest), m_sedge (sedge), m_change (change),
+: dedge<eg_traits> (src, dest), m_sedge (sedge), m_change (change),
m_custom_info (custom_info)
{
change.validate (dest->get_state ());
@@ -1991,7 +1991,7 @@ exploded_graph::add_edge (exploded_node *src, exploded_node *dest,
exploded_edge::custom_info_t *custom_info)
{
exploded_edge *e = new exploded_edge (src, dest, sedge, change, custom_info);
- digraph::add_edge (e);
+ digraph<eg_traits>::add_edge (e);
return e;
}
@@ -3332,7 +3332,7 @@ public:
// TODO: also show the per-callstring breakdown
const exploded_graph::call_string_data_map_t *per_cs_data
= args.m_eg->get_per_call_string_data ();
- for (typename exploded_graph::call_string_data_map_t::iterator iter
+ for (exploded_graph::call_string_data_map_t::iterator iter
= per_cs_data->begin ();
iter != per_cs_data->end ();
++iter)
@@ -3391,7 +3391,7 @@ 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 (src, dest),
+ : dedge<viz_callgraph_traits> (src, dest),
m_call_sedge (call_sedge)
{}