aboutsummaryrefslogtreecommitdiff
path: root/gcc/analyzer/program-state.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/program-state.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/program-state.cc')
-rw-r--r--gcc/analyzer/program-state.cc16
1 files changed, 8 insertions, 8 deletions
diff --git a/gcc/analyzer/program-state.cc b/gcc/analyzer/program-state.cc
index ba19ad1..a9e300f 100644
--- a/gcc/analyzer/program-state.cc
+++ b/gcc/analyzer/program-state.cc
@@ -87,7 +87,7 @@ sm_state_map::clone_with_remapping (const one_way_svalue_id_map &id_map) const
{
sm_state_map *result = new sm_state_map ();
result->m_global_state = m_global_state;
- for (typename map_t::iterator iter = m_map.begin ();
+ for (map_t::iterator iter = m_map.begin ();
iter != m_map.end ();
++iter)
{
@@ -121,7 +121,7 @@ sm_state_map::print (const state_machine &sm, pretty_printer *pp) const
pp_printf (pp, "global: %s", sm.get_state_name (m_global_state));
first = false;
}
- for (typename map_t::iterator iter = m_map.begin ();
+ for (map_t::iterator iter = m_map.begin ();
iter != m_map.end ();
++iter)
{
@@ -172,7 +172,7 @@ sm_state_map::hash () const
/* Accumulate the result by xoring a hash for each slot, so that the
result doesn't depend on the ordering of the slots in the map. */
- for (typename map_t::iterator iter = m_map.begin ();
+ for (map_t::iterator iter = m_map.begin ();
iter != m_map.end ();
++iter)
{
@@ -199,7 +199,7 @@ sm_state_map::operator== (const sm_state_map &other) const
if (m_map.elements () != other.m_map.elements ())
return false;
- for (typename map_t::iterator iter = m_map.begin ();
+ for (map_t::iterator iter = m_map.begin ();
iter != m_map.end ();
++iter)
{
@@ -395,7 +395,7 @@ sm_state_map::remap_svalue_ids (const svalue_id_map &map)
map_t tmp_map;
/* Build an intermediate map, using the new sids. */
- for (typename map_t::iterator iter = m_map.begin ();
+ for (map_t::iterator iter = m_map.begin ();
iter != m_map.end ();
++iter)
{
@@ -411,7 +411,7 @@ sm_state_map::remap_svalue_ids (const svalue_id_map &map)
m_map.empty ();
/* Copy over from intermediate map. */
- for (typename map_t::iterator iter = tmp_map.begin ();
+ for (map_t::iterator iter = tmp_map.begin ();
iter != tmp_map.end ();
++iter)
{
@@ -437,7 +437,7 @@ sm_state_map::on_svalue_purge (const state_machine &sm,
/* TODO: ideally remove the slot directly; for now
do it in two stages. */
auto_vec<svalue_id> to_remove;
- for (typename map_t::iterator iter = m_map.begin ();
+ for (map_t::iterator iter = m_map.begin ();
iter != m_map.end ();
++iter)
{
@@ -507,7 +507,7 @@ sm_state_map::validate (const state_machine &sm,
return;
#endif
- for (typename map_t::iterator iter = m_map.begin ();
+ for (map_t::iterator iter = m_map.begin ();
iter != m_map.end ();
++iter)
{