Re: [PATCH] Fix ipa-pure-const with same_body aliases

[Richard Guenther <richard dot guenther at gmail dot com>]

On Mon, Dec 14, 2009 at 12:33 PM, Jakub Jelinek <jakub@redhat.com> wrote:
> On Mon, Dec 14, 2009 at 11:55:40AM +0100, Richard Guenther wrote:
>> On Mon, Dec 14, 2009 at 11:52 AM, Paolo Carlini
>> <paolo.carlini@oracle.com> wrote:
>> > On 12/14/2009 11:50 AM, Jakub Jelinek wrote:
>> >> The following patch fixes that, ok for trunk?
>> >>
>> > Are you **really** sure that there is no simple way to abstract out
>> > those loops to a separate function?
>>
>> This was also what I was thinking. ?Maybe
>> cgraph_node_set_{nothrow,pure,const...}()
>> or cgraph_node_set_flags () and use the ECF_* flags.
>
> Here is the former if you prefer so:

Hm, indeed not very much prettier.  I'll let Honza break the tie here
(I'm ok with either variant, some people might argue abstraction is
always better - I'm not so strict here).

Thanks,
Richard.

> 2009-12-14 ?Jakub Jelinek ?<jakub@redhat.com>
>
> ? ? ? ?* cgraph. (cgraph_set_nothrow_flag, cgraph_set_readonly_flag,
> ? ? ? ?cgraph_set_pure_flag, cgraph_set_looping_const_or_pure_flag): New
> ? ? ? ?functions.
> ? ? ? ?* except.c (set_nothrow_function_flags): Use cgraph_set_nothrow_flag.
> ? ? ? ?* ipa-pure-const.c (propagate): Use cgraph_set_nothrow_flag,
> ? ? ? ?cgraph_set_readonly_flag, cgraph_set_pure_flag
> ? ? ? ?and cgraph_set_looping_const_or_pure_flag.
> ? ? ? ?(local_pure_const): Likewise.
>
> --- gcc/cgraph.h.jj ? ? 2009-12-10 22:54:27.000000000 +0100
> +++ gcc/cgraph.h ? ? ? ?2009-12-14 12:28:58.000000000 +0100
> @@ -716,6 +716,55 @@ cgraph_can_remove_if_no_direct_calls_p (
> ? ? ? ? ?&& (DECL_COMDAT (node->decl) || !node->local.externally_visible));
> ?}
>
> +/* Set TREE_NOTHROW on NODE's decl and on same_body aliases of NODE
> + ? if any to NOTHROW. ?*/
> +
> +static inline void
> +cgraph_set_nothrow_flag (struct cgraph_node *node, bool nothrow)
> +{
> + ?struct cgraph_node *alias;
> + ?TREE_NOTHROW (node->decl) = nothrow;
> + ?for (alias = node->same_body; alias; alias = alias->next)
> + ? ?TREE_NOTHROW (alias->decl) = nothrow;
> +}
> +
> +/* Set TREE_READONLY on NODE's decl and on same_body aliases of NODE
> + ? if any to READONLY. ?*/
> +
> +static inline void
> +cgraph_set_readonly_flag (struct cgraph_node *node, bool readonly)
> +{
> + ?struct cgraph_node *alias;
> + ?TREE_READONLY (node->decl) = readonly;
> + ?for (alias = node->same_body; alias; alias = alias->next)
> + ? ?TREE_READONLY (alias->decl) = readonly;
> +}
> +
> +/* Set DECL_PURE_P on NODE's decl and on same_body aliases of NODE
> + ? if any to PURE. ?*/
> +
> +static inline void
> +cgraph_set_pure_flag (struct cgraph_node *node, bool pure)
> +{
> + ?struct cgraph_node *alias;
> + ?DECL_PURE_P (node->decl) = pure;
> + ?for (alias = node->same_body; alias; alias = alias->next)
> + ? ?DECL_PURE_P (alias->decl) = pure;
> +}
> +
> +/* Set DECL_LOOPING_CONST_OR_PURE_P on NODE's decl and on
> + ? same_body aliases of NODE if any to LOOPING_CONST_OR_PURE. ?*/
> +
> +static inline void
> +cgraph_set_looping_const_or_pure_flag (struct cgraph_node *node,
> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?bool looping_const_or_pure)
> +{
> + ?struct cgraph_node *alias;
> + ?DECL_LOOPING_CONST_OR_PURE_P (node->decl) = looping_const_or_pure;
> + ?for (alias = node->same_body; alias; alias = alias->next)
> + ? ?DECL_LOOPING_CONST_OR_PURE_P (alias->decl) = looping_const_or_pure;
> +}
> +
> ?/* Constant pool accessor function. ?*/
> ?htab_t constant_pool_htab (void);
>
> --- gcc/except.c.jj ? ? 2009-11-25 16:47:36.000000000 +0100
> +++ gcc/except.c ? ? ? ?2009-12-14 12:25:11.000000000 +0100
> @@ -1892,7 +1892,7 @@ set_nothrow_function_flags (void)
> ? ? ? struct cgraph_edge *e;
> ? ? ? for (e = node->callers; e; e = e->next_caller)
> ? ? ? ? e->can_throw_external = false;
> - ? ? ?TREE_NOTHROW (current_function_decl) = 1;
> + ? ? ?cgraph_set_nothrow_flag (node, true);
>
> ? ? ? if (dump_file)
> ? ? ? ?fprintf (dump_file, "Marking function nothrow: %s\n\n",
> --- gcc/ipa-pure-const.c.jj ? ? 2009-11-28 17:16:14.000000000 +0100
> +++ gcc/ipa-pure-const.c ? ? ? ?2009-12-14 12:28:00.000000000 +0100
> @@ -941,8 +941,8 @@ propagate (void)
> ? ? ? ? ? ? ? ?fprintf (dump_file, "Function found to be %sconst: %s\n",
> ? ? ? ? ? ? ? ? ? ? ? ? this_looping ? "looping " : "",
> ? ? ? ? ? ? ? ? ? ? ? ? cgraph_node_name (w));
> - ? ? ? ? ? ? TREE_READONLY (w->decl) = 1;
> - ? ? ? ? ? ? DECL_LOOPING_CONST_OR_PURE_P (w->decl) = this_looping;
> + ? ? ? ? ? ? cgraph_set_readonly_flag (w, true);
> + ? ? ? ? ? ? cgraph_set_looping_const_or_pure_flag (w, this_looping);
> ? ? ? ? ? ? ?break;
>
> ? ? ? ? ? ?case IPA_PURE:
> @@ -950,8 +950,8 @@ propagate (void)
> ? ? ? ? ? ? ? ?fprintf (dump_file, "Function found to be %spure: %s\n",
> ? ? ? ? ? ? ? ? ? ? ? ? this_looping ? "looping " : "",
> ? ? ? ? ? ? ? ? ? ? ? ? cgraph_node_name (w));
> - ? ? ? ? ? ? DECL_PURE_P (w->decl) = 1;
> - ? ? ? ? ? ? DECL_LOOPING_CONST_OR_PURE_P (w->decl) = this_looping;
> + ? ? ? ? ? ? cgraph_set_pure_flag (w, true);
> + ? ? ? ? ? ? cgraph_set_looping_const_or_pure_flag (w, this_looping);
> ? ? ? ? ? ? ?break;
>
> ? ? ? ? ? ?default:
> @@ -1032,7 +1032,7 @@ propagate (void)
> ? ? ? ? ?if (!can_throw && !TREE_NOTHROW (w->decl))
> ? ? ? ? ? ?{
> ? ? ? ? ? ? ?struct cgraph_edge *e;
> - ? ? ? ? ? ? TREE_NOTHROW (w->decl) = true;
> + ? ? ? ? ? ? cgraph_set_nothrow_flag (w, true);
> ? ? ? ? ? ? ?for (e = w->callers; e; e = e->next_caller)
> ? ? ? ? ? ? ? ?e->can_throw_external = false;
> ? ? ? ? ? ? ?if (dump_file)
> @@ -1110,6 +1110,7 @@ local_pure_const (void)
> ?{
> ? bool changed = false;
> ? funct_state l;
> + ?struct cgraph_node *node;
>
> ? /* Because we do not schedule pass_fixup_cfg over whole program after early optimizations
> ? ? ?we must not promote functions that are called by already processed functions. ?*/
> @@ -1120,23 +1121,23 @@ local_pure_const (void)
> ? ? ? ? fprintf (dump_file, "Function called in recursive cycle; ignoring\n");
> ? ? ? return 0;
> ? ? }
> - ?if (cgraph_function_body_availability (cgraph_node (current_function_decl))
> - ? ? ?<= AVAIL_OVERWRITABLE)
> + ?node = cgraph_node (current_function_decl);
> + ?if (cgraph_function_body_availability (node) <= AVAIL_OVERWRITABLE)
> ? ? {
> ? ? ? if (dump_file)
> ? ? ? ? fprintf (dump_file, "Function has wrong visibility; ignoring\n");
> ? ? ? return 0;
> ? ? }
>
> - ?l = analyze_function (cgraph_node (current_function_decl), false);
> + ?l = analyze_function (node, false);
>
> ? switch (l->pure_const_state)
> ? ? {
> ? ? case IPA_CONST:
> ? ? ? if (!TREE_READONLY (current_function_decl))
> ? ? ? ?{
> - ? ? ? ? TREE_READONLY (current_function_decl) = 1;
> - ? ? ? ? DECL_LOOPING_CONST_OR_PURE_P (current_function_decl) = l->looping;
> + ? ? ? ? cgraph_set_readonly_flag (node, true);
> + ? ? ? ? cgraph_set_looping_const_or_pure_flag (node, l->looping);
> ? ? ? ? ?changed = true;
> ? ? ? ? ?if (dump_file)
> ? ? ? ? ? ?fprintf (dump_file, "Function found to be %sconst: %s\n",
> @@ -1147,7 +1148,7 @@ local_pure_const (void)
> ? ? ? else if (DECL_LOOPING_CONST_OR_PURE_P (current_function_decl)
> ? ? ? ? ? ? ? && !l->looping)
> ? ? ? ?{
> - ? ? ? ? DECL_LOOPING_CONST_OR_PURE_P (current_function_decl) = false;
> + ? ? ? ? cgraph_set_looping_const_or_pure_flag (node, false);
> ? ? ? ? ?changed = true;
> ? ? ? ? ?if (dump_file)
> ? ? ? ? ? ?fprintf (dump_file, "Function found to be non-looping: %s\n",
> @@ -1159,8 +1160,8 @@ local_pure_const (void)
> ? ? case IPA_PURE:
> ? ? ? if (!TREE_READONLY (current_function_decl))
> ? ? ? ?{
> - ? ? ? ? DECL_PURE_P (current_function_decl) = 1;
> - ? ? ? ? DECL_LOOPING_CONST_OR_PURE_P (current_function_decl) = l->looping;
> + ? ? ? ? cgraph_set_pure_flag (node, true);
> + ? ? ? ? cgraph_set_looping_const_or_pure_flag (node, l->looping);
> ? ? ? ? ?changed = true;
> ? ? ? ? ?if (dump_file)
> ? ? ? ? ? ?fprintf (dump_file, "Function found to be %spure: %s\n",
> @@ -1171,7 +1172,7 @@ local_pure_const (void)
> ? ? ? else if (DECL_LOOPING_CONST_OR_PURE_P (current_function_decl)
> ? ? ? ? ? ? ? && !l->looping)
> ? ? ? ?{
> - ? ? ? ? DECL_LOOPING_CONST_OR_PURE_P (current_function_decl) = false;
> + ? ? ? ? cgraph_set_looping_const_or_pure_flag (node, false);
> ? ? ? ? ?changed = true;
> ? ? ? ? ?if (dump_file)
> ? ? ? ? ? ?fprintf (dump_file, "Function found to be non-looping: %s\n",
> @@ -1187,9 +1188,8 @@ local_pure_const (void)
> ? ? {
> ? ? ? struct cgraph_edge *e;
>
> - ? ? ?TREE_NOTHROW (current_function_decl) = true;
> - ? ? ?for (e = cgraph_node (current_function_decl)->callers;
> - ? ? ? ? ? e; e = e->next_caller)
> + ? ? ?cgraph_set_nothrow_flag (node, true);
> + ? ? ?for (e = node->callers; e; e = e->next_caller)
> ? ? ? ?e->can_throw_external = false;
> ? ? ? changed = true;
> ? ? ? if (dump_file)
>
>
> ? ? ? ?Jakub
>