diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a7ad5fa5f932473222736ff30f5c4e00a3fbaa24..1759f1bffe6ffa93985ab3dba98cc2c22b518565 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2020-01-27 David Malcolm <dmalcolm@redhat.com>
+
+ PR analyzer/93276
+ * digraph.cc (test_edge::test_edge): Specify template for base
+ class initializer.
+
2020-01-27 Claudiu Zissulescu <claziss@synopsys.com>
* config/arc/arc.c (arc_rtx_costs): Update mul64 cost.
diff --git a/gcc/analyzer/ChangeLog b/gcc/analyzer/ChangeLog
index 34c311d55bf1d0eb6298b8b5ab584dd98d4073c1..359ea14a7487b940fc0d11a87ea321dc5e67c072 100644
--- a/gcc/analyzer/ChangeLog
+++ b/gcc/analyzer/ChangeLog
@@ -1,3 +1,27 @@
+2020-01-27 David Malcolm <dmalcolm@redhat.com>
+
+ 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.
+
2020-01-23 David Malcolm <dmalcolm@redhat.com>
PR analyzer/93375
diff --git a/gcc/analyzer/analyzer.h b/gcc/analyzer/analyzer.h
index e84e6958cec84c994a257919b7fd12333a19da50..9746c9e0123585520a1a906a17125e7fb6cd0a9b 100644
--- a/gcc/analyzer/analyzer.h
+++ b/gcc/analyzer/analyzer.h
@@ -98,17 +98,21 @@ public:
~auto_cfun () { pop_cfun (); }
};
-/* Begin suppressing -Wformat and -Wformat-extra-args. */
+/* Macros for temporarily suppressing -Wformat and -Wformat-extra-args,
+ for those versions of GCC that support pragmas within a function
+ (4.6 onwards). */
-#define PUSH_IGNORE_WFORMAT \
+#if GCC_VERSION >= 4006
+# define PUSH_IGNORE_WFORMAT \
_Pragma("GCC diagnostic push") \
_Pragma("GCC diagnostic ignored \"-Wformat\"") \
_Pragma("GCC diagnostic ignored \"-Wformat-extra-args\"")
-
-/* Finish suppressing -Wformat and -Wformat-extra-args. */
-
-#define POP_IGNORE_WFORMAT \
+# define POP_IGNORE_WFORMAT \
_Pragma("GCC diagnostic pop")
+#else
+# define PUSH_IGNORE_WFORMAT
+# define POP_IGNORE_WFORMAT
+#endif
/* A template for creating hash traits for a POD type. */
diff --git a/gcc/analyzer/engine.cc b/gcc/analyzer/engine.cc
index 737ea1dd6e42fa9de8d85407c7580b021dfcf8ba..a2587a33a66e002ef0b40d9edebd5314326aae02 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)
{}
diff --git a/gcc/analyzer/program-state.cc b/gcc/analyzer/program-state.cc
index ba19ad1490e03507c2c2c9fda0c98b5ae3e71ac6..a9e300fba0fffea5e597991fb2ee29c0fdc33fe3 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)
{
diff --git a/gcc/analyzer/program-state.h b/gcc/analyzer/program-state.h
index a2c5c9a113753170f68da25973ef0ec9f2b3ec16..adc71a4eda2a4097aa80a159d11f374b318c2ad6 100644
--- a/gcc/analyzer/program-state.h
+++ b/gcc/analyzer/program-state.h
@@ -132,7 +132,7 @@ public:
svalue_id m_origin;
};
typedef hash_map <svalue_id, entry_t> map_t;
- typedef typename map_t::iterator iterator_t;
+ typedef map_t::iterator iterator_t;
sm_state_map ();
diff --git a/gcc/analyzer/supergraph.h b/gcc/analyzer/supergraph.h
index 3580ae60c087b3c034d80f64dc88deb9f56bca96..0eac0b8bfc9b3614ecfb6bb28391846e1dd7f672 100644
--- a/gcc/analyzer/supergraph.h
+++ b/gcc/analyzer/supergraph.h
@@ -304,7 +304,7 @@ class superedge : public dedge<supergraph_traits>
protected:
superedge (supernode *src, supernode *dest, enum edge_kind kind)
- : dedge (src, dest),
+ : dedge<supergraph_traits> (src, dest),
m_kind (kind)
{}
diff --git a/gcc/digraph.cc b/gcc/digraph.cc
index 02ff93dac13c0251e1936150f0272b9cec0089cc..31b3e19851f62740350d6c152b90875a8e8e00a8 100644
--- a/gcc/digraph.cc
+++ b/gcc/digraph.cc
@@ -62,7 +62,7 @@ struct test_node : public dnode<test_graph_traits>
struct test_edge : public dedge<test_graph_traits>
{
test_edge (node_t *src, node_t *dest)
- : dedge (src, dest)
+ : dedge<test_graph_traits> (src, dest)
{}
void dump_dot (graphviz_out *gv, const dump_args_t &) const OVERRIDE