From 6471396dec0cfc30e30e64a70b0d0e6a02de2de7 Mon Sep 17 00:00:00 2001 From: Jan Hubicka Date: Sun, 14 Nov 2021 00:48:32 +0100 Subject: [PATCH] Fix bug in ipa-pure-const and add debug counters gcc/ChangeLog: PR lto/103211 * dbgcnt.def (ipa_attr): New counters. * ipa-pure-const.c: Include dbgcnt.c (ipa_make_function_const): Use debug counter. (ipa_make_function_pure): Likewise. (propagate_pure_const): Fix bug in my previous change. --- gcc/dbgcnt.def | 1 + gcc/ipa-pure-const.c | 13 +++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/gcc/dbgcnt.def b/gcc/dbgcnt.def index 3a85665a1d7..f8a15f3d1d1 100644 --- a/gcc/dbgcnt.def +++ b/gcc/dbgcnt.def @@ -175,6 +175,7 @@ DEBUG_COUNTER (if_after_reload) DEBUG_COUNTER (if_conversion) DEBUG_COUNTER (if_conversion_tree) DEBUG_COUNTER (if_to_switch) +DEBUG_COUNTER (ipa_attr) DEBUG_COUNTER (ipa_cp_bits) DEBUG_COUNTER (ipa_cp_values) DEBUG_COUNTER (ipa_cp_vr) diff --git a/gcc/ipa-pure-const.c b/gcc/ipa-pure-const.c index 5056850c0a8..a332940b55d 100644 --- a/gcc/ipa-pure-const.c +++ b/gcc/ipa-pure-const.c @@ -62,6 +62,7 @@ along with GCC; see the file COPYING3. If not see #include "ipa-prop.h" #include "ipa-fnsummary.h" #include "symtab-thunks.h" +#include "dbgcnt.h" /* Lattice values for const and pure functions. Everything starts out being const, then may drop to pure and then neither depending on @@ -1476,8 +1477,10 @@ ipa_make_function_const (struct cgraph_node *node, bool looping, bool local) fprintf (dump_file, "Function found to be %sconst: %s\n", looping ? "looping " : "", node->dump_name ()); - if (!local) + if (!local && !looping) cdtor = node->call_for_symbol_and_aliases (cdtor_p, NULL, true); + if (!dbg_cnt (ipa_attr)) + return false; if (node->set_const_flag (true, looping)) { if (dump_file) @@ -1511,8 +1514,10 @@ ipa_make_function_pure (struct cgraph_node *node, bool looping, bool local) fprintf (dump_file, "Function found to be %spure: %s\n", looping ? "looping " : "", node->dump_name ()); - if (!local) + if (!local && !looping) cdtor = node->call_for_symbol_and_aliases (cdtor_p, NULL, true); + if (!dbg_cnt (ipa_attr)) + return false; if (node->set_pure_flag (true, looping)) { if (dump_file) @@ -1797,11 +1802,11 @@ propagate_pure_const (void) switch (this_state) { case IPA_CONST: - remove_p |= ipa_make_function_const (node, this_looping, false); + remove_p |= ipa_make_function_const (w, this_looping, false); break; case IPA_PURE: - remove_p |= ipa_make_function_pure (node, this_looping, false); + remove_p |= ipa_make_function_pure (w, this_looping, false); break; default: