From patchwork Mon Apr 29 13:50:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Palka X-Patchwork-Id: 1929034 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=MScpQ6VQ; 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 4VSl8j0B0Jz1ymX for ; Mon, 29 Apr 2024 23:50:44 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C5A013858401 for ; Mon, 29 Apr 2024 13:50:41 +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.133.124]) by sourceware.org (Postfix) with ESMTPS id 9D73B3858D37 for ; Mon, 29 Apr 2024 13:50:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9D73B3858D37 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 9D73B3858D37 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1714398622; cv=none; b=Cb7RGmN8+Q/nmioPShPl2Yp3BQkXp3zQIf495HoOOOPSfoptOP+QorkB/li/9+Km6qKDxHRK/bn6QalfY5tx0l6qcJCcxHQwvAcbDO5oYLvtpUUG7I7sxmtKBbCH1ThZ1Wz8jPxVe9OY6bM1scpe6NMMCMAKIPZd6l5CK/UieQ0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1714398622; c=relaxed/simple; bh=YukqJYMiRpJF2rFfVgJabWNrAFeJqW3GG+fffuX7fA4=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=llwuXhuPPjYKpjCY7SuYQzV2Sg/FZ78/RpIvyBiRpt1AGcl5yP4u7EuDL2bCh3dekvHBTzD91IsBu4PzMw1AjBI0hZxxH3Q4sFcWB7UV9VedajDVr9+sfFU3Q5kQ+krk/VedEyu7d0oHeUArqoeh9G6LPlc+n6u6yfvHq9RFdKo= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1714398620; 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=l4dJo713yTfpVUVsLneRCOyAn2i1vRQF5Kb4AGB9IRM=; b=MScpQ6VQzpoqogRzj46fYKzoXpKWvJt5OigKGXNp5keBHh5M4QDgrdBDJ1xNKMU60BZsps QWJXQ+O+CJtMWvAU2RMK3QFMeb2rEncK9WfxOYY0HMklAagyZDR+0qc63bZaA1hkbi4c7h YpnGyUVVgTHAXpwry7B49GQLnvbq4BA= Received: from mail-vk1-f197.google.com (mail-vk1-f197.google.com [209.85.221.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-656-QHXbIhkdOm2j-xA0ECFCOg-1; Mon, 29 Apr 2024 09:50:16 -0400 X-MC-Unique: QHXbIhkdOm2j-xA0ECFCOg-1 Received: by mail-vk1-f197.google.com with SMTP id 71dfb90a1353d-4daa11f1ec1so2553515e0c.0 for ; Mon, 29 Apr 2024 06:50:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714398615; x=1715003415; 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=l4dJo713yTfpVUVsLneRCOyAn2i1vRQF5Kb4AGB9IRM=; b=QKkaaeDrgXxENRXG4ah2Yh+Fa5ymbQoArv9Wc+4yQ4gnV1DPPMUrDv15zF91Pm0EMo KJi0y0jtHeT2tnpuo0mRIpxpTd63xjF/zb7MPtVTelMwOaDROx1d21rYS61fpDtMLkUH FOHkr7CsayiXxu0cOyBhJP+CHz2X1tMJvkHt27U/kSGBBMxjxKQUIjG4pwJJLAsdV05H SFRR3THJdfZmGDyG4DHO2K7zGTUSk0ksQkhKbM4aq+okoCkhCFrCWOloMcVATj5Zq/FA U7V4rZ8L+4ytMWTbidIZw2dzwl+09Cz+gM0jcATbHtbYNWaK0rbLgvJbMaO9QPSUPIw5 3YhA== X-Gm-Message-State: AOJu0Yz7e9bNDT8uWre8FSJ/4ghKub2QQaWiyEhgvgBFZpEol81xlJ3z 09PRtECO1pZ+iqEA6lA5UUkXlH3r5XMh8vrbKo0hSB84Pt8MkJ59aj3DykL4MrnyfwSemXmPckc ylEa98dP05yXwFx/3sPZ5wzEBzCQH1oUWFyD0J3y/5tL4E66mUMWBP3S7f40TRhtkFEwCFD2FRd isstowVJM+2U7T5l3nCCq/hosbx19gxUubpuNf X-Received: by 2002:a05:6122:918:b0:4d4:2398:51a2 with SMTP id j24-20020a056122091800b004d4239851a2mr8926076vka.8.1714398615588; Mon, 29 Apr 2024 06:50:15 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHnoum9mCaPDg0zOK21Tii4Xupmin5xpUE0r0n1ExKd5aZ9ZHHBmj/2ze+p4Se358OW6uSTkQ== X-Received: by 2002:a05:6122:918:b0:4d4:2398:51a2 with SMTP id j24-20020a056122091800b004d4239851a2mr8926040vka.8.1714398615194; Mon, 29 Apr 2024 06:50:15 -0700 (PDT) Received: from localhost.localdomain (ool-457670bb.dyn.optonline.net. [69.118.112.187]) by smtp.gmail.com with ESMTPSA id i20-20020ac5c2d4000000b004d88f58e243sm3639449vkk.42.2024.04.29.06.50.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Apr 2024 06:50:14 -0700 (PDT) From: Patrick Palka To: gcc-patches@gcc.gnu.org Cc: jason@redhat.com, Patrick Palka Subject: [PATCH] c++/modules: imported spec befriending class tmpl [PR114889] Date: Mon, 29 Apr 2024 09:50:12 -0400 Message-ID: <20240429135012.2862238-1-ppalka@redhat.com> X-Mailer: git-send-email 2.45.0.rc1 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-13.3 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_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, 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 and perhaps 14 (I guess after 14.1 is released)? -- >8 -- We need to look through TEMPLATE_DECL like make_friend_class does when adding to CLASSTYPE_BEFRIENDING_CLASSES. Otherwise in the below testcase we won't add _Hashtable to CLASSTYPE_BEFRIENDING_CLASSES of _Map_base when installing the definition of the former which leads to access control issues. PR c++/114889 gcc/cp/ChangeLog: * module.cc (trees_in::read_class_def): Look through TEMPLATE_DECL when adding to CLASSTYPE_BEFRIENDING_CLASSES. gcc/testsuite/ChangeLog: * g++.dg/modules/friend-8_a.H: New test. * g++.dg/modules/friend-8_b.C: New test. --- gcc/cp/module.cc | 2 ++ gcc/testsuite/g++.dg/modules/friend-8_a.H | 23 +++++++++++++++++++++++ gcc/testsuite/g++.dg/modules/friend-8_b.C | 9 +++++++++ 3 files changed, 34 insertions(+) create mode 100644 gcc/testsuite/g++.dg/modules/friend-8_a.H create mode 100644 gcc/testsuite/g++.dg/modules/friend-8_b.C diff --git a/gcc/cp/module.cc b/gcc/cp/module.cc index 7e654305f0a..3b2ba40c92b 100644 --- a/gcc/cp/module.cc +++ b/gcc/cp/module.cc @@ -12518,6 +12518,8 @@ trees_in::read_class_def (tree defn, tree maybe_template) for (; friend_classes; friend_classes = TREE_CHAIN (friend_classes)) { tree f = TREE_VALUE (friend_classes); + if (TREE_CODE (f) == TEMPLATE_DECL) + f = TREE_TYPE (f); if (CLASS_TYPE_P (f)) { diff --git a/gcc/testsuite/g++.dg/modules/friend-8_a.H b/gcc/testsuite/g++.dg/modules/friend-8_a.H new file mode 100644 index 00000000000..b07ea25adfb --- /dev/null +++ b/gcc/testsuite/g++.dg/modules/friend-8_a.H @@ -0,0 +1,23 @@ +// PR c++/114889 +// { dg-additional-options "-fmodule-header" } +// { dg-module-cmi {} } + +template +struct _Hashtable; + +template +struct _Map_base { + void f() { + _Hashtable<_Key, _Val> __h; + __h._M_hash_code(0); + } +}; + +template +struct _Hashtable { + template friend struct _Map_base; +protected: + void _M_hash_code(int); +}; + +inline _Hashtable m; diff --git a/gcc/testsuite/g++.dg/modules/friend-8_b.C b/gcc/testsuite/g++.dg/modules/friend-8_b.C new file mode 100644 index 00000000000..b04280bc91a --- /dev/null +++ b/gcc/testsuite/g++.dg/modules/friend-8_b.C @@ -0,0 +1,9 @@ +// PR c++/114889 +// { dg-additional-options "-fmodules-ts" } + +import "friend-8_a.H"; + +int main() { + _Map_base m; + m.f(); +}