From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by sourceware.org (Postfix) with ESMTP id 2C629385DC00 for ; Sat, 4 Apr 2020 01:08:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 2C629385DC00 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-309-xwqjz6lJN0y1KswC29_xbw-1; Fri, 03 Apr 2020 21:08:17 -0400 X-MC-Unique: xwqjz6lJN0y1KswC29_xbw-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 485868017F4 for ; Sat, 4 Apr 2020 01:08:16 +0000 (UTC) Received: from redhat.com (ovpn-114-53.phx2.redhat.com [10.3.114.53]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 76E7260BF3; Sat, 4 Apr 2020 01:08:15 +0000 (UTC) Date: Fri, 3 Apr 2020 21:08:13 -0400 From: Marek Polacek To: Jason Merrill Cc: GCC Patches Subject: Re: [PATCH v2] c++: Fix crash in gimplifier with paren init of aggregates [PR94155] Message-ID: <20200404010813.GV2929@redhat.com> References: <20200330202823.428754-1-polacek@redhat.com> MIME-Version: 1.0 In-Reply-To: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline X-Spam-Status: No, score=-30.5 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Apr 2020 01:08:21 -0000 On Fri, Apr 03, 2020 at 03:01:37PM -0400, Jason Merrill via Gcc-patches wro= te: > 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: > >=20 > > /* ??? Here's to hoping the front end fills in all of the indice= s, > > so we don't have to figure out what's missing ourselves. */ > > gcc_assert (purpose); > >=20 > > 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. > >=20 > > Bootstrapped/regtested on x86_64-linux, ok for trunk? >=20 > Shouldn't digest_init fill in the indexes? In > process_init_constructor_array I see >=20 > if (!ce->index) > ce->index =3D size_int (i); Yes, that works too. Thus: Bootstrapped/regtested on x86_64-linux, ok for trunk? -- >8 -- 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 call digest_init to fill in the indexes. Bootstrapped/regtested on x86_64-linux, ok for trunk? =09PR c++/94155 - crash in gimplifier with paren init of aggregates. =09* decl.c (check_initializer): Call digest_init. =09* g++.dg/cpp2a/paren-init22.C: New test. --- gcc/cp/decl.c | 5 +++++ gcc/testsuite/g++.dg/cpp2a/paren-init22.C | 15 +++++++++++++++ 2 files changed, 20 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..63e7bda09f5 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -6754,6 +6754,11 @@ check_initializer (tree decl, tree init, int flags, = vec **cleanups) =09 init =3D build_constructor_from_list (init_list_type_node, init); =09 CONSTRUCTOR_IS_DIRECT_INIT (init) =3D true; =09 CONSTRUCTOR_IS_PAREN_INIT (init) =3D true; +=09 /* The gimplifier expects that the front end fills in all of the +=09=09 indices. Normally, reshape_init_array fills these in, but we +=09=09 don't call reshape_init because that does nothing when it gets +=09=09 CONSTRUCTOR_IS_PAREN_INIT. */ +=09 init =3D digest_init (type, init, tf_warning_or_error); =09 } =09} else if (TREE_CODE (init) =3D=3D 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: 0c809f727cd2a6c70c307d9dd53d26dc84bf292a --=20 Marek Polacek =E2=80=A2 Red Hat, Inc. =E2=80=A2 300 A St, Boston, MA