On Fri, May 21, 2021 at 2:34 PM Aldy Hernandez via Gcc-patches
<gcc-patches@gcc.gnu.org> wrote:
>
> This patch converts the Walloca pass to use an on-demand ranger
> accesible with RANGE_QUERY instead of having to create a ranger and pass
> it around.
>
> Tested on x86-64 Linux.
>
> OK?
>
> gcc/ChangeLog:
>
> * gimple-ssa-warn-alloca.c (alloca_call_type): Use RANGE_QUERY
> instead of query argument.
> (pass_walloca::execute): Enable and disable global ranger.
> ---
> gcc/gimple-ssa-warn-alloca.c | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/gcc/gimple-ssa-warn-alloca.c b/gcc/gimple-ssa-warn-alloca.c
> index e9a24d4d1d0..12f4bce3be8 100644
> --- a/gcc/gimple-ssa-warn-alloca.c
> +++ b/gcc/gimple-ssa-warn-alloca.c
> @@ -165,7 +165,7 @@ adjusted_warn_limit (bool idx)
> // call was created by the gimplifier for a VLA.
>
> static class alloca_type_and_limit
> -alloca_call_type (range_query &query, gimple *stmt, bool is_vla)
> +alloca_call_type (gimple *stmt, bool is_vla)
> {
> gcc_assert (gimple_alloca_call_p (stmt));
> tree len = gimple_call_arg (stmt, 0);
> @@ -217,7 +217,7 @@ alloca_call_type (range_query &query, gimple *stmt, bool
> is_vla)
> int_range_max r;
> if (warn_limit_specified_p (is_vla)
> && TREE_CODE (len) == SSA_NAME
> - && query.range_of_expr (r, len, stmt)
> + && RANGE_QUERY (cfun)->range_of_expr (r, len, stmt)
please avoid new references to 'cfun' and instead pass ...
> && !r.varying_p ())
> {
> // The invalid bits are anything outside of [0, MAX_SIZE].
> @@ -256,7 +256,7 @@ in_loop_p (gimple *stmt)
> unsigned int
> pass_walloca::execute (function *fun)
... 'fun' down.
> {
> - gimple_ranger ranger;
> + enable_ranger ();
> basic_block bb;
> FOR_EACH_BB_FN (bb, fun)
> {
> @@ -290,7 +290,7 @@ pass_walloca::execute (function *fun)
> continue;
>
> class alloca_type_and_limit t
> - = alloca_call_type (ranger, stmt, is_vla);
> + = alloca_call_type (stmt, is_vla);
>
> unsigned HOST_WIDE_INT adjusted_alloca_limit
> = adjusted_warn_limit (false);
> @@ -383,6 +383,7 @@ pass_walloca::execute (function *fun)
> }
> }
> }
> + disable_ranger ();
> return 0;
> }
>
> --
> 2.31.1
>
