From: Richard Biener <richard.guenther@gmail.com>
To: Marek Polacek <polacek@redhat.com>
Cc: GCC Patches <gcc-patches@gcc.gnu.org>, Jakub Jelinek <jakub@redhat.com>
Subject: Re: [PATCH] Fix middle-end/81737
Date: Mon, 14 Aug 2017 08:32:00 -0000 [thread overview]
Message-ID: <CAFiYyc1Cnp4Dk5DzF_10OfgXXYqmwD49xvLFMBJk51fp=j8FRg@mail.gmail.com> (raw)
In-Reply-To: <20170808172345.GK17069@redhat.com>
On Tue, Aug 8, 2017 at 7:23 PM, Marek Polacek <polacek@redhat.com> wrote:
> On Mon, Aug 07, 2017 at 04:07:49PM +0200, Richard Biener wrote:
>> On August 7, 2017 11:09:59 AM GMT+02:00, Marek Polacek <polacek@redhat.com> wrote:
>> >On Mon, Aug 07, 2017 at 10:58:09AM +0200, Jakub Jelinek wrote:
>> >> On Mon, Aug 07, 2017 at 10:47:51AM +0200, Marek Polacek wrote:
>> >> > In my recent change I failed to check whether the type domain
>> >> > of a type is non-NULL and this goof causes crashing on this
>> >> > testcase.
>> >> >
>> >> > Bootstrapped/regtested on x86_64-linux, ok for trunk?
>> >> >
>> >> > 2017-08-07 Marek Polacek <polacek@redhat.com>
>> >> >
>> >> > PR middle-end/81737
>> >> > * fold-const.c (fold_indirect_ref_1): Check type_domain.
>> >> >
>> >> > * gcc.dg/pr81737.c: New test.
>> >>
>> >> The old code was assuming size_zero_node if type_domain is NULL
>> >> or TYPE_MIN_VALUE is NULL, which is reasonable for C/C++, but indeed
>> >might
>> >> be wrong perhaps for Fortran or Ada.
>>
>> It's how the middle-end defines it, so please restore this behavior (sorry for missing this in the review). IIRC there are at least one other 'copy' of the folding somewhere.
>
> Sure, this patch should do it:
>
> Bootstrapped/regtested on x86_64-linux, ok for trunk?
>
> 2017-08-08 Marek Polacek <polacek@redhat.com>
>
> PR middle/81695
> * fold-const.c (fold_indirect_ref_1): Restore original behavior
> regarding size_zero_node.
>
> diff --git gcc/fold-const.c gcc/fold-const.c
> index 5a118ca50a1..2c47d1d16a4 100644
> --- gcc/fold-const.c
> +++ gcc/fold-const.c
> @@ -14109,22 +14109,21 @@ fold_indirect_ref_1 (location_t loc, tree type, tree op0)
> && type == TREE_TYPE (op00type))
> {
> tree type_domain = TYPE_DOMAIN (op00type);
> - tree min;
> + tree min = size_zero_node;
> if (type_domain != NULL_TREE
> - && (min = TYPE_MIN_VALUE (type_domain))
> + && TYPE_MIN_VALUE (type_domain)
> && TREE_CODE (min) == INTEGER_CST)
> + min = TYPE_MIN_VALUE (type_domain);
I think this is wrong for non-INTEGER_CST TYPE_MIN_VALUE.
Richard.
> + offset_int off = wi::to_offset (op01);
> + offset_int el_sz = wi::to_offset (TYPE_SIZE_UNIT (type));
> + offset_int remainder;
> + off = wi::divmod_trunc (off, el_sz, SIGNED, &remainder);
> + if (remainder == 0)
> {
> - offset_int off = wi::to_offset (op01);
> - offset_int el_sz = wi::to_offset (TYPE_SIZE_UNIT (type));
> - offset_int remainder;
> - off = wi::divmod_trunc (off, el_sz, SIGNED, &remainder);
> - if (remainder == 0)
> - {
> - off = off + wi::to_offset (min);
> - op01 = wide_int_to_tree (sizetype, off);
> - return build4_loc (loc, ARRAY_REF, type, op00, op01,
> - NULL_TREE, NULL_TREE);
> - }
> + off = off + wi::to_offset (min);
> + op01 = wide_int_to_tree (sizetype, off);
> + return build4_loc (loc, ARRAY_REF, type, op00, op01,
> + NULL_TREE, NULL_TREE);
> }
> }
> }
>
> Marek
next prev parent reply other threads:[~2017-08-14 8:22 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-07 8:47 Marek Polacek
2017-08-07 8:58 ` Jakub Jelinek
2017-08-07 9:10 ` Marek Polacek
2017-08-07 14:07 ` Richard Biener
2017-08-08 17:23 ` Marek Polacek
2017-08-14 8:32 ` Richard Biener [this message]
2017-08-16 10:51 ` Marek Polacek
2017-08-16 13:38 ` Richard Biener
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAFiYyc1Cnp4Dk5DzF_10OfgXXYqmwD49xvLFMBJk51fp=j8FRg@mail.gmail.com' \
--to=richard.guenther@gmail.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=jakub@redhat.com \
--cc=polacek@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).