[PR,67794] Also remap SSA_NAMEs defined in ASMs in IPA-SRA

On Tue, Oct 27, 2015 at 09:56:48AM +0100, Christophe Lyon wrote:
> Hi Martin,
> 
> After your backport in the gcc-5 branch, I see build failures:
> /tmp/2849532_27.tmpdir/aci-gcc-fsf/sources/gcc-fsf/gccsrc/gcc/tree-sra.c:
> In function ‘tree_node* replace_removed_params_ssa_names(tree_node*,
> gimple_statement_base**, ipa_parm_adjustment_vec)’:
> /tmp/2849532_27.tmpdir/aci-gcc-fsf/sources/gcc-fsf/gccsrc/gcc/tree-sra.c:4609:
> error: cannot convert ‘gimple_statement_base**’ to
> ‘gimple_statement_base*’ for argument ‘2’ to ‘tree_node*
> make_ssa_name(tree_node*, gimple_statement_base*)’
> /tmp/2849532_27.tmpdir/aci-gcc-fsf/sources/gcc-fsf/gccsrc/gcc/tree-sra.c:
> In function ‘bool
> ipa_sra_modify_function_body(ipa_parm_adjustment_vec)’:
> /tmp/2849532_27.tmpdir/aci-gcc-fsf/sources/gcc-fsf/gccsrc/gcc/tree-sra.c:4703:
> error: cannot convert ‘gphi*’ to ‘gimple_statement_base**’ for
> argument ‘2’ to ‘tree_node*
> replace_removed_params_ssa_names(tree_node*, gimple_statement_base**,
> ipa_parm_adjustment_vec)’
> /tmp/2849532_27.tmpdir/aci-gcc-fsf/sources/gcc-fsf/gccsrc/gcc/tree-sra.c:4772:
> error: cannot convert ‘gimple_statement_base*’ to
> ‘gimple_statement_base**’ for argument ‘2’ to ‘tree_node*
> replace_removed_params_ssa_names(tree_node*, gimple_statement_base**,
> ipa_parm_adjustment_vec)’
> make[2]: *** [tree-sra.o] Error 1
> 
> I see this on aarch64* and arm* targets.
> 
> Can you fix this?

Oops, I must have mistakenly committed the trunk version to the
branch.  I have just fixed the problem by committing the following
(after checking that tree-sra.c now matches the one I have tested on
the branch).

Sorry and thanks for reporting,

Martin


2015-10-27  Martin Jambor  <mjambor@suse.cz>

	* tree-sra.c (replace_removed_params_ssa_names): Change type of
	parameter stmt to gimple.

On 27 October 2015 at 13:26, Martin Jambor <mjambor@suse.cz> wrote:
> On Tue, Oct 27, 2015 at 09:56:48AM +0100, Christophe Lyon wrote:
>> Hi Martin,
>>
>> After your backport in the gcc-5 branch, I see build failures:
>> /tmp/2849532_27.tmpdir/aci-gcc-fsf/sources/gcc-fsf/gccsrc/gcc/tree-sra.c:
>> In function ‘tree_node* replace_removed_params_ssa_names(tree_node*,
>> gimple_statement_base**, ipa_parm_adjustment_vec)’:
>> /tmp/2849532_27.tmpdir/aci-gcc-fsf/sources/gcc-fsf/gccsrc/gcc/tree-sra.c:4609:
>> error: cannot convert ‘gimple_statement_base**’ to
>> ‘gimple_statement_base*’ for argument ‘2’ to ‘tree_node*
>> make_ssa_name(tree_node*, gimple_statement_base*)’
>> /tmp/2849532_27.tmpdir/aci-gcc-fsf/sources/gcc-fsf/gccsrc/gcc/tree-sra.c:
>> In function ‘bool
>> ipa_sra_modify_function_body(ipa_parm_adjustment_vec)’:
>> /tmp/2849532_27.tmpdir/aci-gcc-fsf/sources/gcc-fsf/gccsrc/gcc/tree-sra.c:4703:
>> error: cannot convert ‘gphi*’ to ‘gimple_statement_base**’ for
>> argument ‘2’ to ‘tree_node*
>> replace_removed_params_ssa_names(tree_node*, gimple_statement_base**,
>> ipa_parm_adjustment_vec)’
>> /tmp/2849532_27.tmpdir/aci-gcc-fsf/sources/gcc-fsf/gccsrc/gcc/tree-sra.c:4772:
>> error: cannot convert ‘gimple_statement_base*’ to
>> ‘gimple_statement_base**’ for argument ‘2’ to ‘tree_node*
>> replace_removed_params_ssa_names(tree_node*, gimple_statement_base**,
>> ipa_parm_adjustment_vec)’
>> make[2]: *** [tree-sra.o] Error 1
>>
>> I see this on aarch64* and arm* targets.
>>
>> Can you fix this?
>
> Oops, I must have mistakenly committed the trunk version to the
> branch.  I have just fixed the problem by committing the following
> (after checking that tree-sra.c now matches the one I have tested on
> the branch).
>
> Sorry and thanks for reporting,
>
Thanks, I confirm that the builds are OK again on aarch64 and arm targets.

Christophe.

> Martin
>
>
> 2015-10-27  Martin Jambor  <mjambor@suse.cz>
>
>         * tree-sra.c (replace_removed_params_ssa_names): Change type of
>         parameter stmt to gimple.
>
> Index: gcc/tree-sra.c
> ===================================================================
> --- gcc/tree-sra.c      (revision 229434)
> +++ gcc/tree-sra.c      (working copy)
> @@ -4587,7 +4587,7 @@ get_adjustment_for_base (ipa_parm_adjust
>     ADJUSTMENTS is a pointer to a vector of IPA-SRA adjustments.  */
>
>  static tree
> -replace_removed_params_ssa_names (tree old_name, gimple *stmt,
> +replace_removed_params_ssa_names (tree old_name, gimple stmt,
>                                   ipa_parm_adjustment_vec adjustments)
>  {
>    struct ipa_parm_adjustment *adj;
>