On Wed, May 15, 2024 at 01:41:04PM +0200, Richard Biener wrote:
> PR middle-end/111422
> * cfgexpand.cc (add_scope_conflicts_2): Handle PHIs
> by recursing to their arguments.
> ---
> gcc/cfgexpand.cc | 21 +++++++++++++++++----
> 1 file changed, 17 insertions(+), 4 deletions(-)
>
> diff --git a/gcc/cfgexpand.cc b/gcc/cfgexpand.cc
> index 557cb28733b..e4d763fa998 100644
> --- a/gcc/cfgexpand.cc
> +++ b/gcc/cfgexpand.cc
> @@ -584,10 +584,23 @@ add_scope_conflicts_2 (tree use, bitmap work,
> || INTEGRAL_TYPE_P (TREE_TYPE (use))))
> {
> gimple *g = SSA_NAME_DEF_STMT (use);
> - if (is_gimple_assign (g))
> - if (tree op = gimple_assign_rhs1 (g))
> - if (TREE_CODE (op) == ADDR_EXPR)
> - visit (g, TREE_OPERAND (op, 0), op, work);
> + if (gassign *a = dyn_cast <gassign *> (g))
> + {
> + if (tree op = gimple_assign_rhs1 (a))
> + if (TREE_CODE (op) == ADDR_EXPR)
> + visit (a, TREE_OPERAND (op, 0), op, work);
> + }
> + else if (gphi *p = dyn_cast <gphi *> (g))
> + {
> + for (unsigned i = 0; i < gimple_phi_num_args (p); ++i)
> + if (TREE_CODE (use = gimple_phi_arg_def (p, i)) == SSA_NAME)
> + if (gassign *a = dyn_cast <gassign *> (SSA_NAME_DEF_STMT (use)))
> + {
> + if (tree op = gimple_assign_rhs1 (a))
> + if (TREE_CODE (op) == ADDR_EXPR)
> + visit (a, TREE_OPERAND (op, 0), op, work);
> + }
> + }
Why the 2 {} pairs here? Can't it be done without them (sure, before the
else if it is required)?
Otherwise LGTM.
Jakub
