We seem to be passing a lot of context around in the strlen code. I
certainly don't want to contribute to more.
Most of the handle_* functions are passing the gsi as well as either
ptr_qry or rvals. That looks a bit messy. May I suggest putting all
of that in the strlen pass object (well, the dom walker object, but we
can rename it to be less dom centric)?
Something like the attached (untested) patch could be the basis for
further cleanups.
Jakub, would this line of work interest you?
Aldy
On Fri, Oct 8, 2021 at 5:12 PM Aldy Hernandez <al...@redhat.com> wrote:
>
> The following patch converts the strlen pass from evrp to ranger,
> leaving DOM as the last remaining user.
>
> No additional cleanups have been done. For example, the strlen pass
> still has uses of VR_ANTI_RANGE, and the sprintf still passes around
> pairs of integers instead of using a proper range. Fixing this
> could further improve these passes.
>
> As a further enhancement, if the relevant maintainers deem useful,
> the domwalk could be removed from strlen. That is, unless the pass
> needs it for something else.
>
> With ranger we are now able to remove the range calculation from
> before_dom_children entirely. Just working with the ranger on-demand
> catches all the strlen and sprintf testcases with the exception of
> builtin-sprintf-warn-22.c which is due to a limitation of the sprintf
> code. I have XFAILed the test and documented what the problem is.
>
> It looks like the same problem in the sprintf test triggers a false
> positive in gimple-ssa-warn-access.cc so I have added
> -Wno-format-overflow until it can be fixed.
>
> I can expand on the false positive if necessary, but the gist is that
> this:
>
> _17 = strlen (_132);
> _18 = strlen (_136);
> _19 = _18 + _17;
> if (_19 > 75)
> goto <bb 59>; [0.00%]
> else
> goto <bb 61>; [100.00%]
>
> ...dominates the sprintf in BB61. This means that ranger can figure
> out that the _17 and _18 are [0, 75]. On the other hand, evrp
> returned a range of [0, 9223372036854775805] which presumably the
> sprintf code was ignoring as a false positive here:
>
> char sizstr[80];
> ...
> ...
> char *s1 = print_generic_expr_to_str (sizrng[1]);
> gcc_checking_assert (strlen (s0) + strlen (s1)
> < sizeof sizstr - 4);
> sprintf (sizstr, "[%s, %s]", s0, s1);
>
> The warning triggers with:
>
> gimple-ssa-warn-access.cc: In member function ‘void
> {anonymous}::pass_waccess::maybe_check_access_sizes(rdwr_map*, tree, tree,
> gimple*)’:
> gimple-ssa-warn-access.cc:2916:32: warning: ‘%s’ directive writing up to 75
> bytes into a region of size between 2 and 77 [-Wformat-overflow=]
> 2916 | sprintf (sizstr, "[%s, %s]", s0, s1);
> | ^~~~~~~~~~
> gimple-ssa-warn-access.cc:2916:23: note: ‘sprintf’ output between 5 and 155
> bytes into a destination of size 80
> 2916 | sprintf (sizstr, "[%s, %s]", s0, s1);
> | ~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~
>
> On a positive note, these changes found two possible sprintf overflow
> bugs in the C++ and Fortran front-ends which I have fixed below.
>
> Bootstrap and regtested on x86-64 Linux. I also ran it through our
> callgrind harness and there was no overall change in overall
> compilation time.
>
> OK?
>
> gcc/ChangeLog:
>
> * Makefile.in: Disable -Wformat-overflow for
> gimple-ssa-warn-access.o.
> * tree-ssa-strlen.c (compare_nonzero_chars): Pass statement
> context to ranger.
> (get_addr_stridx): Same.
> (get_stridx): Same.
> (get_range_strlen_dynamic): Same.
> (handle_builtin_strlen): Same.
> (handle_builtin_strchr): Same.
> (handle_builtin_strcpy): Same.
> (maybe_diag_stxncpy_trunc): Same.
> (handle_builtin_stxncpy_strncat):
> (handle_builtin_memcpy): Same.
> (handle_builtin_strcat): Same.
> (handle_alloc_call): Same.
> (handle_builtin_memset): Same.
> (handle_builtin_string_cmp): Same.
> (handle_pointer_plus): Same.
> (count_nonzero_bytes_addr): Same.
> (count_nonzero_bytes): Same.
> (handle_store): Same.
> (fold_strstr_to_strncmp): Same.
> (handle_integral_assign): Same.
> (check_and_optimize_stmt): Same.
> (class strlen_dom_walker): Replace evrp with ranger.
> (strlen_dom_walker::before_dom_children): Remove evrp.
> (strlen_dom_walker::after_dom_children): Remove evrp.
>
> gcc/cp/ChangeLog:
>
> * ptree.c (cxx_print_xnode): Add more space to pfx array.
>
> gcc/fortran/ChangeLog:
>
> * misc.c (gfc_dummy_typename): Make sure ts->kind is
> non-negative.
>
> gcc/testsuite/ChangeLog:
>
> * gcc.dg/tree-ssa/builtin-sprintf-warn-22.c: XFAIL.
> ---
> gcc/Makefile.in | 1 +
> gcc/cp/ptree.c | 2 +-
> gcc/fortran/misc.c | 2 +-
> .../gcc.dg/tree-ssa/builtin-sprintf-warn-22.c | 13 +-
> gcc/tree-ssa-strlen.c | 145 ++++++++++--------
> 5 files changed, 92 insertions(+), 71 deletions(-)
>
> diff --git a/gcc/Makefile.in b/gcc/Makefile.in
> index f36ffa4740b..dfd2a40e80a 100644
> --- a/gcc/Makefile.in
> +++ b/gcc/Makefile.in
> @@ -222,6 +222,7 @@ libgcov-merge-tool.o-warn = -Wno-error
> gimple-match.o-warn = -Wno-unused
> generic-match.o-warn = -Wno-unused
> dfp.o-warn = -Wno-strict-aliasing
> +gimple-ssa-warn-access.o-warn = -Wno-format-overflow
>
> # All warnings have to be shut off in stage1 if the compiler used then
> # isn't gcc; configure determines that. WARN_CFLAGS will be either
> diff --git a/gcc/cp/ptree.c b/gcc/cp/ptree.c
> index 1dcd764af01..ca7884db39b 100644
> --- a/gcc/cp/ptree.c
> +++ b/gcc/cp/ptree.c
> @@ -292,7 +292,7 @@ cxx_print_xnode (FILE *file, tree node, int indent)
> for (unsigned ix = 0; ix != len; ix++)
> {
> binding_cluster *cluster = &BINDING_VECTOR_CLUSTER (node, ix);
> - char pfx[24];
> + char pfx[32];
> for (unsigned jx = 0; jx != BINDING_VECTOR_SLOTS_PER_CLUSTER;
> jx++)
> if (cluster->indices[jx].span)
> {
> diff --git a/gcc/fortran/misc.c b/gcc/fortran/misc.c
> index 3d449ae17fe..c1520307c90 100644
> --- a/gcc/fortran/misc.c
> +++ b/gcc/fortran/misc.c
> @@ -284,7 +284,7 @@ gfc_dummy_typename (gfc_typespec *ts)
> {
> if (ts->kind == gfc_default_character_kind)
> sprintf(buffer, "CHARACTER(*)");
> - else if (ts->kind < 10)
> + else if (ts->kind >= 0 && ts->kind < 10)
> sprintf(buffer, "CHARACTER(*,%d)", ts->kind);
> else
> sprintf(buffer, "CHARACTER(*,?)");
> diff --git a/gcc/testsuite/gcc.dg/tree-ssa/builtin-sprintf-warn-22.c
> b/gcc/testsuite/gcc.dg/tree-ssa/builtin-sprintf-warn-22.c
> index 685a4fd8c89..82eb5851c59 100644
> --- a/gcc/testsuite/gcc.dg/tree-ssa/builtin-sprintf-warn-22.c
> +++ b/gcc/testsuite/gcc.dg/tree-ssa/builtin-sprintf-warn-22.c
> @@ -18,7 +18,18 @@ void g (char *s1, char *s2)
> if (n + d + 1 >= 1025)
> return;
>
> - sprintf (b, "%s.%s", s1, s2); // { dg-bogus "\\\[-Wformat-overflow" }
> + /* Ranger can find ranges here:
> + [1] n_6: size_t [0, 1023]
> + [2] d_8: size_t [0, 1023]
> +
> + Whereas evrp can't really:
> + [1] n_6: size_t [0, 9223372036854775805]
> + [2] d_8: size_t [0, 9223372036854775805]
> +
> + This is causing the sprintf warning pass to issue a false
> + positive here. */
> +
> + sprintf (b, "%s.%s", s1, s2); // { dg-bogus "\\\[-Wformat-overflow" ""
> { xfail *-*-* } }
>
> f (b);
> }
> diff --git a/gcc/tree-ssa-strlen.c b/gcc/tree-ssa-strlen.c
> index 7c568a42d49..df0c2d5ee7a 100644
> --- a/gcc/tree-ssa-strlen.c
> +++ b/gcc/tree-ssa-strlen.c
> @@ -59,7 +59,7 @@ along with GCC; see the file COPYING3. If not see
> #include "tree-ssa-loop.h"
> #include "tree-scalar-evolution.h"
> #include "vr-values.h"
> -#include "gimple-ssa-evrp-analyze.h"
> +#include "gimple-range.h"
> #include "tree-ssa.h"
>
> /* A vector indexed by SSA_NAME_VERSION. 0 means unknown, positive value
> @@ -256,7 +256,8 @@ compare_nonzero_chars (strinfo *si, unsigned
> HOST_WIDE_INT off)
> Uses RVALS to determine length range. */
>
> static int
> -compare_nonzero_chars (strinfo *si, unsigned HOST_WIDE_INT off,
> +compare_nonzero_chars (strinfo *si, gimple *stmt,
> + unsigned HOST_WIDE_INT off,
> range_query *rvals)
> {
> if (!si->nonzero_chars)
> @@ -269,7 +270,7 @@ compare_nonzero_chars (strinfo *si, unsigned
> HOST_WIDE_INT off,
> return -1;
>
> value_range vr;
> - if (!rvals->range_of_expr (vr, si->nonzero_chars, si->stmt))
> + if (!rvals->range_of_expr (vr, si->nonzero_chars, stmt))
> return -1;
> value_range_kind rng = vr.kind ();
> if (rng != VR_RANGE)
> @@ -324,7 +325,8 @@ get_next_strinfo (strinfo *si)
> information. */
>
> static int
> -get_addr_stridx (tree exp, tree ptr, unsigned HOST_WIDE_INT *offset_out,
> +get_addr_stridx (tree exp, gimple *stmt,
> + tree ptr, unsigned HOST_WIDE_INT *offset_out,
> range_query *rvals = NULL)
> {
> HOST_WIDE_INT off;
> @@ -363,7 +365,7 @@ get_addr_stridx (tree exp, tree ptr, unsigned
> HOST_WIDE_INT *offset_out,
> unsigned HOST_WIDE_INT rel_off
> = (unsigned HOST_WIDE_INT) off - last->offset;
> strinfo *si = get_strinfo (last->idx);
> - if (si && compare_nonzero_chars (si, rel_off, rvals) >= 0)
> + if (si && compare_nonzero_chars (si, stmt, rel_off, rvals) >= 0)
> {
> if (offset_out)
> {
> @@ -385,7 +387,8 @@ get_addr_stridx (tree exp, tree ptr, unsigned
> HOST_WIDE_INT *offset_out,
> When nonnull, uses RVALS to determine range information. */
>
> static int
> -get_stridx (tree exp, wide_int offrng[2] = NULL, range_query *rvals = NULL)
> +get_stridx (tree exp, gimple *stmt,
> + wide_int offrng[2] = NULL, range_query *rvals = NULL)
> {
> if (offrng)
> offrng[0] = offrng[1] = wi::zero (TYPE_PRECISION (ptrdiff_type_node));
> @@ -522,7 +525,7 @@ get_stridx (tree exp, wide_int offrng[2] = NULL,
> range_query *rvals = NULL)
>
> if (TREE_CODE (exp) == ADDR_EXPR)
> {
> - int idx = get_addr_stridx (TREE_OPERAND (exp, 0), exp, NULL);
> + int idx = get_addr_stridx (TREE_OPERAND (exp, 0), stmt, exp, NULL);
> if (idx != 0)
> return idx;
> }
> @@ -1016,7 +1019,7 @@ get_range_strlen_dynamic (tree src, gimple *stmt,
> c_strlen_data *pdata, bitmap *visited,
> range_query *rvals, unsigned *pssa_def_max)
> {
> - int idx = get_stridx (src);
> + int idx = get_stridx (src, stmt);
> if (!idx)
> {
> if (TREE_CODE (src) == SSA_NAME)
> @@ -2124,7 +2127,7 @@ handle_builtin_strlen (gimple_stmt_iterator *gsi)
> tree src = gimple_call_arg (stmt, 0);
> tree bound = (DECL_FUNCTION_CODE (callee) == BUILT_IN_STRNLEN
> ? gimple_call_arg (stmt, 1) : NULL_TREE);
> - int idx = get_stridx (src);
> + int idx = get_stridx (src, stmt);
> if (idx || (bound && integer_zerop (bound)))
> {
> strinfo *si = NULL;
> @@ -2304,7 +2307,7 @@ handle_builtin_strchr (gimple_stmt_iterator *gsi)
> if (!check_nul_terminated_array (NULL_TREE, src))
> return;
>
> - int idx = get_stridx (src);
> + int idx = get_stridx (src, stmt);
> if (idx)
> {
> strinfo *si = NULL;
> @@ -2411,12 +2414,12 @@ handle_builtin_strcpy (enum built_in_function bcode,
> gimple_stmt_iterator *gsi,
> src = gimple_call_arg (stmt, 1);
> dst = gimple_call_arg (stmt, 0);
> lhs = gimple_call_lhs (stmt);
> - idx = get_stridx (src);
> + idx = get_stridx (src, stmt);
> si = NULL;
> if (idx > 0)
> si = get_strinfo (idx);
>
> - didx = get_stridx (dst);
> + didx = get_stridx (dst, stmt);
> olddsi = NULL;
> oldlen = NULL_TREE;
> if (didx > 0)
> @@ -2818,7 +2821,7 @@ maybe_diag_stxncpy_trunc (gimple_stmt_iterator gsi,
> tree src, tree cnt,
> when ssa_ver_to_stridx is empty. That implies the caller isn't
> running under the control of this pass and ssa_ver_to_stridx hasn't
> been created yet. */
> - int sidx = ssa_ver_to_stridx.length () ? get_stridx (src) : 0;
> + int sidx = ssa_ver_to_stridx.length () ? get_stridx (src, stmt) : 0;
> if (sidx < 0 && wi::gtu_p (cntrange[0], ~sidx))
> return false;
>
> @@ -3092,7 +3095,7 @@ handle_builtin_stxncpy_strncat (bool append_p,
> gimple_stmt_iterator *gsi)
> a lower bound). */
> tree dstlenp1 = NULL_TREE, srclenp1 = NULL_TREE;;
>
> - int didx = get_stridx (dst);
> + int didx = get_stridx (dst, stmt);
> if (strinfo *sidst = didx > 0 ? get_strinfo (didx) : NULL)
> {
> /* Compute the size of the destination string including the nul
> @@ -3118,7 +3121,7 @@ handle_builtin_stxncpy_strncat (bool append_p,
> gimple_stmt_iterator *gsi)
> dst = sidst->ptr;
> }
>
> - int sidx = get_stridx (src);
> + int sidx = get_stridx (src, stmt);
> strinfo *sisrc = sidx > 0 ? get_strinfo (sidx) : NULL;
> if (sisrc)
> {
> @@ -3228,7 +3231,7 @@ handle_builtin_memcpy (enum built_in_function bcode,
> gimple_stmt_iterator *gsi,
> tree src = gimple_call_arg (stmt, 1);
> tree dst = gimple_call_arg (stmt, 0);
>
> - int didx = get_stridx (dst);
> + int didx = get_stridx (dst, stmt);
> strinfo *olddsi = NULL;
> if (didx > 0)
> olddsi = get_strinfo (didx);
> @@ -3242,7 +3245,7 @@ handle_builtin_memcpy (enum built_in_function bcode,
> gimple_stmt_iterator *gsi,
> adjust_last_stmt (olddsi, stmt, false, ptr_qry);
> }
>
> - int idx = get_stridx (src);
> + int idx = get_stridx (src, stmt);
> if (idx == 0)
> return;
>
> @@ -3418,7 +3421,7 @@ handle_builtin_strcat (enum built_in_function bcode,
> gimple_stmt_iterator *gsi,
>
> tree lhs = gimple_call_lhs (stmt);
>
> - didx = get_stridx (dst);
> + didx = get_stridx (dst, stmt);
> if (didx < 0)
> return;
>
> @@ -3428,7 +3431,7 @@ handle_builtin_strcat (enum built_in_function bcode,
> gimple_stmt_iterator *gsi,
>
> srclen = NULL_TREE;
> si = NULL;
> - idx = get_stridx (src);
> + idx = get_stridx (src, stmt);
> if (idx < 0)
> srclen = build_int_cst (size_type_node, ~idx);
> else if (idx > 0)
> @@ -3650,7 +3653,7 @@ handle_alloc_call (enum built_in_function bcode,
> gimple_stmt_iterator *gsi)
> if (lhs == NULL_TREE)
> return;
>
> - gcc_assert (get_stridx (lhs) == 0);
> + gcc_assert (get_stridx (lhs, stmt) == 0);
> int idx = new_stridx (lhs);
> tree length = NULL_TREE;
> if (bcode == BUILT_IN_CALLOC)
> @@ -3687,7 +3690,7 @@ handle_builtin_memset (gimple_stmt_iterator *gsi, bool
> *zero_write,
> tree ptr = gimple_call_arg (memset_stmt, 0);
> /* Set to the non-constant offset added to PTR. */
> wide_int offrng[2];
> - int idx1 = get_stridx (ptr, offrng, ptr_qry.rvals);
> + int idx1 = get_stridx (ptr, memset_stmt, offrng, ptr_qry.rvals);
> if (idx1 <= 0)
> return false;
> strinfo *si1 = get_strinfo (idx1);
> @@ -4178,8 +4181,8 @@ handle_builtin_string_cmp (gimple_stmt_iterator *gsi,
> range_query *rvals)
>
> tree arg1 = gimple_call_arg (stmt, 0);
> tree arg2 = gimple_call_arg (stmt, 1);
> - int idx1 = get_stridx (arg1);
> - int idx2 = get_stridx (arg2);
> + int idx1 = get_stridx (arg1, stmt);
> + int idx2 = get_stridx (arg2, stmt);
>
> /* For strncmp set to the value of the third argument if known. */
> HOST_WIDE_INT bound = -1;
> @@ -4318,7 +4321,7 @@ handle_pointer_plus (gimple_stmt_iterator *gsi)
> {
> gimple *stmt = gsi_stmt (*gsi);
> tree lhs = gimple_assign_lhs (stmt), off;
> - int idx = get_stridx (gimple_assign_rhs1 (stmt));
> + int idx = get_stridx (gimple_assign_rhs1 (stmt), stmt);
> strinfo *si, *zsi;
>
> if (idx == 0)
> @@ -4396,7 +4399,8 @@ nonzero_bytes_for_type (tree type, unsigned lenrange[3],
> }
>
> static bool
> -count_nonzero_bytes_addr (tree, unsigned HOST_WIDE_INT, unsigned
> HOST_WIDE_INT,
> +count_nonzero_bytes_addr (tree, gimple *stmt,
> + unsigned HOST_WIDE_INT, unsigned HOST_WIDE_INT,
> unsigned [3], bool *, bool *, bool *,
> range_query *, ssa_name_limit_t &);
>
> @@ -4416,7 +4420,8 @@ count_nonzero_bytes_addr (tree, unsigned HOST_WIDE_INT,
> unsigned HOST_WIDE_INT,
> Returns true on success and false otherwise. */
>
> static bool
> -count_nonzero_bytes (tree exp, unsigned HOST_WIDE_INT offset,
> +count_nonzero_bytes (tree exp, gimple *stmt,
> + unsigned HOST_WIDE_INT offset,
> unsigned HOST_WIDE_INT nbytes,
> unsigned lenrange[3], bool *nulterm,
> bool *allnul, bool *allnonnul, range_query *rvals,
> @@ -4435,7 +4440,8 @@ count_nonzero_bytes (tree exp, unsigned HOST_WIDE_INT
> offset,
> exact value is not known) recurse once to set the range
> for an arbitrary constant. */
> exp = build_int_cst (type, 1);
> - return count_nonzero_bytes (exp, offset, 1, lenrange,
> + return count_nonzero_bytes (exp, stmt,
> + offset, 1, lenrange,
> nulterm, allnul, allnonnul, rvals,
> snlim);
> }
>
> @@ -4462,7 +4468,8 @@ count_nonzero_bytes (tree exp, unsigned HOST_WIDE_INT
> offset,
> for (unsigned i = 0; i != n; i++)
> {
> tree def = gimple_phi_arg_def (stmt, i);
> - if (!count_nonzero_bytes (def, offset, nbytes, lenrange,
> nulterm,
> + if (!count_nonzero_bytes (def, stmt,
> + offset, nbytes, lenrange, nulterm,
> allnul, allnonnul, rvals, snlim))
> return false;
> }
> @@ -4519,7 +4526,8 @@ count_nonzero_bytes (tree exp, unsigned HOST_WIDE_INT
> offset,
> return false;
>
> /* Handle MEM_REF = SSA_NAME types of assignments. */
> - return count_nonzero_bytes_addr (arg, offset, nbytes, lenrange,
> nulterm,
> + return count_nonzero_bytes_addr (arg, stmt,
> + offset, nbytes, lenrange, nulterm,
> allnul, allnonnul, rvals, snlim);
> }
>
> @@ -4631,13 +4639,14 @@ count_nonzero_bytes (tree exp, unsigned HOST_WIDE_INT
> offset,
> bytes that are pointed to by EXP, which should be a pointer. */
>
> static bool
> -count_nonzero_bytes_addr (tree exp, unsigned HOST_WIDE_INT offset,
> +count_nonzero_bytes_addr (tree exp, gimple *stmt,
> + unsigned HOST_WIDE_INT offset,
> unsigned HOST_WIDE_INT nbytes,
> unsigned lenrange[3], bool *nulterm,
> bool *allnul, bool *allnonnul,
> range_query *rvals, ssa_name_limit_t &snlim)
> {
> - int idx = get_stridx (exp);
> + int idx = get_stridx (exp, stmt);
> if (idx > 0)
> {
> strinfo *si = get_strinfo (idx);
> @@ -4653,7 +4662,7 @@ count_nonzero_bytes_addr (tree exp, unsigned
> HOST_WIDE_INT offset,
> && TREE_CODE (si->nonzero_chars) == SSA_NAME)
> {
> value_range vr;
> - rvals->range_of_expr (vr, si->nonzero_chars, si->stmt);
> + rvals->range_of_expr (vr, si->nonzero_chars, stmt);
> if (vr.kind () != VR_RANGE)
> return false;
>
> @@ -4699,7 +4708,8 @@ count_nonzero_bytes_addr (tree exp, unsigned
> HOST_WIDE_INT offset,
> }
>
> if (TREE_CODE (exp) == ADDR_EXPR)
> - return count_nonzero_bytes (TREE_OPERAND (exp, 0), offset, nbytes,
> + return count_nonzero_bytes (TREE_OPERAND (exp, 0), stmt,
> + offset, nbytes,
> lenrange, nulterm, allnul, allnonnul, rvals,
> snlim);
>
> @@ -4719,7 +4729,8 @@ count_nonzero_bytes_addr (tree exp, unsigned
> HOST_WIDE_INT offset,
> for (unsigned i = 0; i != n; i++)
> {
> tree def = gimple_phi_arg_def (stmt, i);
> - if (!count_nonzero_bytes_addr (def, offset, nbytes, lenrange,
> + if (!count_nonzero_bytes_addr (def, stmt,
> + offset, nbytes, lenrange,
> nulterm, allnul, allnonnul,
> rvals,
> snlim))
> return false;
> @@ -4747,7 +4758,8 @@ count_nonzero_bytes_addr (tree exp, unsigned
> HOST_WIDE_INT offset,
> (the results of strlen). */
>
> static bool
> -count_nonzero_bytes (tree expr_or_type, unsigned lenrange[3], bool *nulterm,
> +count_nonzero_bytes (tree expr_or_type, gimple *stmt,
> + unsigned lenrange[3], bool *nulterm,
> bool *allnul, bool *allnonnul, range_query *rvals)
> {
> if (TYPE_P (expr_or_type))
> @@ -4765,7 +4777,8 @@ count_nonzero_bytes (tree expr_or_type, unsigned
> lenrange[3], bool *nulterm,
>
> ssa_name_limit_t snlim;
> tree expr = expr_or_type;
> - return count_nonzero_bytes (expr, 0, 0, lenrange, nulterm, allnul,
> allnonnul,
> + return count_nonzero_bytes (expr, stmt,
> + 0, 0, lenrange, nulterm, allnul, allnonnul,
> rvals, snlim);
> }
>
> @@ -4818,18 +4831,19 @@ handle_store (gimple_stmt_iterator *gsi, bool
> *zero_write,
> least OFFSET nonzero characters. This is trivially true if
> OFFSET is zero. */
> offset = tree_to_uhwi (mem_offset);
> - idx = get_stridx (TREE_OPERAND (lhs, 0));
> + idx = get_stridx (TREE_OPERAND (lhs, 0), stmt);
> if (idx > 0)
> si = get_strinfo (idx);
> if (offset == 0)
> ssaname = TREE_OPERAND (lhs, 0);
> - else if (si == NULL || compare_nonzero_chars (si, offset, rvals) <
> 0)
> + else if (si == NULL
> + || compare_nonzero_chars (si, stmt, offset, rvals) < 0)
> {
> *zero_write = rhs ? initializer_zerop (rhs) : false;
>
> bool dummy;
> unsigned lenrange[] = { UINT_MAX, 0, 0 };
> - if (count_nonzero_bytes (rhs ? rhs : storetype, lenrange,
> + if (count_nonzero_bytes (rhs ? rhs : storetype, stmt, lenrange,
> &dummy, &dummy, &dummy, rvals))
> maybe_warn_overflow (stmt, true, lenrange[2], ptr_qry);
>
> @@ -4839,7 +4853,7 @@ handle_store (gimple_stmt_iterator *gsi, bool
> *zero_write,
> }
> else
> {
> - idx = get_addr_stridx (lhs, NULL_TREE, &offset, rvals);
> + idx = get_addr_stridx (lhs, stmt, NULL_TREE, &offset, rvals);
> if (idx > 0)
> si = get_strinfo (idx);
> }
> @@ -4862,7 +4876,8 @@ handle_store (gimple_stmt_iterator *gsi, bool
> *zero_write,
> bool full_string_p;
>
> const bool ranges_valid
> - = count_nonzero_bytes (rhs ? rhs : storetype, lenrange, &full_string_p,
> + = count_nonzero_bytes (rhs ? rhs : storetype, stmt,
> + lenrange, &full_string_p,
> &storing_all_zeros_p, &storing_all_nonzero_p,
> rvals);
>
> @@ -4895,15 +4910,18 @@ handle_store (gimple_stmt_iterator *gsi, bool
> *zero_write,
> {
> /* The offset of the last stored byte. */
> unsigned HOST_WIDE_INT endoff = offset + lenrange[2] - 1;
> - store_before_nul[0] = compare_nonzero_chars (si, offset, rvals);
> + store_before_nul[0]
> + = compare_nonzero_chars (si, stmt, offset, rvals);
> if (endoff == offset)
> store_before_nul[1] = store_before_nul[0];
> else
> - store_before_nul[1] = compare_nonzero_chars (si, endoff, rvals);
> + store_before_nul[1]
> + = compare_nonzero_chars (si, stmt, endoff, rvals);
> }
> else
> {
> - store_before_nul[0] = compare_nonzero_chars (si, offset, rvals);
> + store_before_nul[0]
> + = compare_nonzero_chars (si, stmt, offset, rvals);
> store_before_nul[1] = store_before_nul[0];
> gcc_assert (offset == 0 || store_before_nul[0] >= 0);
> }
> @@ -5128,7 +5146,7 @@ fold_strstr_to_strncmp (tree rhs1, tree rhs2, gimple
> *stmt)
> {
> tree arg1 = gimple_call_arg (call_stmt, 1);
> tree arg1_len = NULL_TREE;
> - int idx = get_stridx (arg1);
> + int idx = get_stridx (arg1, call_stmt);
>
> if (idx)
> {
> @@ -5342,7 +5360,7 @@ handle_integral_assign (gimple_stmt_iterator *gsi, bool
> *cleanup_eh,
> tree rhs1 = gimple_assign_rhs1 (stmt);
> if (code == MEM_REF)
> {
> - idx = get_stridx (TREE_OPERAND (rhs1, 0));
> + idx = get_stridx (TREE_OPERAND (rhs1, 0), stmt);
> if (idx > 0)
> {
> strinfo *si = get_strinfo (idx);
> @@ -5359,7 +5377,7 @@ handle_integral_assign (gimple_stmt_iterator *gsi, bool
> *cleanup_eh,
> }
> }
> if (idx <= 0)
> - idx = get_addr_stridx (rhs1, NULL_TREE, &coff);
> + idx = get_addr_stridx (rhs1, stmt, NULL_TREE, &coff);
> if (idx > 0)
> {
> strinfo *si = get_strinfo (idx);
> @@ -5421,7 +5439,8 @@ handle_integral_assign (gimple_stmt_iterator *gsi, bool
> *cleanup_eh,
> unsigned lenrange[] = { UINT_MAX, 0, 0 };
> tree rhs = gimple_assign_rhs1 (stmt);
> const bool ranges_valid
> - = count_nonzero_bytes (rhs, lenrange, &full_string_p,
> + = count_nonzero_bytes (rhs, stmt,
> + lenrange, &full_string_p,
> &storing_all_zeros_p,
> &storing_all_nonzero_p,
> rvals);
> if (ranges_valid)
> @@ -5520,7 +5539,7 @@ check_and_optimize_stmt (gimple_stmt_iterator *gsi,
> bool *cleanup_eh,
> || (gimple_assign_cast_p (stmt)
> && POINTER_TYPE_P (TREE_TYPE (gimple_assign_rhs1 (stmt)))))
> {
> - int idx = get_stridx (gimple_assign_rhs1 (stmt));
> + int idx = get_stridx (gimple_assign_rhs1 (stmt), stmt);
> ssa_ver_to_stridx[SSA_NAME_VERSION (lhs)] = idx;
> }
> else if (gimple_assign_rhs_code (stmt) == POINTER_PLUS_EXPR)
> @@ -5602,20 +5621,20 @@ class strlen_dom_walker : public dom_walker
> public:
> strlen_dom_walker (cdi_direction direction)
> : dom_walker (direction),
> - evrp (false),
> - ptr_qry (&evrp, &var_cache),
> - var_cache (),
> - m_cleanup_cfg (false)
> - { }
> + ptr_qry (&m_ranger, &var_cache),
> + var_cache (),
> + m_cleanup_cfg (false)
> + {
> + }
>
> ~strlen_dom_walker ();
>
> virtual edge before_dom_children (basic_block);
> virtual void after_dom_children (basic_block);
>
> - /* EVRP analyzer used for printf argument range processing, and
> + /* Ranger used for printf argument range processing, and
> to track strlen results across integer variable assignments. */
> - evrp_range_analyzer evrp;
> + gimple_ranger m_ranger;
>
> /* A pointer_query object and its cache to store information about
> pointers and their targets in. */
> @@ -5640,8 +5659,6 @@ strlen_dom_walker::~strlen_dom_walker ()
> edge
> strlen_dom_walker::before_dom_children (basic_block bb)
> {
> - evrp.enter (bb);
> -
> basic_block dombb = get_immediate_dominator (CDI_DOMINATORS, bb);
>
> if (dombb == NULL)
> @@ -5698,12 +5715,12 @@ strlen_dom_walker::before_dom_children (basic_block
> bb)
> tree result = gimple_phi_result (phi);
> if (!virtual_operand_p (result) && POINTER_TYPE_P (TREE_TYPE (result)))
> {
> - int idx = get_stridx (gimple_phi_arg_def (phi, 0));
> + int idx = get_stridx (gimple_phi_arg_def (phi, 0), phi);
> if (idx != 0)
> {
> unsigned int i, n = gimple_phi_num_args (phi);
> for (i = 1; i < n; i++)
> - if (idx != get_stridx (gimple_phi_arg_def (phi, i)))
> + if (idx != get_stridx (gimple_phi_arg_def (phi, i), phi))
> break;
> if (i == n)
> ssa_ver_to_stridx[SSA_NAME_VERSION (result)] = idx;
> @@ -5716,12 +5733,6 @@ strlen_dom_walker::before_dom_children (basic_block bb)
> /* Attempt to optimize individual statements. */
> for (gimple_stmt_iterator gsi = gsi_start_bb (bb); !gsi_end_p (gsi); )
> {
> - gimple *stmt = gsi_stmt (gsi);
> -
> - /* First record ranges generated by this statement so they
> - can be used by printf argument processing. */
> - evrp.record_ranges_from_stmt (stmt, false);
> -
> /* Reset search depth preformance counter. */
> ptr_qry.depth = 0;
>
> @@ -5744,8 +5755,6 @@ strlen_dom_walker::before_dom_children (basic_block bb)
> void
> strlen_dom_walker::after_dom_children (basic_block bb)
> {
> - evrp.leave (bb);
> -
> if (bb->aux)
> {
> stridx_to_strinfo = ((vec<strinfo *, va_heap, vl_embed> *) bb->aux);
> --
> 2.31.1
>
diff --git a/gcc/tree-ssa-strlen.c b/gcc/tree-ssa-strlen.c
index df0c2d5ee7a..3e62fe1b23e 100644
--- a/gcc/tree-ssa-strlen.c
+++ b/gcc/tree-ssa-strlen.c
@@ -193,9 +193,6 @@ struct laststmt_struct
} laststmt;
static int get_stridx_plus_constant (strinfo *, unsigned HOST_WIDE_INT, tree);
-static void handle_builtin_stxncpy_strncat (bool, gimple_stmt_iterator *);
-static bool handle_assign (gimple_stmt_iterator *, tree, bool *,
- pointer_query &);
/* Sets MINMAX to either the constant value or the range VAL is in
and returns either the constant value or VAL on success or null
@@ -232,6 +229,56 @@ get_range (tree val, gimple *stmt, wide_int minmax[2],
return NULL_TREE;
}
+class strlen_pass : public dom_walker
+{
+public:
+ strlen_pass (cdi_direction direction)
+ : dom_walker (direction),
+ ptr_qry (&m_ranger, &var_cache),
+ var_cache (),
+ m_cleanup_cfg (false)
+ {
+ }
+
+ ~strlen_pass ();
+
+ virtual edge before_dom_children (basic_block);
+ virtual void after_dom_children (basic_block);
+
+ bool check_and_optimize_stmt (bool *cleanup_eh);
+ bool check_and_optimize_call (bool *zero_write);
+ bool handle_assign (tree lhs, bool *zero_write);
+ bool handle_store (bool *zero_write);
+ void handle_pointer_plus ();
+ void handle_builtin_strlen ();
+ void handle_builtin_strchr ();
+ void handle_builtin_strcpy (built_in_function);
+ void handle_integral_assign (bool *cleanup_eh);
+ void handle_builtin_stxncpy_strncat (bool append_p);
+ void handle_builtin_memcpy (built_in_function bcode);
+ void handle_builtin_strcat (built_in_function bcode);
+ void handle_builtin_strncat (built_in_function);
+ bool handle_builtin_memset (bool *zero_write);
+ bool handle_builtin_memcmp ();
+ bool handle_builtin_string_cmp ();
+ void handle_alloc_call (built_in_function);
+
+ /* Ranger used for printf argument range processing, and
+ to track strlen results across integer variable assignments. */
+ gimple_ranger m_ranger;
+
+ /* A pointer_query object and its cache to store information about
+ pointers and their targets in. */
+ pointer_query ptr_qry;
+ pointer_query::cache_type var_cache;
+
+ gimple_stmt_iterator m_gsi;
+
+ /* Flag that will trigger TODO_cleanup_cfg to be returned in strlen
+ execute function. */
+ bool m_cleanup_cfg;
+};
+
/* Return:
* +1 if SI is known to start with more than OFF nonzero characters.
@@ -242,7 +289,7 @@ get_range (tree val, gimple *stmt, wide_int minmax[2],
or the relationship between the number of leading nonzero
characters in SI and OFF is unknown. */
-static inline int
+static int
compare_nonzero_chars (strinfo *si, unsigned HOST_WIDE_INT off)
{
if (si->nonzero_chars
@@ -2113,10 +2160,10 @@ maybe_warn_overflow (gimple *stmt, bool call_lhs, unsigned HOST_WIDE_INT len,
the strlen call with the known value, otherwise remember that strlen
of the argument is stored in the lhs SSA_NAME. */
-static void
-handle_builtin_strlen (gimple_stmt_iterator *gsi)
+void
+strlen_pass::handle_builtin_strlen ()
{
- gimple *stmt = gsi_stmt (*gsi);
+ gimple *stmt = gsi_stmt (m_gsi);
tree lhs = gimple_call_lhs (stmt);
if (lhs == NULL_TREE)
@@ -2170,8 +2217,8 @@ handle_builtin_strlen (gimple_stmt_iterator *gsi)
if (bound)
rhs = fold_build2_loc (loc, MIN_EXPR, TREE_TYPE (rhs), rhs, bound);
- gimplify_and_update_call_from_tree (gsi, rhs);
- stmt = gsi_stmt (*gsi);
+ gimplify_and_update_call_from_tree (&m_gsi, rhs);
+ stmt = gsi_stmt (m_gsi);
update_stmt (stmt);
if (dump_file && (dump_flags & TDF_DETAILS) != 0)
{
@@ -2269,8 +2316,8 @@ handle_builtin_strlen (gimple_stmt_iterator *gsi)
}
if (!useless_type_conversion_p (TREE_TYPE (lhs), TREE_TYPE (ret)))
ret = fold_convert_loc (loc, TREE_TYPE (lhs), ret);
- gimplify_and_update_call_from_tree (gsi, ret);
- stmt = gsi_stmt (*gsi);
+ gimplify_and_update_call_from_tree (&m_gsi, ret);
+ stmt = gsi_stmt (m_gsi);
update_stmt (stmt);
if (dump_file && (dump_flags & TDF_DETAILS) != 0)
{
@@ -2288,10 +2335,10 @@ handle_builtin_strlen (gimple_stmt_iterator *gsi)
the strchr (x, 0) call with the endptr or x + strlen, otherwise remember
that lhs of the call is endptr and strlen of the argument is endptr - x. */
-static void
-handle_builtin_strchr (gimple_stmt_iterator *gsi)
+void
+strlen_pass::handle_builtin_strchr ()
{
- gimple *stmt = gsi_stmt (*gsi);
+ gimple *stmt = gsi_stmt (m_gsi);
tree lhs = gimple_call_lhs (stmt);
if (lhs == NULL_TREE)
@@ -2347,8 +2394,8 @@ handle_builtin_strchr (gimple_stmt_iterator *gsi)
TREE_TYPE (rhs)))
rhs = fold_convert_loc (loc, TREE_TYPE (lhs), rhs);
}
- gimplify_and_update_call_from_tree (gsi, rhs);
- stmt = gsi_stmt (*gsi);
+ gimplify_and_update_call_from_tree (&m_gsi, rhs);
+ stmt = gsi_stmt (m_gsi);
update_stmt (stmt);
if (dump_file && (dump_flags & TDF_DETAILS) != 0)
{
@@ -2400,14 +2447,13 @@ handle_builtin_strchr (gimple_stmt_iterator *gsi)
is the same after this call. Furthermore, attempt to convert it to
memcpy. Uses RVALS to determine range information. */
-static void
-handle_builtin_strcpy (enum built_in_function bcode, gimple_stmt_iterator *gsi,
- pointer_query &ptr_qry)
+void
+strlen_pass::handle_builtin_strcpy (built_in_function bcode)
{
int idx, didx;
tree src, dst, srclen, len, lhs, type, fn, oldlen;
bool success;
- gimple *stmt = gsi_stmt (*gsi);
+ gimple *stmt = gsi_stmt (m_gsi);
strinfo *si, *dsi, *olddsi, *zsi;
location_t loc;
@@ -2630,7 +2676,7 @@ handle_builtin_strcpy (enum built_in_function bcode, gimple_stmt_iterator *gsi,
if (fn == NULL_TREE)
return;
- len = force_gimple_operand_gsi (gsi, len, true, NULL_TREE, true,
+ len = force_gimple_operand_gsi (&m_gsi, len, true, NULL_TREE, true,
GSI_SAME_STMT);
if (dump_file && (dump_flags & TDF_DETAILS) != 0)
{
@@ -2638,13 +2684,13 @@ handle_builtin_strcpy (enum built_in_function bcode, gimple_stmt_iterator *gsi,
print_gimple_stmt (dump_file, stmt, 0, TDF_SLIM);
}
if (gimple_call_num_args (stmt) == 2)
- success = update_gimple_call (gsi, fn, 3, dst, src, len);
+ success = update_gimple_call (&m_gsi, fn, 3, dst, src, len);
else
- success = update_gimple_call (gsi, fn, 4, dst, src, len,
+ success = update_gimple_call (&m_gsi, fn, 4, dst, src, len,
gimple_call_arg (stmt, 2));
if (success)
{
- stmt = gsi_stmt (*gsi);
+ stmt = gsi_stmt (m_gsi);
update_stmt (stmt);
if (dump_file && (dump_flags & TDF_DETAILS) != 0)
{
@@ -2668,11 +2714,11 @@ handle_builtin_strcpy (enum built_in_function bcode, gimple_stmt_iterator *gsi,
size argument is derived from a call to strlen() on the source argument,
and if so, issue an appropriate warning. */
-static void
-handle_builtin_strncat (built_in_function, gimple_stmt_iterator *gsi)
+void
+strlen_pass::handle_builtin_strncat (built_in_function)
{
/* Same as stxncpy(). */
- handle_builtin_stxncpy_strncat (true, gsi);
+ handle_builtin_stxncpy_strncat (true);
}
/* Return true if LEN depends on a call to strlen(SRC) in an interesting
@@ -3077,13 +3123,13 @@ maybe_diag_stxncpy_trunc (gimple_stmt_iterator gsi, tree src, tree cnt,
and if so, issue the appropriate warning.
APPEND_P is true for strncat. */
-static void
-handle_builtin_stxncpy_strncat (bool append_p, gimple_stmt_iterator *gsi)
+void
+strlen_pass::handle_builtin_stxncpy_strncat (bool append_p)
{
if (!strlen_to_stridx)
return;
- gimple *stmt = gsi_stmt (*gsi);
+ gimple *stmt = gsi_stmt (m_gsi);
tree dst = gimple_call_arg (stmt, 0);
tree src = gimple_call_arg (stmt, 1);
@@ -3161,7 +3207,7 @@ handle_builtin_stxncpy_strncat (bool append_p, gimple_stmt_iterator *gsi)
stridx_strlenloc *pss = strlen_to_stridx->get (len);
if (!pss || pss->first <= 0)
{
- if (maybe_diag_stxncpy_trunc (*gsi, src, len))
+ if (maybe_diag_stxncpy_trunc (m_gsi, src, len))
suppress_warning (stmt, OPT_Wstringop_truncation);
return;
@@ -3219,12 +3265,11 @@ handle_builtin_stxncpy_strncat (bool append_p, gimple_stmt_iterator *gsi)
is that plus one, strlen of the first argument is the same after this
call. Uses RVALS to determine range information. */
-static void
-handle_builtin_memcpy (enum built_in_function bcode, gimple_stmt_iterator *gsi,
- pointer_query &ptr_qry)
+void
+strlen_pass::handle_builtin_memcpy (built_in_function bcode)
{
tree lhs, oldlen, newlen;
- gimple *stmt = gsi_stmt (*gsi);
+ gimple *stmt = gsi_stmt (m_gsi);
strinfo *si, *dsi;
tree len = gimple_call_arg (stmt, 2);
@@ -3400,14 +3445,13 @@ handle_builtin_memcpy (enum built_in_function bcode, gimple_stmt_iterator *gsi,
to convert it to memcpy/strcpy if the length of the first argument
is known. */
-static void
-handle_builtin_strcat (enum built_in_function bcode, gimple_stmt_iterator *gsi,
- pointer_query &ptr_qry)
+void
+strlen_pass::handle_builtin_strcat (built_in_function bcode)
{
int idx, didx;
tree srclen, args, type, fn, objsz, endptr;
bool success;
- gimple *stmt = gsi_stmt (*gsi);
+ gimple *stmt = gsi_stmt (m_gsi);
strinfo *si, *dsi;
location_t loc = gimple_location (stmt);
@@ -3584,7 +3628,7 @@ handle_builtin_strcat (enum built_in_function bcode, gimple_stmt_iterator *gsi,
len = fold_convert_loc (loc, type, unshare_expr (srclen));
len = fold_build2_loc (loc, PLUS_EXPR, type, len,
build_int_cst (type, 1));
- len = force_gimple_operand_gsi (gsi, len, true, NULL_TREE, true,
+ len = force_gimple_operand_gsi (&m_gsi, len, true, NULL_TREE, true,
GSI_SAME_STMT);
}
if (endptr)
@@ -3593,14 +3637,14 @@ handle_builtin_strcat (enum built_in_function bcode, gimple_stmt_iterator *gsi,
dst = fold_build2_loc (loc, POINTER_PLUS_EXPR, TREE_TYPE (dst), dst,
fold_convert_loc (loc, sizetype,
unshare_expr (dstlen)));
- dst = force_gimple_operand_gsi (gsi, dst, true, NULL_TREE, true,
+ dst = force_gimple_operand_gsi (&m_gsi, dst, true, NULL_TREE, true,
GSI_SAME_STMT);
if (objsz)
{
objsz = fold_build2_loc (loc, MINUS_EXPR, TREE_TYPE (objsz), objsz,
fold_convert_loc (loc, TREE_TYPE (objsz),
unshare_expr (dstlen)));
- objsz = force_gimple_operand_gsi (gsi, objsz, true, NULL_TREE, true,
+ objsz = force_gimple_operand_gsi (&m_gsi, objsz, true, NULL_TREE, true,
GSI_SAME_STMT);
}
if (dump_file && (dump_flags & TDF_DETAILS) != 0)
@@ -3609,14 +3653,14 @@ handle_builtin_strcat (enum built_in_function bcode, gimple_stmt_iterator *gsi,
print_gimple_stmt (dump_file, stmt, 0, TDF_SLIM);
}
if (srclen != NULL_TREE)
- success = update_gimple_call (gsi, fn, 3 + (objsz != NULL_TREE),
+ success = update_gimple_call (&m_gsi, fn, 3 + (objsz != NULL_TREE),
dst, src, len, objsz);
else
- success = update_gimple_call (gsi, fn, 2 + (objsz != NULL_TREE),
+ success = update_gimple_call (&m_gsi, fn, 2 + (objsz != NULL_TREE),
dst, src, objsz);
if (success)
{
- stmt = gsi_stmt (*gsi);
+ stmt = gsi_stmt (m_gsi);
update_stmt (stmt);
if (dump_file && (dump_flags & TDF_DETAILS) != 0)
{
@@ -3645,10 +3689,10 @@ handle_builtin_strcat (enum built_in_function bcode, gimple_stmt_iterator *gsi,
/* Handle a call to an allocation function like alloca, malloc or calloc,
or an ordinary allocation function declared with attribute alloc_size. */
-static void
-handle_alloc_call (enum built_in_function bcode, gimple_stmt_iterator *gsi)
+void
+strlen_pass::handle_alloc_call (built_in_function bcode)
{
- gimple *stmt = gsi_stmt (*gsi);
+ gimple *stmt = gsi_stmt (m_gsi);
tree lhs = gimple_call_lhs (stmt);
if (lhs == NULL_TREE)
return;
@@ -3682,11 +3726,10 @@ handle_alloc_call (enum built_in_function bcode, gimple_stmt_iterator *gsi)
return true when the call is transformed, false otherwise.
When nonnull uses RVALS to determine range information. */
-static bool
-handle_builtin_memset (gimple_stmt_iterator *gsi, bool *zero_write,
- pointer_query &ptr_qry)
+bool
+strlen_pass::handle_builtin_memset (bool *zero_write)
{
- gimple *memset_stmt = gsi_stmt (*gsi);
+ gimple *memset_stmt = gsi_stmt (m_gsi);
tree ptr = gimple_call_arg (memset_stmt, 0);
/* Set to the non-constant offset added to PTR. */
wide_int offrng[2];
@@ -3747,11 +3790,11 @@ handle_builtin_memset (gimple_stmt_iterator *gsi, bool *zero_write,
if (lhs)
{
gimple *assign = gimple_build_assign (lhs, ptr);
- gsi_replace (gsi, assign, false);
+ gsi_replace (&m_gsi, assign, false);
}
else
{
- gsi_remove (gsi, true);
+ gsi_remove (&m_gsi, true);
release_defs (memset_stmt);
}
@@ -3835,10 +3878,10 @@ use_in_zero_equality (tree res, bool exclusive = true)
with a __builtin_memcmp_eq call where possible.
return true when call is transformed, return false otherwise. */
-static bool
-handle_builtin_memcmp (gimple_stmt_iterator *gsi)
+bool
+strlen_pass::handle_builtin_memcmp ()
{
- gcall *stmt = as_a <gcall *> (gsi_stmt (*gsi));
+ gcall *stmt = as_a <gcall *> (gsi_stmt (m_gsi));
tree res = gimple_call_lhs (stmt);
if (!res || !use_in_zero_equality (res))
@@ -3880,7 +3923,7 @@ handle_builtin_memcmp (gimple_stmt_iterator *gsi)
fold_build2_loc (loc, NE_EXPR,
boolean_type_node,
arg1, arg2));
- gimplify_and_update_call_from_tree (gsi, res);
+ gimplify_and_update_call_from_tree (&m_gsi, res);
return true;
}
}
@@ -4170,10 +4213,10 @@ maybe_warn_pointless_strcmp (gimple *stmt, HOST_WIDE_INT bound,
is not known. Return true when the call has been transformed into
another and false otherwise. */
-static bool
-handle_builtin_string_cmp (gimple_stmt_iterator *gsi, range_query *rvals)
+bool
+strlen_pass::handle_builtin_string_cmp ()
{
- gcall *stmt = as_a <gcall *> (gsi_stmt (*gsi));
+ gcall *stmt = as_a <gcall *> (gsi_stmt (m_gsi));
tree lhs = gimple_call_lhs (stmt);
if (!lhs)
@@ -4217,7 +4260,8 @@ handle_builtin_string_cmp (gimple_stmt_iterator *gsi, range_query *rvals)
or definitely unequal and if so, either fold the result to zero
(when equal) or set the range of the result to ~[0, 0] otherwise. */
if (tree eqz = strxcmp_eqz_result (stmt, arg1, idx1, arg2, idx2, bound,
- len, &siz, rvals))
+ len, &siz,
+ ptr_qry.rvals))
{
if (integer_zerop (eqz))
{
@@ -4233,7 +4277,7 @@ handle_builtin_string_cmp (gimple_stmt_iterator *gsi, range_query *rvals)
}
/* When the two strings are definitely equal (such as when they
are both empty) fold the call to the constant result. */
- replace_call_with_value (gsi, integer_zero_node);
+ replace_call_with_value (&m_gsi, integer_zero_node);
return true;
}
}
@@ -4253,9 +4297,10 @@ handle_builtin_string_cmp (gimple_stmt_iterator *gsi, range_query *rvals)
unsigned HOST_WIDE_INT arsz1, arsz2;
bool nulterm[2];
- if (!get_len_or_size (stmt, arg1, idx1, len1rng, &arsz1, nulterm, rvals)
+ if (!get_len_or_size (stmt, arg1, idx1, len1rng, &arsz1, nulterm,
+ ptr_qry.rvals)
|| !get_len_or_size (stmt, arg2, idx2, len2rng, &arsz2, nulterm + 1,
- rvals))
+ ptr_qry.rvals))
return false;
if (len1rng[0] == len1rng[1] && len1rng[0] < HOST_WIDE_INT_MAX)
@@ -4303,7 +4348,7 @@ handle_builtin_string_cmp (gimple_stmt_iterator *gsi, range_query *rvals)
: BUILT_IN_STRNCMP_EQ))
{
tree n = build_int_cst (size_type_node, cmpsiz);
- update_gimple_call (gsi, fn, 3, arg1, arg2, n);
+ update_gimple_call (&m_gsi, fn, 3, arg1, arg2, n);
return true;
}
}
@@ -4316,10 +4361,10 @@ handle_builtin_string_cmp (gimple_stmt_iterator *gsi, range_query *rvals)
p = q + off is pointing to a '\0' character of a string, call
zero_length_string on it. */
-static void
-handle_pointer_plus (gimple_stmt_iterator *gsi)
+void
+strlen_pass::handle_pointer_plus ()
{
- gimple *stmt = gsi_stmt (*gsi);
+ gimple *stmt = gsi_stmt (m_gsi);
tree lhs = gimple_assign_lhs (stmt), off;
int idx = get_stridx (gimple_assign_rhs1 (stmt), stmt);
strinfo *si, *zsi;
@@ -4362,8 +4407,8 @@ handle_pointer_plus (gimple_stmt_iterator *gsi)
enum tree_code rhs_code
= useless_type_conversion_p (TREE_TYPE (lhs), TREE_TYPE (si->endptr))
? SSA_NAME : NOP_EXPR;
- gimple_assign_set_rhs_with_ops (gsi, rhs_code, si->endptr);
- gcc_assert (gsi_stmt (*gsi) == stmt);
+ gimple_assign_set_rhs_with_ops (&m_gsi, rhs_code, si->endptr);
+ gcc_assert (gsi_stmt (m_gsi) == stmt);
update_stmt (stmt);
}
}
@@ -4788,11 +4833,10 @@ count_nonzero_bytes (tree expr_or_type, gimple *stmt,
'*(int*)a = 12345'). Return true to let the caller advance *GSI to
the next statement in the basic block and false otherwise. */
-static bool
-handle_store (gimple_stmt_iterator *gsi, bool *zero_write,
- pointer_query &ptr_qry)
+bool
+strlen_pass::handle_store (bool *zero_write)
{
- gimple *stmt = gsi_stmt (*gsi);
+ gimple *stmt = gsi_stmt (m_gsi);
/* The LHS and RHS of the store. The RHS is null if STMT is a function
call. STORETYPE is the type of the store (determined from either
the RHS of the assignment statement or the LHS of a function call. */
@@ -4937,13 +4981,13 @@ handle_store (gimple_stmt_iterator *gsi, bool *zero_write,
{
unlink_stmt_vdef (stmt);
release_defs (stmt);
- gsi_remove (gsi, true);
+ gsi_remove (&m_gsi, true);
return false;
}
else
{
si->writable = true;
- gsi_next (gsi);
+ gsi_next (&m_gsi);
return false;
}
}
@@ -4977,7 +5021,7 @@ handle_store (gimple_stmt_iterator *gsi, bool *zero_write,
size_t len4 = strlen (q); // can be folded to len2
bar (len, len2, len3, len4);
} */
- gsi_next (gsi);
+ gsi_next (&m_gsi);
return false;
}
@@ -5224,11 +5268,10 @@ is_char_type (tree type)
Return true to let the caller advance *GSI to the next statement
in the basic block and false otherwise. */
-static bool
-strlen_check_and_optimize_call (gimple_stmt_iterator *gsi, bool *zero_write,
- pointer_query &ptr_qry)
+bool
+strlen_pass::check_and_optimize_call (bool *zero_write)
{
- gimple *stmt = gsi_stmt (*gsi);
+ gimple *stmt = gsi_stmt (m_gsi);
if (!gimple_call_builtin_p (stmt, BUILT_IN_NORMAL))
{
@@ -5238,12 +5281,12 @@ strlen_check_and_optimize_call (gimple_stmt_iterator *gsi, bool *zero_write,
if (lookup_attribute ("alloc_size", TYPE_ATTRIBUTES (fntype)))
{
- handle_alloc_call (BUILT_IN_NONE, gsi);
+ handle_alloc_call (BUILT_IN_NONE);
return true;
}
if (tree lhs = gimple_call_lhs (stmt))
- handle_assign (gsi, lhs, zero_write, ptr_qry);
+ handle_assign (lhs, zero_write);
/* Proceed to handle user-defined formatting functions. */
}
@@ -5254,68 +5297,68 @@ strlen_check_and_optimize_call (gimple_stmt_iterator *gsi, bool *zero_write,
if (!flag_optimize_strlen
|| !strlen_optimize
|| !valid_builtin_call (stmt))
- return !handle_printf_call (gsi, ptr_qry);
+ return !handle_printf_call (&m_gsi, ptr_qry);
tree callee = gimple_call_fndecl (stmt);
switch (DECL_FUNCTION_CODE (callee))
{
case BUILT_IN_STRLEN:
case BUILT_IN_STRNLEN:
- handle_builtin_strlen (gsi);
+ handle_builtin_strlen ();
break;
case BUILT_IN_STRCHR:
- handle_builtin_strchr (gsi);
+ handle_builtin_strchr ();
break;
case BUILT_IN_STRCPY:
case BUILT_IN_STRCPY_CHK:
case BUILT_IN_STPCPY:
case BUILT_IN_STPCPY_CHK:
- handle_builtin_strcpy (DECL_FUNCTION_CODE (callee), gsi, ptr_qry);
+ handle_builtin_strcpy (DECL_FUNCTION_CODE (callee));
break;
case BUILT_IN_STRNCAT:
case BUILT_IN_STRNCAT_CHK:
- handle_builtin_strncat (DECL_FUNCTION_CODE (callee), gsi);
+ handle_builtin_strncat (DECL_FUNCTION_CODE (callee));
break;
case BUILT_IN_STPNCPY:
case BUILT_IN_STPNCPY_CHK:
case BUILT_IN_STRNCPY:
case BUILT_IN_STRNCPY_CHK:
- handle_builtin_stxncpy_strncat (false, gsi);
+ handle_builtin_stxncpy_strncat (false);
break;
case BUILT_IN_MEMCPY:
case BUILT_IN_MEMCPY_CHK:
case BUILT_IN_MEMPCPY:
case BUILT_IN_MEMPCPY_CHK:
- handle_builtin_memcpy (DECL_FUNCTION_CODE (callee), gsi, ptr_qry);
+ handle_builtin_memcpy (DECL_FUNCTION_CODE (callee));
break;
case BUILT_IN_STRCAT:
case BUILT_IN_STRCAT_CHK:
- handle_builtin_strcat (DECL_FUNCTION_CODE (callee), gsi, ptr_qry);
+ handle_builtin_strcat (DECL_FUNCTION_CODE (callee));
break;
case BUILT_IN_ALLOCA:
case BUILT_IN_ALLOCA_WITH_ALIGN:
case BUILT_IN_MALLOC:
case BUILT_IN_CALLOC:
- handle_alloc_call (DECL_FUNCTION_CODE (callee), gsi);
+ handle_alloc_call (DECL_FUNCTION_CODE (callee));
break;
case BUILT_IN_MEMSET:
- if (handle_builtin_memset (gsi, zero_write, ptr_qry))
+ if (handle_builtin_memset (zero_write))
return false;
break;
case BUILT_IN_MEMCMP:
- if (handle_builtin_memcmp (gsi))
+ if (handle_builtin_memcmp ())
return false;
break;
case BUILT_IN_STRCMP:
case BUILT_IN_STRNCMP:
- if (handle_builtin_string_cmp (gsi, ptr_qry.rvals))
+ if (handle_builtin_string_cmp ())
return false;
break;
default:
- if (handle_printf_call (gsi, ptr_qry))
+ if (handle_printf_call (&m_gsi, ptr_qry))
return false;
break;
}
@@ -5326,11 +5369,10 @@ strlen_check_and_optimize_call (gimple_stmt_iterator *gsi, bool *zero_write,
/* Handle an assignment statement at *GSI to a LHS of integral type.
If GSI's basic block needs clean-up of EH, set *CLEANUP_EH to true. */
-static void
-handle_integral_assign (gimple_stmt_iterator *gsi, bool *cleanup_eh,
- range_query *rvals)
+void
+strlen_pass::handle_integral_assign (bool *cleanup_eh)
{
- gimple *stmt = gsi_stmt (*gsi);
+ gimple *stmt = gsi_stmt (m_gsi);
tree lhs = gimple_assign_lhs (stmt);
tree lhs_type = TREE_TYPE (lhs);
@@ -5399,11 +5441,11 @@ handle_integral_assign (gimple_stmt_iterator *gsi, bool *cleanup_eh,
/* Reading the final '\0' character. */
tree zero = build_int_cst (lhs_type, 0);
gimple_set_vuse (stmt, NULL_TREE);
- gimple_assign_set_rhs_from_tree (gsi, zero);
+ gimple_assign_set_rhs_from_tree (&m_gsi, zero);
*cleanup_eh
|= maybe_clean_or_replace_eh_stmt (stmt,
- gsi_stmt (*gsi));
- stmt = gsi_stmt (*gsi);
+ gsi_stmt (m_gsi));
+ stmt = gsi_stmt (m_gsi);
update_stmt (stmt);
if (dump_file && (dump_flags & TDF_DETAILS) != 0)
@@ -5442,7 +5484,7 @@ handle_integral_assign (gimple_stmt_iterator *gsi, bool *cleanup_eh,
= count_nonzero_bytes (rhs, stmt,
lenrange, &full_string_p,
&storing_all_zeros_p, &storing_all_nonzero_p,
- rvals);
+ ptr_qry.rvals);
if (ranges_valid)
{
tree length = build_int_cst (sizetype, lenrange[0]);
@@ -5465,9 +5507,8 @@ handle_integral_assign (gimple_stmt_iterator *gsi, bool *cleanup_eh,
/* Handle assignment statement at *GSI to LHS. Set *ZERO_WRITE if
the assignent stores all zero bytes.. */
-static bool
-handle_assign (gimple_stmt_iterator *gsi, tree lhs, bool *zero_write,
- pointer_query &ptr_qry)
+bool
+strlen_pass::handle_assign (tree lhs, bool *zero_write)
{
tree type = TREE_TYPE (lhs);
if (TREE_CODE (type) == ARRAY_TYPE)
@@ -5497,7 +5538,7 @@ handle_assign (gimple_stmt_iterator *gsi, tree lhs, bool *zero_write,
}
/* Handle a single or multibyte assignment. */
- if (is_char_store && !handle_store (gsi, zero_write, ptr_qry))
+ if (is_char_store && !handle_store (zero_write))
return false;
return true;
@@ -5510,11 +5551,10 @@ handle_assign (gimple_stmt_iterator *gsi, tree lhs, bool *zero_write,
true. Return true to let the caller advance *GSI to the next statement
in the basic block and false otherwise. */
-static bool
-check_and_optimize_stmt (gimple_stmt_iterator *gsi, bool *cleanup_eh,
- pointer_query &ptr_qry)
+bool
+strlen_pass::check_and_optimize_stmt (bool *cleanup_eh)
{
- gimple *stmt = gsi_stmt (*gsi);
+ gimple *stmt = gsi_stmt (m_gsi);
/* For statements that modify a string, set to true if the write
is only zeros. */
@@ -5522,7 +5562,7 @@ check_and_optimize_stmt (gimple_stmt_iterator *gsi, bool *cleanup_eh,
if (is_gimple_call (stmt))
{
- if (!strlen_check_and_optimize_call (gsi, &zero_write, ptr_qry))
+ if (!check_and_optimize_call (&zero_write))
return false;
}
else if (!flag_optimize_strlen || !strlen_optimize)
@@ -5543,13 +5583,13 @@ check_and_optimize_stmt (gimple_stmt_iterator *gsi, bool *cleanup_eh,
ssa_ver_to_stridx[SSA_NAME_VERSION (lhs)] = idx;
}
else if (gimple_assign_rhs_code (stmt) == POINTER_PLUS_EXPR)
- handle_pointer_plus (gsi);
+ handle_pointer_plus ();
}
else if (TREE_CODE (lhs) == SSA_NAME && INTEGRAL_TYPE_P (lhs_type))
/* Handle assignment to a character. */
- handle_integral_assign (gsi, cleanup_eh, ptr_qry.rvals);
+ handle_integral_assign (cleanup_eh);
else if (TREE_CODE (lhs) != SSA_NAME && !TREE_SIDE_EFFECTS (lhs))
- if (!handle_assign (gsi, lhs, &zero_write, ptr_qry))
+ if (!handle_assign (lhs, &zero_write))
return false;
}
else if (gcond *cond = dyn_cast<gcond *> (stmt))
@@ -5616,39 +5656,9 @@ do_invalidate (basic_block dombb, gimple *phi, bitmap visited, int *count)
}
}
-class strlen_dom_walker : public dom_walker
-{
-public:
- strlen_dom_walker (cdi_direction direction)
- : dom_walker (direction),
- ptr_qry (&m_ranger, &var_cache),
- var_cache (),
- m_cleanup_cfg (false)
- {
- }
-
- ~strlen_dom_walker ();
-
- virtual edge before_dom_children (basic_block);
- virtual void after_dom_children (basic_block);
-
- /* Ranger used for printf argument range processing, and
- to track strlen results across integer variable assignments. */
- gimple_ranger m_ranger;
-
- /* A pointer_query object and its cache to store information about
- pointers and their targets in. */
- pointer_query ptr_qry;
- pointer_query::cache_type var_cache;
-
- /* Flag that will trigger TODO_cleanup_cfg to be returned in strlen
- execute function. */
- bool m_cleanup_cfg;
-};
-
/* Release pointer_query cache. */
-strlen_dom_walker::~strlen_dom_walker ()
+strlen_pass::~strlen_pass ()
{
ptr_qry.flush_cache ();
}
@@ -5657,7 +5667,7 @@ strlen_dom_walker::~strlen_dom_walker ()
string ops by remembering string lengths pointed by pointer SSA_NAMEs. */
edge
-strlen_dom_walker::before_dom_children (basic_block bb)
+strlen_pass::before_dom_children (basic_block bb)
{
basic_block dombb = get_immediate_dominator (CDI_DOMINATORS, bb);
@@ -5731,13 +5741,13 @@ strlen_dom_walker::before_dom_children (basic_block bb)
bool cleanup_eh = false;
/* Attempt to optimize individual statements. */
- for (gimple_stmt_iterator gsi = gsi_start_bb (bb); !gsi_end_p (gsi); )
+ for (m_gsi = gsi_start_bb (bb); !gsi_end_p (m_gsi); )
{
/* Reset search depth preformance counter. */
ptr_qry.depth = 0;
- if (check_and_optimize_stmt (&gsi, &cleanup_eh, ptr_qry))
- gsi_next (&gsi);
+ if (check_and_optimize_stmt (&cleanup_eh))
+ gsi_next (&m_gsi);
}
if (cleanup_eh && gimple_purge_dead_eh_edges (bb))
@@ -5753,7 +5763,7 @@ strlen_dom_walker::before_dom_children (basic_block bb)
owned by the current bb, clear bb->aux. */
void
-strlen_dom_walker::after_dom_children (basic_block bb)
+strlen_pass::after_dom_children (basic_block bb)
{
if (bb->aux)
{
@@ -5799,7 +5809,7 @@ printf_strlen_execute (function *fun, bool warn_only)
/* String length optimization is implemented as a walk of the dominator
tree and a forward walk of statements within each block. */
- strlen_dom_walker walker (CDI_DOMINATORS);
+ strlen_pass walker (CDI_DOMINATORS);
walker.walk (ENTRY_BLOCK_PTR_FOR_FN (fun));
if (dump_file && (dump_flags & TDF_DETAILS))
