public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc/devel/c++-modules] analyzer: fix build with gcc 4.4 (PR 93276)
@ 2020-01-31 17:42 Nathan Sidwell
0 siblings, 0 replies; 2+ messages in thread
From: Nathan Sidwell @ 2020-01-31 17:42 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:26d949c8c7a757df891ce79162b9bf15087418c6
commit 26d949c8c7a757df891ce79162b9bf15087418c6
Author: David Malcolm <dmalcolm@redhat.com>
Date: Fri Jan 24 21:31:21 2020 +0000
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.
Diff:
---
gcc/ChangeLog | 6 ++++++
gcc/analyzer/ChangeLog | 24 ++++++++++++++++++++++++
gcc/analyzer/analyzer.h | 16 ++++++++++------
gcc/analyzer/engine.cc | 10 +++++-----
gcc/analyzer/program-state.cc | 16 ++++++++--------
gcc/analyzer/program-state.h | 2 +-
gcc/analyzer/supergraph.h | 2 +-
gcc/digraph.cc | 2 +-
8 files changed, 56 insertions(+), 22 deletions(-)
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a7ad5fa..1759f1b 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 34c311d..359ea14 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 e84e695..9746c9e 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 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)
{}
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)
{
diff --git a/gcc/analyzer/program-state.h b/gcc/analyzer/program-state.h
index a2c5c9a..adc71a4 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 3580ae6..0eac0b8 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 02ff93d..31b3e19 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
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gcc/devel/c++-modules] analyzer: fix build with gcc 4.4 (PR 93276)
@ 2020-01-31 17:49 Nathan Sidwell
0 siblings, 0 replies; 2+ messages in thread
From: Nathan Sidwell @ 2020-01-31 17:49 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:7892ff37f407ef47ee852f281a80fa0dba6a5a67
commit 7892ff37f407ef47ee852f281a80fa0dba6a5a67
Author: Jakub Jelinek <jakub@redhat.com>
Date: Wed Jan 29 09:36:19 2020 +0100
analyzer: fix build with gcc 4.4 (PR 93276)
All that is really needed is make sure you #include "diagnostic-core.h"
before including pretty-print.h. By including
diagnostic-core.h first, you do:
and then pretty-print.h will do:
If instead pretty-print.h is included first, then it will use __gcc_diag__
instead of __gcc_tdiag__ and thus will assume %E/%D etc. can't be handled.
2020-01-29 Jakub Jelinek <jakub@redhat.com>
* analyzer.h (PUSH_IGNORE_WFORMAT, POP_IGNORE_WFORMAT): Remove.
* constraint-manager.cc: Include diagnostic-core.h before graphviz.h.
(range::dump, equiv_class::print): Don't use PUSH_IGNORE_WFORMAT or
POP_IGNORE_WFORMAT.
* state-purge.cc: Include diagnostic-core.h before
gimple-pretty-print.h.
(state_purge_annotator::add_node_annotations, print_vec_of_names):
Don't use PUSH_IGNORE_WFORMAT or POP_IGNORE_WFORMAT.
* region-model.cc: Move diagnostic-core.h include before graphviz.h.
(path_var::dump, svalue::print, constant_svalue::print_details,
region::dump_to_pp, region::dump_child_label, region::print_fields,
map_region::print_fields, map_region::dump_dot_to_pp,
map_region::dump_child_label, array_region::print_fields,
array_region::dump_dot_to_pp): Don't use PUSH_IGNORE_WFORMAT or
POP_IGNORE_WFORMAT.
Diff:
---
gcc/analyzer/ChangeLog | 18 ++++++++++++++++++
gcc/analyzer/analyzer.h | 16 ----------------
gcc/analyzer/constraint-manager.cc | 5 +----
gcc/analyzer/region-model.cc | 24 +-----------------------
gcc/analyzer/state-purge.cc | 5 +----
5 files changed, 21 insertions(+), 47 deletions(-)
diff --git a/gcc/analyzer/ChangeLog b/gcc/analyzer/ChangeLog
index c665ac1..94a67ea 100644
--- a/gcc/analyzer/ChangeLog
+++ b/gcc/analyzer/ChangeLog
@@ -1,3 +1,21 @@
+2020-01-29 Jakub Jelinek <jakub@redhat.com>
+
+ * analyzer.h (PUSH_IGNORE_WFORMAT, POP_IGNORE_WFORMAT): Remove.
+ * constraint-manager.cc: Include diagnostic-core.h before graphviz.h.
+ (range::dump, equiv_class::print): Don't use PUSH_IGNORE_WFORMAT or
+ POP_IGNORE_WFORMAT.
+ * state-purge.cc: Include diagnostic-core.h before
+ gimple-pretty-print.h.
+ (state_purge_annotator::add_node_annotations, print_vec_of_names):
+ Don't use PUSH_IGNORE_WFORMAT or POP_IGNORE_WFORMAT.
+ * region-model.cc: Move diagnostic-core.h include before graphviz.h.
+ (path_var::dump, svalue::print, constant_svalue::print_details,
+ region::dump_to_pp, region::dump_child_label, region::print_fields,
+ map_region::print_fields, map_region::dump_dot_to_pp,
+ map_region::dump_child_label, array_region::print_fields,
+ array_region::dump_dot_to_pp): Don't use PUSH_IGNORE_WFORMAT or
+ POP_IGNORE_WFORMAT.
+
2020-01-28 David Malcolm <dmalcolm@redhat.com>
PR analyzer/93316
diff --git a/gcc/analyzer/analyzer.h b/gcc/analyzer/analyzer.h
index f1602e3..1ae76cc 100644
--- a/gcc/analyzer/analyzer.h
+++ b/gcc/analyzer/analyzer.h
@@ -100,22 +100,6 @@ public:
~auto_cfun () { pop_cfun (); }
};
-/* Macros for temporarily suppressing -Wformat and -Wformat-extra-args,
- for those versions of GCC that support pragmas within a function
- (4.6 onwards). */
-
-#if GCC_VERSION >= 4006
-# define PUSH_IGNORE_WFORMAT \
- _Pragma("GCC diagnostic push") \
- _Pragma("GCC diagnostic ignored \"-Wformat\"") \
- _Pragma("GCC diagnostic ignored \"-Wformat-extra-args\"")
-# 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. */
template <typename Type>
diff --git a/gcc/analyzer/constraint-manager.cc b/gcc/analyzer/constraint-manager.cc
index 9d13ec3..777bd1b 100644
--- a/gcc/analyzer/constraint-manager.cc
+++ b/gcc/analyzer/constraint-manager.cc
@@ -28,6 +28,7 @@ along with GCC; see the file COPYING3. If not see
#include "gimple-iterator.h"
#include "fold-const.h"
#include "selftest.h"
+#include "diagnostic-core.h"
#include "graphviz.h"
#include "function.h"
#include "analyzer/analyzer.h"
@@ -120,13 +121,11 @@ bound::get_relation_as_str () const
void
range::dump (pretty_printer *pp) const
{
-PUSH_IGNORE_WFORMAT
pp_printf (pp, "%qE %s x %s %qE",
m_lower_bound.m_constant,
m_lower_bound.get_relation_as_str (),
m_upper_bound.get_relation_as_str (),
m_upper_bound.m_constant);
-POP_IGNORE_WFORMAT
}
/* Determine if there is only one possible value for this range.
@@ -200,9 +199,7 @@ equiv_class::print (pretty_printer *pp) const
{
if (i > 0)
pp_string (pp, " == ");
-PUSH_IGNORE_WFORMAT
pp_printf (pp, "%qE", m_constant);
-POP_IGNORE_WFORMAT
}
pp_character (pp, '}');
}
diff --git a/gcc/analyzer/region-model.cc b/gcc/analyzer/region-model.cc
index acaadcf..a5b3dff 100644
--- a/gcc/analyzer/region-model.cc
+++ b/gcc/analyzer/region-model.cc
@@ -26,6 +26,7 @@ along with GCC; see the file COPYING3. If not see
#include "basic-block.h"
#include "gimple.h"
#include "gimple-iterator.h"
+#include "diagnostic-core.h"
#include "graphviz.h"
#include "options.h"
#include "cgraph.h"
@@ -37,7 +38,6 @@ along with GCC; see the file COPYING3. If not see
#include "tree-pretty-print.h"
#include "diagnostic-color.h"
#include "diagnostic-metadata.h"
-#include "diagnostic-core.h"
#include "tristate.h"
#include "bitmap.h"
#include "selftest.h"
@@ -88,14 +88,12 @@ dump_tree (pretty_printer *pp, tree t)
void
path_var::dump (pretty_printer *pp) const
{
-PUSH_IGNORE_WFORMAT
if (m_tree == NULL_TREE)
pp_string (pp, "NULL");
if (CONSTANT_CLASS_P (m_tree))
pp_printf (pp, "%qE", m_tree);
else
pp_printf (pp, "(%qE @ %i)", m_tree, m_stack_depth);
-POP_IGNORE_WFORMAT
}
/* For use in printing a comma-separated list. */
@@ -318,13 +316,11 @@ svalue::print (const region_model &model,
this_sid.print (pp);
pp_string (pp, ": {");
-PUSH_IGNORE_WFORMAT
if (m_type)
{
gcc_assert (TYPE_P (m_type));
pp_printf (pp, "type: %qT, ", m_type);
}
-POP_IGNORE_WFORMAT
/* vfunc. */
print_details (model, this_sid, pp);
@@ -686,9 +682,7 @@ constant_svalue::print_details (const region_model &model ATTRIBUTE_UNUSED,
svalue_id this_sid ATTRIBUTE_UNUSED,
pretty_printer *pp) const
{
-PUSH_IGNORE_WFORMAT
pp_printf (pp, "%qE", m_cst_expr);
-POP_IGNORE_WFORMAT
}
/* Implementation of svalue::get_child_sid vfunc for constant_svalue. */
@@ -1284,9 +1278,7 @@ region::dump_to_pp (const region_model &model,
}
if (m_type)
{
-PUSH_IGNORE_WFORMAT
pp_printf (pp, "%s type: %qT", field_prefix, m_type);
-POP_IGNORE_WFORMAT
pp_newline (pp);
}
@@ -1336,9 +1328,7 @@ region::dump_child_label (const region_model &model,
pp_string (pp, "active ");
else
pp_string (pp, "inactive ");
-PUSH_IGNORE_WFORMAT
pp_printf (pp, "view as %qT: ", child->get_type ());
-POP_IGNORE_WFORMAT
}
}
@@ -1468,10 +1458,8 @@ region::print_fields (const region_model &model ATTRIBUTE_UNUSED,
pp_printf (pp, ", sval: ");
m_sval_id.print (pp);
-PUSH_IGNORE_WFORMAT
if (m_type)
pp_printf (pp, ", type: %qT", m_type);
-POP_IGNORE_WFORMAT
}
/* Determine if a pointer to this region must be non-NULL.
@@ -1574,9 +1562,7 @@ map_region::print_fields (const region_model &model,
pp_string (pp, ", ");
tree expr = (*iter).first;
region_id child_rid = (*iter).second;
-PUSH_IGNORE_WFORMAT
pp_printf (pp, "%qE: ", expr);
-POP_IGNORE_WFORMAT
child_rid.print (pp);
}
pp_string (pp, "}");
@@ -1601,9 +1587,7 @@ map_region::dump_dot_to_pp (const region_model &model,
pp_printf (pp, "rid_label_%i [label=\"", child_rid.as_int ());
pp_write_text_to_stream (pp);
-PUSH_IGNORE_WFORMAT
pp_printf (pp, "%qE", expr);
-POP_IGNORE_WFORMAT
pp_write_text_as_dot_label_to_stream (pp, /*for_record=*/false);
pp_string (pp, "\"];");
pp_newline (pp);
@@ -1633,12 +1617,10 @@ map_region::dump_child_label (const region_model &model,
if (child_rid == (*iter).second)
{
tree key = (*iter).first;
-PUSH_IGNORE_WFORMAT
if (DECL_P (key))
pp_printf (pp, "%qD: ", key);
else
pp_printf (pp, "%qE: ", key);
-POP_IGNORE_WFORMAT
}
}
}
@@ -2246,9 +2228,7 @@ array_region::print_fields (const region_model &model,
pp_string (pp, ", ");
int key = (*iter).first;
region_id child_rid = (*iter).second;
-PUSH_IGNORE_WFORMAT
pp_printf (pp, "[%i]: ", key);
-POP_IGNORE_WFORMAT
child_rid.print (pp);
}
pp_string (pp, "}");
@@ -2273,9 +2253,7 @@ array_region::dump_dot_to_pp (const region_model &model,
pp_printf (pp, "rid_label_%i [label=\"", child_rid.as_int ());
pp_write_text_to_stream (pp);
-PUSH_IGNORE_WFORMAT
pp_printf (pp, "%qi", key);
-POP_IGNORE_WFORMAT
pp_write_text_as_dot_label_to_stream (pp, /*for_record=*/false);
pp_string (pp, "\"];");
pp_newline (pp);
diff --git a/gcc/analyzer/state-purge.cc b/gcc/analyzer/state-purge.cc
index 32c5647..01237f0 100644
--- a/gcc/analyzer/state-purge.cc
+++ b/gcc/analyzer/state-purge.cc
@@ -34,6 +34,7 @@ along with GCC; see the file COPYING3. If not see
#include "tree-phinodes.h"
#include "options.h"
#include "ssa-iterators.h"
+#include "diagnostic-core.h"
#include "gimple-pretty-print.h"
#include "function.h"
#include "analyzer/analyzer.h"
@@ -444,12 +445,10 @@ state_purge_annotator::add_node_annotations (graphviz_out *gv,
state_purge_per_ssa_name *per_name_data = (*iter).second;
if (per_name_data->get_function () == n.m_fun)
{
-PUSH_IGNORE_WFORMAT
if (per_name_data->needed_at_point_p (before_supernode))
pp_printf (pp, "%qE needed here", name);
else
pp_printf (pp, "%qE not needed here", name);
-POP_IGNORE_WFORMAT
}
pp_newline (pp);
}
@@ -476,9 +475,7 @@ print_vec_of_names (graphviz_out *gv, const char *title,
{
if (i > 0)
pp_string (pp, ", ");
-PUSH_IGNORE_WFORMAT
pp_printf (pp, "%qE", name);
-POP_IGNORE_WFORMAT
}
pp_printf (pp, "}");
pp_write_text_as_html_like_dot_to_stream (pp);
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-01-31 17:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-31 17:42 [gcc/devel/c++-modules] analyzer: fix build with gcc 4.4 (PR 93276) Nathan Sidwell
2020-01-31 17:49 Nathan Sidwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).