From patchwork Mon Jan 25 15:37:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 1431275 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=PDrBAnap; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DPYsj1mJRz9sSs for ; Tue, 26 Jan 2021 02:37:59 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id DA3A0396EC1D; Mon, 25 Jan 2021 15:37:56 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DA3A0396EC1D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1611589076; bh=DkpYlqTGSjSrnw/GsW7yYpvyS2DuilsxUJyB/xsNeaU=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=PDrBAnapw5obHVtgSHyDDWT0P95yVR9F4Ai7Su94HTKcNL00R1mHHFCHla87FWjv5 RFcwcDi7XBGZSfIBjOqskiPwuSkkf3o3kWzVyaq560j2/TG7tO0pMACu7tvXwgjcbf x4EpQv1cDHiWRVRTpJx7cbohCAh4abIKI6dc+NUo= 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 [63.128.21.124]) by sourceware.org (Postfix) with ESMTP id E90E4385800D for ; Mon, 25 Jan 2021 15:37:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org E90E4385800D Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-264-rFTgSgw9PLO5gVUSfq3d7A-1; Mon, 25 Jan 2021 10:37:51 -0500 X-MC-Unique: rFTgSgw9PLO5gVUSfq3d7A-1 Received: by mail-qk1-f198.google.com with SMTP id u66so1648054qkd.13 for ; Mon, 25 Jan 2021 07:37:51 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=DkpYlqTGSjSrnw/GsW7yYpvyS2DuilsxUJyB/xsNeaU=; b=h14CMewOdwPM5C16J1I99woyjjMOgP1HL7+2S0gze6RKROCqZZRfHaoZt2oQu7OsY/ vcjBne4ifMohL7QgnlbS4Jv0J6YqNOWiDvRQoMuRFZkAWzf2f5m1ggPUwOBM7WQMS4Y4 z8outev7BDb1GXx7MQVsl69UTFJXB03houYA+CIQqOoaB5r63TRXAsLJNsB5nrAJ8Bbp dBktnqRxSnXkLKZOqvOXvYVQHN8NbL0avDuI7xMLrEp60hddpwcX8q2qfE/JCvkBKcAk terE5qH+hV9lMyjdgk9c0MU9Rr+qh0Q/B7Gn6M2zUlpZEZYWg6+waKDUuXeLa0zzYxUr jjSg== X-Gm-Message-State: AOAM530AcK172PiLm9wI0fI81/SumcB+qW6rYEi2eAuf0dEMmqH85lgn kywyaa7a5WJzWzf7EaKsLeWVgrkK/JvpG34yzwb/OXP1wA35AzKX1xYeL5EifmoDgze0LkTk6ck l0UqtLpMzRAT4jPor/OumtXaFb4BS1VJmJe3rNbBC/0uHOlyLifNW/Z4XH3ND5sv8RQ== X-Received: by 2002:a37:2f85:: with SMTP id v127mr1284656qkh.18.1611589070463; Mon, 25 Jan 2021 07:37:50 -0800 (PST) X-Google-Smtp-Source: ABdhPJxw0ChkbI611RFzReXlROv3FsXknYvieZt9VtA1TiIc/RquCQqP3mSsnZ3AGBnEnB7kqaa6dw== X-Received: by 2002:a37:2f85:: with SMTP id v127mr1284621qkh.18.1611589070053; Mon, 25 Jan 2021 07:37:50 -0800 (PST) Received: from barrymore.redhat.com (209-6-118-145.s1935.c3-0.arl-cbr1.sbo-arl.ma.cable.rcncustomer.com. [209.6.118.145]) by smtp.gmail.com with ESMTPSA id n94sm10428694qtd.28.2021.01.25.07.37.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Jan 2021 07:37:48 -0800 (PST) To: gcc-patches@gcc.gnu.org Subject: [pushed] c++: [[no_unique_address]] in empty base [PR98463] Date: Mon, 25 Jan 2021 10:37:46 -0500 Message-Id: <20210125153746.384983-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=-15.0 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_H4, RCVD_IN_MSPIKE_WL, 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-Patchwork-Original-From: Jason Merrill via Gcc-patches From: Jason Merrill Reply-To: Jason Merrill Cc: jakub@redhat.com Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" In this testcase, cxx_eval_store_expression got confused trying to build up CONSTRUCTORs for initializing a subobject because the subobject is a member of an empty base. In C++14 mode and below we don't build FIELD_DECLs for empty bases, so the CONSTRUCTOR skipped the empty base, and treated the member as a member of the derived class, which breaks. Fixed by recognizing this situation and giving up on trying to build a CONSTRUCTOR for the inner target at that point; since it doesn't have any data, we don't need to actually store anything. Tested x86_64-pc-linux-gnu, applying to trunk. gcc/cp/ChangeLog: PR c++/98463 * constexpr.c (get_or_insert_ctor_field): Add check. (cxx_eval_store_expression): Handle discontinuity of refs. gcc/testsuite/ChangeLog: PR c++/98463 * g++.dg/cpp2a/no_unique_address8.C: New test. --- gcc/cp/constexpr.c | 18 ++++++++++++++++-- .../g++.dg/cpp2a/no_unique_address8.C | 11 +++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/g++.dg/cpp2a/no_unique_address8.C base-commit: 10c83fb7131779ee27fbaa9091065ca6cfedc0c5 diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c index b787919942b..c1217535761 100644 --- a/gcc/cp/constexpr.c +++ b/gcc/cp/constexpr.c @@ -3474,7 +3474,9 @@ get_or_insert_ctor_field (tree ctor, tree index, int pos_hint = -1) } else { - gcc_assert (TREE_CODE (index) == FIELD_DECL); + gcc_assert (TREE_CODE (index) == FIELD_DECL + && (same_type_ignoring_top_level_qualifiers_p + (DECL_CONTEXT (index), TREE_TYPE (ctor)))); /* We must keep the CONSTRUCTOR's ELTS in FIELD order. Usually we meet initializers in that order, but it is @@ -5289,6 +5291,18 @@ cxx_eval_store_expression (const constexpr_ctx *ctx, tree t, type = refs->pop(); tree index = refs->pop(); + if (TREE_CODE (index) == FIELD_DECL + && !(same_type_ignoring_top_level_qualifiers_p + (DECL_CONTEXT (index), TREE_TYPE (*valp)))) + { + /* INDEX isn't a member of *valp. This can happen if it's a member + of an empty base which isn't represented with a FIELD_DECL. Stop + trying to build a CONSTRUCTOR for the inner target; we'll notice + this disconnect again below and just return init. */ + gcc_assert (is_empty_class (DECL_CONTEXT (index))); + break; + } + if (code == UNION_TYPE && CONSTRUCTOR_NELTS (*valp) && CONSTRUCTOR_ELT (*valp, 0)->index != index) { diff --git a/gcc/testsuite/g++.dg/cpp2a/no_unique_address8.C b/gcc/testsuite/g++.dg/cpp2a/no_unique_address8.C new file mode 100644 index 00000000000..8b63ca37bab --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp2a/no_unique_address8.C @@ -0,0 +1,11 @@ +// PR c++/98463 +// { dg-do compile { target c++11 } } + +template struct A { constexpr A () : a() {} [[no_unique_address]] T a; }; +template struct B; +template +struct B : B<1, V...>, A {}; +template struct B : A {}; +template struct C : B<0, h...> {}; +struct D {}; +struct E { C k; virtual ~E (); } a;