public inbox for gcc-patches@gcc.gnu.org
 help / color / mirror / Atom feed
From: Jason Merrill <jason@redhat.com>
To: Marek Polacek <polacek@redhat.com>,
	GCC Patches <gcc-patches@gcc.gnu.org>
Subject: Re: [PATCH] c++: Fix crash in gimplifier with paren init of aggregates [PR94155]
Date: Fri, 3 Apr 2020 15:01:37 -0400	[thread overview]
Message-ID: <dc7ac119-f7fe-bfa2-917c-cf85b1191501@redhat.com> (raw)
In-Reply-To: <20200330202823.428754-1-polacek@redhat.com>

On 3/30/20 4:28 PM, Marek Polacek wrote:
> Here we crash in the gimplifier because gimplify_init_ctor_eval doesn't
> expect null indexes for a constructor:
> 
>        /* ??? Here's to hoping the front end fills in all of the indices,
>           so we don't have to figure out what's missing ourselves.  */
>        gcc_assert (purpose);
> 
> The indexes weren't filled because we never called reshape_init: for
> a constructor that represents parenthesized initialization of an
> aggregate we don't allow brace elision or designated initializers.  So
> fill in the indexes manually, here we have an array, and we can simply
> assign indexes starting from 0.
> 
> Bootstrapped/regtested on x86_64-linux, ok for trunk?

Shouldn't digest_init fill in the indexes?  In 
process_init_constructor_array I see

       if (!ce->index)
         ce->index = size_int (i);

> 	PR c++/94155 - crash in gimplifier with paren init of aggregates.
> 	* decl.c (check_initializer): Fill in constructor indexes.
> 
> 	* g++.dg/cpp2a/paren-init22.C: New test.
> ---
>   gcc/cp/decl.c                             |  6 ++++++
>   gcc/testsuite/g++.dg/cpp2a/paren-init22.C | 15 +++++++++++++++
>   2 files changed, 21 insertions(+)
>   create mode 100644 gcc/testsuite/g++.dg/cpp2a/paren-init22.C
> 
> diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
> index 69a238997b4..80dd2d8b931 100644
> --- a/gcc/cp/decl.c
> +++ b/gcc/cp/decl.c
> @@ -6754,6 +6754,12 @@ check_initializer (tree decl, tree init, int flags, vec<tree, va_gc> **cleanups)
>   	      init = build_constructor_from_list (init_list_type_node, init);
>   	      CONSTRUCTOR_IS_DIRECT_INIT (init) = true;
>   	      CONSTRUCTOR_IS_PAREN_INIT (init) = true;
> +	      /* The gimplifier expects that the front end fills in all of the
> +		 indices.  Normally, reshape_init_array fills these in, but we
> +		 don't call reshape_init because that does nothing when it gets
> +		 CONSTRUCTOR_IS_PAREN_INIT.  */
> +	      for (unsigned int i = 0; i < CONSTRUCTOR_NELTS (init); i++)
> +		CONSTRUCTOR_ELT (init, i)->index = size_int (i);
>   	    }
>   	}
>         else if (TREE_CODE (init) == TREE_LIST
> diff --git a/gcc/testsuite/g++.dg/cpp2a/paren-init22.C b/gcc/testsuite/g++.dg/cpp2a/paren-init22.C
> new file mode 100644
> index 00000000000..1b2959e7731
> --- /dev/null
> +++ b/gcc/testsuite/g++.dg/cpp2a/paren-init22.C
> @@ -0,0 +1,15 @@
> +// PR c++/94155 - crash in gimplifier with paren init of aggregates.
> +// { dg-do compile { target c++2a } }
> +
> +struct S { int i, j; };
> +
> +struct A {
> +  S s;
> +  constexpr A(S e) : s(e) {}
> +};
> +
> +void
> +f()
> +{
> +  A g[1]({{1, 1}});
> +}
> 
> base-commit: 48e331d63827a0500670d685c0fe7d609e0a807a
> 


  reply	other threads:[~2020-04-03 19:01 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-30 20:28 Marek Polacek
2020-04-03 19:01 ` Jason Merrill [this message]
2020-04-04  1:08   ` [PATCH v2] " Marek Polacek
2020-04-04  2:39     ` Jason Merrill
2020-04-04 17:56       ` Marek Polacek
2020-04-06 14:47         ` Jason Merrill
2020-04-06 15:57           ` [PATCH v3] " Marek Polacek
2020-04-06 16:35             ` Jason Merrill

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=dc7ac119-f7fe-bfa2-917c-cf85b1191501@redhat.com \
    --to=jason@redhat.com \
    --cc=gcc-patches@gcc.gnu.org \
    --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).