From patchwork Fri Apr 21 19:26:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 753551 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3w8m3g4lMgz9s1h for ; Sat, 22 Apr 2017 05:27:47 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="b/i2oAyM"; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :mime-version:from:date:message-id:subject:to:content-type; q= dns; s=default; b=ND1lHQw4YWk/To/6w7M95KGX4ehCw/Ju/tJed89mfD+Pa+ 5Au1pn7H9WJxCby52kqIGCo3btcq3cYFF+fuKM2lk2ssdrzOqt9HR18bNS0MYviy XTQDhPy2YYJDLiKypzRxp+YmBrThocWbX06R7FJKpCwA6ZXaYUr4fRF7QdkjY= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :mime-version:from:date:message-id:subject:to:content-type; s= default; bh=fa4BRzX3/498EIsHKPlaZHUnneM=; b=b/i2oAyMTvPn/aTMZ7W4 B/CAfPShPyj90Dr/2Just4CQq/PW/GB7ODuGz0IrJ2tLSdf9maCDs4feqX85L6YV 2eNdEfoER9zFufZRm2hl2+uIkpDlcBoHdYce2U9wNQRyodyYGkPu4H5mHcmrtIUd VuXe8o24Ogxce8xexuRIlW0= Received: (qmail 110972 invoked by alias); 21 Apr 2017 19:27:35 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 110776 invoked by uid 89); 21 Apr 2017 19:27:33 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.3 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.2 spammy=H*F:U*jason X-HELO: mail-io0-f172.google.com Received: from mail-io0-f172.google.com (HELO mail-io0-f172.google.com) (209.85.223.172) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 21 Apr 2017 19:27:32 +0000 Received: by mail-io0-f172.google.com with SMTP id a103so131780260ioj.1 for ; Fri, 21 Apr 2017 12:27:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=NpI6PoLaP+oqPq3WK0u25paj+lKiCyADkzScA22/RLE=; b=es3Bbta+5hZaFOOZJCYy3WQAoYdi9ONUurFNb9SIo3/MQnUzZ+u8imoVw6QZsktNBt Sxcf+Or45u5sczdq7NwfxFkncAqomtzXcuBiygHCVWZDY4GGlImO0P7c/HpFvUZSoVX4 KtfqxM9QMIREXiVs+1y+rXxrDsLTNW9/ZGrM7xPn8QEjDP+0I5xNgbB2KZmgyKlW8Ntt pehybBksuiK4OiKogDbDxkJGiVbda7UvN9ujgw8doNdP+TBXfLUUEwaUmFumtOl6RFXr i/RVpzhK00DN52fDUjzjXgzp6COUbynyuVLr8jECpJijR88enFLo9jcY/NIBoG6Ly2kz k1bw== X-Gm-Message-State: AN3rC/5Qk7ZGBdLxarxTK2qsXuUkWaaefJp0mL9wKWCXt3i/B/BAtovf Xo/GqrIWsT7STGE42HaujKPnTxzSCfAXNGs= X-Received: by 10.107.55.68 with SMTP id e65mr18006153ioa.55.1492802819895; Fri, 21 Apr 2017 12:26:59 -0700 (PDT) MIME-Version: 1.0 Received: by 10.107.59.23 with HTTP; Fri, 21 Apr 2017 12:26:39 -0700 (PDT) From: Jason Merrill Date: Fri, 21 Apr 2017 15:26:39 -0400 Message-ID: Subject: C++ PATCH for C++/80179, ICE initializing flexible array member To: gcc-patches List X-IsSubscribed: yes The check for matching type when initializing a subaggregate needed to know about flexible array types. Tested x86_64-pc-linux-gnu, applying to trunk. commit 251d142a1046a1a6cfcbafd29fabd163ec78d7cb Author: Jason Merrill Date: Mon Apr 17 16:55:21 2017 -0400 PR c++/80179 - ICE with initialized flexible array member. * constexpr.c (verify_ctor_sanity): Handle flexible array members. diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c index 9dde4a4..366d562 100644 --- a/gcc/cp/constexpr.c +++ b/gcc/cp/constexpr.c @@ -2643,8 +2643,16 @@ verify_ctor_sanity (const constexpr_ctx *ctx, tree type) /* We used to check that ctx->ctor was empty, but that isn't the case when the object is zero-initialized before calling the constructor. */ if (ctx->object) - gcc_assert (same_type_ignoring_top_level_qualifiers_p - (type, TREE_TYPE (ctx->object))); + { + tree otype = TREE_TYPE (ctx->object); + gcc_assert (same_type_ignoring_top_level_qualifiers_p (type, otype) + /* Handle flexible array members. */ + || (TREE_CODE (otype) == ARRAY_TYPE + && TYPE_DOMAIN (otype) == NULL_TREE + && TREE_CODE (type) == ARRAY_TYPE + && (same_type_ignoring_top_level_qualifiers_p + (TREE_TYPE (type), TREE_TYPE (otype))))); + } gcc_assert (!ctx->object || !DECL_P (ctx->object) || *(ctx->values->get (ctx->object)) == ctx->ctor); } diff --git a/gcc/testsuite/g++.dg/ext/flexary24.C b/gcc/testsuite/g++.dg/ext/flexary24.C new file mode 100644 index 0000000..c25e540 --- /dev/null +++ b/gcc/testsuite/g++.dg/ext/flexary24.C @@ -0,0 +1,12 @@ +// PR c++/80179 +// { dg-options "" } + +struct S { + int n; + const char *a[]; +}; + +void bar (const char *a) +{ + static const S t = { 1, { a, "b" } }; +}