https://gcc.gnu.org/bugzilla/show_bug.cgi?id=98721

--- Comment #4 from CVS Commits <cvs-commit at gcc dot gnu.org> ---
The master branch has been updated by Jakub Jelinek <ja...@gcc.gnu.org>:

https://gcc.gnu.org/g:4d2ecd960a0c0e7656043b9c162fcac6d7e5ac3f

commit r11-6812-g4d2ecd960a0c0e7656043b9c162fcac6d7e5ac3f
Author: Jakub Jelinek <ja...@redhat.com>
Date:   Wed Jan 20 09:49:24 2021 +0100

    builtins: Fix up two bugs in access_ref::inform_access [PR98721]

    The following patch fixes two bugs in the access_ref::inform_access
function
    (plus some formatting nits).

    The first problem is that ref can be various things, e.g. *_DECL, or
    SSA_NAME, or IDENTIFIER_NODE.  And allocfn is non-NULL only if ref is
    (at least originally) an SSA_NAME initialized to the result of some
    allocator function (but not e.g. __builtin_alloca_with_align which is
    handled differently).

    A few lines above the last hunk of this patch in builtins.c, the code uses
      if (mode == access_read_write || mode == access_write_only)
        {
          if (allocfn == NULL_TREE)
            {
              if (*offstr)
                inform (loc, "at offset %s into destination object %qE of size
%s",
                        offstr, ref, sizestr);
              else
                inform (loc, "destination object %qE of size %s", ref,
sizestr);
              return;
            }

          if (*offstr)
            inform (loc,
                    "at offset %s into destination object of size %s "
                    "allocated by %qE", offstr, sizestr, allocfn);
          else
            inform (loc, "destination object of size %s allocated by %qE",
                    sizestr, allocfn);
          return;
        }
    so if allocfn is NULL, it prints whatever ref is, if it is non-NULL,
    it prints instead the allocation function.  But strangely the hunk
    a few lines below wasn't consistent with that and instead printed the
    first form only if DECL_P (ref) and would ICE if ref wasn't a decl but
    still allocfn was NULL.  Fixed by making it consistent what the code does
    earlier.

    Another bug is that the code earlier contains an ugly hack for VLAs and was
    assuming that SSA_NAME_IDENTIFIER must be non-NULL on the lhs of
    __builtin_alloca_with_align.  While that is likely true for the cases where
    the compiler emits this builtin for VLAs (and it will also be true that
    the name of the VLA in that case can be taken from that identifier up to
the
    first .), the builtin is user accessible as the testcase shows, so one can
    have any other SSA_NAME in there.  I think it would be better to add some
    more reliable way how to identify VLA names corresponding to
    __builtin_alloca_with_align allocations, perhaps internal fn or whatever,
    but that is beyond the scope of this patch.

    2021-01-20  Jakub Jelinek  <ja...@redhat.com>

            PR tree-optimization/98721
            * builtins.c (access_ref::inform_access): Don't assume
            SSA_NAME_IDENTIFIER must be non-NULL.  Print messages about
            object whenever allocfn is NULL, rather than only when DECL_P
            is true.  Use %qE instead of %qD for that.  Formatting fixes.

            * gcc.dg/pr98721-1.c: New test.
            * gcc.dg/pr98721-2.c: New test.

Reply via email to