From patchwork Thu Feb 1 17:18:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Palka X-Patchwork-Id: 1894134 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=VMPJCqoU; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.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 ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TQlxm4n6Vz23g7 for ; Fri, 2 Feb 2024 04:19:08 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id AE4C6384DEE0 for ; Thu, 1 Feb 2024 17:19:06 +0000 (GMT) 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.129.124]) by sourceware.org (Postfix) with ESMTPS id 2614D3858002 for ; Thu, 1 Feb 2024 17:18:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 2614D3858002 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 2614D3858002 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706807921; cv=none; b=Ga+IHSblm7vUs48/gQPvlrzATYirwnu8hJjlnIPYF5bE17uHPs/vCUzB6YkYBS2QgsAJJuys3aWl+cGdZmjdZXNquVxAQsTTHVLm5kEP0sQO22Cts9zUWlyrvNFnYmf4dMQfkmgXUda9Lm5Rf7SK9wCUG5Hy/aMJrLvuQvz2UEs= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706807921; c=relaxed/simple; bh=d1ylPHVmVvqR1kUuvKA5yyjdvghun/RUgLV9mc1R6iM=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=Uzanlcbg+btgUxWPFYKL8eLVQgOAueTSA4gu6O56BlClrO3rM1gYlyKIusLIQPisqc1Ppy7jfC/ihCzmsMKS4fTTjDGCGHbQWC0XqyAabZwoncdkaTTfIRBqhVbScKmr/skEXQN4bzDm9DRimaNB7+j2o/tx9U3Eh19UtIe5QY0= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1706807919; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5YKdLnfDwMds+0QSaw4w7CQq40Jpx3T/6TpZlUGkotI=; b=VMPJCqoU4vHcS1My0iKXNo+f+mH7QCznh4h8BUQQ72K4NwIcrKM0twQU5LYm7rQNTFqx13 Af4JAYTPTO4WbwuDJa4df2GgDNroEXpGuxewRBQi3Ww1AREX7mzt65cj69mPwzB4TA30+1 whJfaUmMS4VkWHjdAr/A0e64zQZDDDo= Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-437-7tL1n8__My6wtuyLTOPB0w-1; Thu, 01 Feb 2024 12:18:38 -0500 X-MC-Unique: 7tL1n8__My6wtuyLTOPB0w-1 Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-783f387ed7eso156218785a.1 for ; Thu, 01 Feb 2024 09:18:38 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706807916; x=1707412716; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=5YKdLnfDwMds+0QSaw4w7CQq40Jpx3T/6TpZlUGkotI=; b=EnvvhPzStMJOTNRy4jcezB12XcwjqbOdDSD6T75qY4Jiar5rmFDHk8HybrZ69H0g6V NXreUVcKnlEqded7NpAJLhkVpVwEj4ireWsvb9M6XXz24M7+7+Adgdc5rU96xfTuAMXK RcN3FFSBu1LK8b2WfW9T6EXhJ4HYQmIettbCOakSs6yiKzCEe90/kOvl5SsQTo6OPIFK eXUt0Yiley5ARgeFSAN35wDmnYN67dVmRFsuyj1gHRAZ4quap1yv/ecxdAuSD7caxVEh Nb835TI1Te+P/Q2PwBt9CGH+3D+Xe668XJF0UrPY6EKZHy0o6VcylnWIRyoJOUVbKJYd tCQg== X-Gm-Message-State: AOJu0YyshDU3PoSVnqmoGv16R4WjiVhBcQTjRdp3JoFb8+dUjoNhQ3Xu yk3WvGHxYa48bSr9FjxPGOVKTDQkAvNOZxnurZXpnMt2UjsfrFjAT+IyfXlG/HO9D8JHiltcJKW Tc8Q1TrAzCvLdrxbQxHm9g1JhbA2wXkaR+sMrLWxDg0e2V2LsarPb3u+rPJ5tKJtyPXHkED9WNf tYVUHDtzO77P9DpIcC2JMycP8j4O6S50tgLAfb X-Received: by 2002:a05:620a:3885:b0:783:9a16:307f with SMTP id qp5-20020a05620a388500b007839a16307fmr3290916qkn.18.1706807916290; Thu, 01 Feb 2024 09:18:36 -0800 (PST) X-Google-Smtp-Source: AGHT+IEm7Yaug7o6xT9n64ts2YKbsqcGg0FxRYVVZD4tjccDM6gctaJjSGyArfEZ10C3AZ8xB0LtHQ== X-Received: by 2002:a05:620a:3885:b0:783:9a16:307f with SMTP id qp5-20020a05620a388500b007839a16307fmr3290895qkn.18.1706807915909; Thu, 01 Feb 2024 09:18:35 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCXcR/GZ8AQ5owK0K1DwzcyN0a8qPBVul/d/f89qr3K6XzwR37sQxpXK5nrd8/HGgFXxhInZMyK9GQxnMHQsRg15EA== Received: from localhost.localdomain (ool-457670bb.dyn.optonline.net. [69.118.112.187]) by smtp.gmail.com with ESMTPSA id d23-20020a05620a205700b00783f77b968fsm4070712qka.109.2024.02.01.09.18.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Feb 2024 09:18:35 -0800 (PST) From: Patrick Palka To: gcc-patches@gcc.gnu.org Cc: jason@redhat.com, Patrick Palka Subject: [PATCH] c++/modules: anon union member of as-base class [PR112580] Date: Thu, 1 Feb 2024 12:18:33 -0500 Message-ID: <20240201171833.3240525-1-ppalka@redhat.com> X-Mailer: git-send-email 2.43.0.493.gbc7ee2e5e1 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-13.5 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_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE, URIBL_BLACK autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Tested on x86_64-pc-linux-gnu, does this look OK for trunk? -- >8 -- Here when streaming in the fields of the as-base version of _Formatting_scanner we end up clobbering ANON_AGGR_TYPE_FIELD of the anonymous union type, since it turns out this type is shared between the original FIELD_DECL and the as-base FIELD_DECL copy (copied during layout_class_type). ANON_AGGR_TYPE_FIELD first gets properly set to the original FIELD_DECL when streaming in the canonical definition of _Formatting_scanner, and then gets overwritten to the as-base FIELD_DECL when streaming in the the as-base definition. This leads to lookup_anon_field giving the wrong answer when resolving the _M_values use. This patch makes us avoid overwriting ANON_AGGR_TYPE_FIELD when streaming in an as-base class definition, it should already be properly set at that point. PR c++/112580 gcc/cp/ChangeLog: * module.cc (trees_in::read_class_def): When streaming in an anonymous union field of an as-base class, don't clobber ANON_AGGR_TYPE_FIELD. gcc/testsuite/ChangeLog: * g++.dg/modules/anon-3_a.H: New test. * g++.dg/modules/anon-3_b.C: New test. --- gcc/cp/module.cc | 12 ++++++++++-- gcc/testsuite/g++.dg/modules/anon-3_a.H | 21 +++++++++++++++++++++ gcc/testsuite/g++.dg/modules/anon-3_b.C | 8 ++++++++ 3 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/g++.dg/modules/anon-3_a.H create mode 100644 gcc/testsuite/g++.dg/modules/anon-3_b.C diff --git a/gcc/cp/module.cc b/gcc/cp/module.cc index 3c2fef0e3f4..d36ba2eeeb3 100644 --- a/gcc/cp/module.cc +++ b/gcc/cp/module.cc @@ -12178,8 +12178,16 @@ trees_in::read_class_def (tree defn, tree maybe_template) if (TREE_CODE (decl) == FIELD_DECL && ANON_AGGR_TYPE_P (TREE_TYPE (decl))) - ANON_AGGR_TYPE_FIELD - (TYPE_MAIN_VARIANT (TREE_TYPE (decl))) = decl; + { + tree anon_type = TYPE_MAIN_VARIANT (TREE_TYPE (decl)); + if (DECL_NAME (defn) == as_base_identifier) + /* ANON_AGGR_TYPE_FIELD should already point to the + original FIELD_DECL, don't overwrite it to point + to the as-base FIELD_DECL copy. */ + gcc_checking_assert (ANON_AGGR_TYPE_FIELD (anon_type)); + else + ANON_AGGR_TYPE_FIELD (anon_type) = decl; + } if (TREE_CODE (decl) == USING_DECL && TREE_CODE (USING_DECL_SCOPE (decl)) == RECORD_TYPE) diff --git a/gcc/testsuite/g++.dg/modules/anon-3_a.H b/gcc/testsuite/g++.dg/modules/anon-3_a.H new file mode 100644 index 00000000000..64a6aab51dd --- /dev/null +++ b/gcc/testsuite/g++.dg/modules/anon-3_a.H @@ -0,0 +1,21 @@ +// PR c++/112580 +// { dg-additional-options "-fmodule-header" } +// { dg-module-cmi {} } + +template +struct _Formatting_scanner { + union { + int _M_values = 42; + }; + virtual int _M_format_arg() { return _M_values; } +}; + +template +auto __do_vformat_to() { + _Formatting_scanner s; + return s; +} + +inline auto vformat() { + return __do_vformat_to(); +} diff --git a/gcc/testsuite/g++.dg/modules/anon-3_b.C b/gcc/testsuite/g++.dg/modules/anon-3_b.C new file mode 100644 index 00000000000..d676fe47536 --- /dev/null +++ b/gcc/testsuite/g++.dg/modules/anon-3_b.C @@ -0,0 +1,8 @@ +// PR c++/112580 +// { dg-additional-options "-fmodules-ts" } + +import "anon-3_a.H"; + +int main() { + vformat()._M_format_arg(); +}