From patchwork Sat Jan 8 06:24:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 49750 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 8370F3857404 for ; Sat, 8 Jan 2022 06:25:10 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8370F3857404 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1641623110; bh=4xQLoA0LlSD5H8M2yoKutlbA31jOISr2uDn9EGGr3X0=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=Y9oesdQKz1xYhCEQaso4AmBtYQqHuvjq4WtxNAIWQonkjhi7CxLKCidVHV5c4LMZE PpibfnhL3yltHYsj76qcnH35EyW2u1Xsgzv9UqHpCUe9RffxxY5F3y+f7gd4zWmMLt x0SCH0LVJItCqFlxANdqVseE1fR8QXuOSleNbPYM= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id CBF753858421 for ; Sat, 8 Jan 2022 06:24:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org CBF753858421 Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-310-v2NZNE60OmSpImg5gdbGTQ-1; Sat, 08 Jan 2022 01:24:39 -0500 X-MC-Unique: v2NZNE60OmSpImg5gdbGTQ-1 Received: by mail-qt1-f197.google.com with SMTP id a11-20020ac8434b000000b002c5b672037dso6778909qtn.6 for ; Fri, 07 Jan 2022 22:24:39 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=4xQLoA0LlSD5H8M2yoKutlbA31jOISr2uDn9EGGr3X0=; b=jSjXFKMQBpTgztTv7MdLU7oHYw05jf+1NDcZzDVo+yM+LoJWswY1j1vmSdsVM5z8FW dOv9xQQ/gef/BOrh8DicrSazBL4y75cUWvaOcgJIT2y5Qi9yNAnCBbXQjdQUItR2+nBO /I1zU6GPPhM3HeAL4Iju3MANtLcTZhUyq5P4cSyS55zow8rq8+Hj12z3oXkrURgmlkzj c4mFSZN916GJJ0DmYzISG5xngzCkzquCeLJKsWYgtSRGhzJLsC0ULZzIciytFihUprzF vA55ryo6xT03vdMwuuUJlpcWZalLgr2v9x70V3R+QnDQtjDEQibF0BOsU6w/KpU/Ogbg KsZg== X-Gm-Message-State: AOAM531xlf32NnUqRkMThvVIX6OUhH6ivLebMMnqWPuGOvjCrixBdoOk szu4Nxc+cmgiRcvbOdGek0B3XY48p4vSTeofgUlIYkXGA9MKmdn+s6jpjNyxO+FfX2AReFDQqj4 jl4gF00e2mK37IwPzfA22vTNXMZRz2TE5WZb4x7p+zXdi8c78moIlGCeaFGT3+0kAwA== X-Received: by 2002:a05:622a:40b:: with SMTP id n11mr5519864qtx.475.1641623079107; Fri, 07 Jan 2022 22:24:39 -0800 (PST) X-Google-Smtp-Source: ABdhPJwuZGLYhovGe2TtDXZyWS5Svh9AStIg0ipQKkUXIXP8fFob4wEbVWd5zG2ucq3M4kqqpPbgKg== X-Received: by 2002:a05:622a:40b:: with SMTP id n11mr5519849qtx.475.1641623078745; Fri, 07 Jan 2022 22:24:38 -0800 (PST) Received: from barrymore.redhat.com (130-44-159-43.s15913.c3-0.arl-cbr1.sbo-arl.ma.cable.rcncustomer.com. [130.44.159.43]) by smtp.gmail.com with ESMTPSA id i21sm543285qti.31.2022.01.07.22.24.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jan 2022 22:24:38 -0800 (PST) To: gcc-patches@gcc.gnu.org Subject: [pushed] c++: default mem-init of array [PR103946] Date: Sat, 8 Jan 2022 01:24:36 -0500 Message-Id: <20220108062436.3106225-1-jason@redhat.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-13.2 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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-Patchwork-Original-From: Jason Merrill via Gcc-patches From: Jason Merrill Reply-To: Jason Merrill Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" In the patch for PR92385 I added asserts to see if we tried to make a vec_init of a vec_init, but didn't see any in regression testing. This testcase is one case, which seems reasonable: we create a VEC_INIT_EXPR for the aggregate initializer, and then again to express the actual initialization of the member. We already do similar collapsing of TARGET_EXPR. So let's just remove the asserts. PR c++/103946 gcc/cp/ChangeLog: * init.c (build_vec_init): Remove assert. * tree.c (build_vec_init_expr): Likewise. gcc/testsuite/ChangeLog: * g++.dg/cpp0x/nsdmi-array1.C: New test. --- gcc/cp/init.c | 5 +---- gcc/cp/tree.c | 5 +---- gcc/testsuite/g++.dg/cpp0x/nsdmi-array1.C | 6 ++++++ 3 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 gcc/testsuite/g++.dg/cpp0x/nsdmi-array1.C base-commit: 75047f795111150fd10a8f86f5c72deab10cde77 diff --git a/gcc/cp/init.c b/gcc/cp/init.c index 6226812b470..ccc4f5ece08 100644 --- a/gcc/cp/init.c +++ b/gcc/cp/init.c @@ -4369,10 +4369,7 @@ build_vec_init (tree base, tree maxindex, tree init, init = TARGET_EXPR_INITIAL (init); if (init && TREE_CODE (init) == VEC_INIT_EXPR) - { - gcc_checking_assert (false); - init = VEC_INIT_EXPR_INIT (init); - } + init = VEC_INIT_EXPR_INIT (init); bool direct_init = false; if (from_array && init && BRACE_ENCLOSED_INITIALIZER_P (init) diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c index 4c1135ba386..d0c6490e42f 100644 --- a/gcc/cp/tree.c +++ b/gcc/cp/tree.c @@ -787,10 +787,7 @@ tree build_vec_init_expr (tree type, tree init, tsubst_flags_t complain) { if (init && TREE_CODE (init) == VEC_INIT_EXPR) - { - gcc_checking_assert (false); - return init; - } + return init; tree elt_init; if (init && TREE_CODE (init) == CONSTRUCTOR diff --git a/gcc/testsuite/g++.dg/cpp0x/nsdmi-array1.C b/gcc/testsuite/g++.dg/cpp0x/nsdmi-array1.C new file mode 100644 index 00000000000..1ab14359b56 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/nsdmi-array1.C @@ -0,0 +1,6 @@ +// PR c++/103946 +// { dg-do compile { target c++11 } } + +struct s1 { s1(); }; +class s2 { s1 f1[2]{}; }; +s2 a;