From patchwork Mon Feb 26 20:52:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Palka X-Patchwork-Id: 86403 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 4B7163858284 for ; Mon, 26 Feb 2024 20:52:59 +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 3B82C3858C78 for ; Mon, 26 Feb 2024 20:52:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3B82C3858C78 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 3B82C3858C78 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=1708980752; cv=none; b=rnk2YyMgsEenR/JQui7xmz4h3QPJhA0xQ0R4MZpXQmrFhJ2qeTXmJawqcNkwu+05jiscPxtDkOVP2g7qWrjvnFDgDfKdScZdwbdW0AQ4jnpwVyX5liuZ/DOvBIVr3sT2wBVnk2qOpSpVSHvl/H28uaLnX2WYFVhldMMVZ5INk9Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708980752; c=relaxed/simple; bh=93sIeRAMiOeoQjHyoQk576JdhYT5iGtR3Wtm75Ex2Xc=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=KO+mHZOf9uM3DaaKPK2iCMXf7Iai87Qoe1RiU1WRCQlkykJt5wLsy1BlGtCYvFzz2x2xhwY6jwngSKtUPkmGitMYp/JP7dNzzSbDnGc+MduvROidZo8lm4TM3LQQrJSjeT6lge4v94hIP5Q1MCocjwJpYGVDqYoPj0MBzpm8ME4= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1708980749; 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=wDsnU4jWr6aleZ3WNXJZuXaPYl2tok+xM6K0k6x7Haw=; b=OOo16Qvs0BfUdi1mAUYKuasfFxgmGkVL8WGdyNaMi8lmS1cCyR0JoJ/63ZsdwHo3wrFGd/ RG3b2w9Un/tArXoa8jiDw8kKQalXhcM3JHlDbezXpI1yhokJHIeNtXnlcQexCDm0Mz5xuG 5GFQkbnG5wjMXaRBEeZlp9sHv6s7/OA= Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-641-9PYqKr96MxyUFYvRVfl1XQ-1; Mon, 26 Feb 2024 15:52:28 -0500 X-MC-Unique: 9PYqKr96MxyUFYvRVfl1XQ-1 Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-783350c4584so550035685a.1 for ; Mon, 26 Feb 2024 12:52:28 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708980746; x=1709585546; 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=wDsnU4jWr6aleZ3WNXJZuXaPYl2tok+xM6K0k6x7Haw=; b=juDB0G8PFKFpyIWdse6fQoOfvyD02cQzXpvuXXk/Rx7l1E5M6n75tmDXu1wvNY1Jaj EB5dHJXQtVJvTIr0EmSN9GfkAuupydE8ujzMiq6+fas8VHunaOC0BbQogyNCzrjeafRL R69eIPcEV62H2TqrryyOJOMqDyok2jJmC+wA7qM3CLBZphfKeMAR8EhtUNBzwOwNzOVJ x4PfcEqxFV2e5tnotOKx3XCmqPs/nbCEn0rrrmmheS75DJFmxvvpirb1eRKtGvBoRYJa YpIv9dlXyqYz1W7qPpREaSrigORCpblD9yKTg1ZgVf7XghoTXKi1JkQOlu8dqFTGzrXB 5/3Q== X-Gm-Message-State: AOJu0YzrbI4p1k7Np1y8QxBLE/A9nYVm1NVt2XRzFqXncaNekp0r1Oog w1Vskcr+itGolMtj5BxyPpaDhgh96Wurx5eqnDlcsWfFAIJ0t2niCUTPiL+Em0YMa1yGOsRyUMe CLWwKb6CxDu47tMpoi17pvNLnazTDZAO3OW4cSbP9ieWeVg8lXRXDQzfQzjnCGDMR2IPjwJdf1w 0cA2NuAHPUtlqn/9OD4xkVkEWBE54/L1j2DIGO X-Received: by 2002:a05:620a:cd8:b0:787:8bab:33fb with SMTP id b24-20020a05620a0cd800b007878bab33fbmr234653qkj.2.1708980746351; Mon, 26 Feb 2024 12:52:26 -0800 (PST) X-Google-Smtp-Source: AGHT+IFBoUw0ceoSpd1deQNXPiSR4G1cP5eCV7U5H5dLKtI0tTT2lciC6ZCebRwVtnLJA4eG4rr//Q== X-Received: by 2002:a05:620a:cd8:b0:787:8bab:33fb with SMTP id b24-20020a05620a0cd800b007878bab33fbmr234643qkj.2.1708980745997; Mon, 26 Feb 2024 12:52:25 -0800 (PST) Received: from localhost.localdomain (ool-457670bb.dyn.optonline.net. [69.118.112.187]) by smtp.gmail.com with ESMTPSA id t10-20020a05620a034a00b00787e11574c5sm136816qkm.125.2024.02.26.12.52.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Feb 2024 12:52:25 -0800 (PST) From: Patrick Palka To: gcc-patches@gcc.gnu.org Cc: jason@redhat.com, nathan@acm.org, Patrick Palka Subject: [PATCH] c++/modules: befriending template from current class scope Date: Mon, 26 Feb 2024 15:52:23 -0500 Message-ID: <20240226205223.2403105-1-ppalka@redhat.com> X-Mailer: git-send-email 2.44.0.rc1.15.g4fc51f00ef MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.1 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, RCVD_IN_SORBS_WEB, 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+patchwork=sourceware.org@gcc.gnu.org Bootstrapped and regtested on x86_64-pc-linux-gnu, does this look OK for trunk? -- >8 -- Here the TEMPLATE_DECL representing the template friend declaration for B has class scope since B has class scope, but get_merge_kind assumes all DECL_UNINSTANTIATED_TEMPLATE_FRIEND_P TEMPLATE_DECL have namespace scope and wrongly returns MK_named instead of MK_local_friend. gcc/cp/ChangeLog: * module.cc (trees_out::get_merge_kind) : Accomodate class-scope DECL_UNINSTANTIATED_TEMPLATE_FRIEND_P TEMPLATE_DECL. Merge IDENTIFIER_ANON_P branches. gcc/testsuite/ChangeLog: * g++.dg/modules/friend-7.h: New test. * g++.dg/modules/friend-7_a.H: New test. * g++.dg/modules/friend-7_b.C: New test. --- gcc/cp/module.cc | 19 +++++++++---------- gcc/testsuite/g++.dg/modules/friend-7.h | 5 +++++ gcc/testsuite/g++.dg/modules/friend-7_a.H | 3 +++ gcc/testsuite/g++.dg/modules/friend-7_b.C | 5 +++++ 4 files changed, 22 insertions(+), 10 deletions(-) create mode 100644 gcc/testsuite/g++.dg/modules/friend-7.h create mode 100644 gcc/testsuite/g++.dg/modules/friend-7_a.H create mode 100644 gcc/testsuite/g++.dg/modules/friend-7_b.C diff --git a/gcc/cp/module.cc b/gcc/cp/module.cc index 106af7bdb3e..fa91c6ff9cb 100644 --- a/gcc/cp/module.cc +++ b/gcc/cp/module.cc @@ -10491,21 +10491,20 @@ trees_out::get_merge_kind (tree decl, depset *dep) break; } - if (RECORD_OR_UNION_TYPE_P (ctx)) + if (TREE_CODE (decl) == TEMPLATE_DECL + && DECL_UNINSTANTIATED_TEMPLATE_FRIEND_P (decl)) { - if (IDENTIFIER_ANON_P (DECL_NAME (decl))) - mk = MK_field; + mk = MK_local_friend; break; } - if (TREE_CODE (decl) == TEMPLATE_DECL - && DECL_UNINSTANTIATED_TEMPLATE_FRIEND_P (decl)) - mk = MK_local_friend; - else if (IDENTIFIER_ANON_P (DECL_NAME (decl))) + if (IDENTIFIER_ANON_P (DECL_NAME (decl))) { - if (DECL_IMPLICIT_TYPEDEF_P (decl) - && UNSCOPED_ENUM_P (TREE_TYPE (decl)) - && TYPE_VALUES (TREE_TYPE (decl))) + if (RECORD_OR_UNION_TYPE_P (ctx)) + mk = MK_field; + else if (DECL_IMPLICIT_TYPEDEF_P (decl) + && UNSCOPED_ENUM_P (TREE_TYPE (decl)) + && TYPE_VALUES (TREE_TYPE (decl))) /* Keyed by first enum value, and underlying type. */ mk = MK_enum; else diff --git a/gcc/testsuite/g++.dg/modules/friend-7.h b/gcc/testsuite/g++.dg/modules/friend-7.h new file mode 100644 index 00000000000..c0f00394f3b --- /dev/null +++ b/gcc/testsuite/g++.dg/modules/friend-7.h @@ -0,0 +1,5 @@ +template +struct A { + template struct B { }; + template friend struct B; +}; diff --git a/gcc/testsuite/g++.dg/modules/friend-7_a.H b/gcc/testsuite/g++.dg/modules/friend-7_a.H new file mode 100644 index 00000000000..e750e4c7d8d --- /dev/null +++ b/gcc/testsuite/g++.dg/modules/friend-7_a.H @@ -0,0 +1,3 @@ +// { dg-additional-options "-fmodule-header" } +// { dg-module-cmi {} } +#include "friend-7.h" diff --git a/gcc/testsuite/g++.dg/modules/friend-7_b.C b/gcc/testsuite/g++.dg/modules/friend-7_b.C new file mode 100644 index 00000000000..d90b685d89d --- /dev/null +++ b/gcc/testsuite/g++.dg/modules/friend-7_b.C @@ -0,0 +1,5 @@ +// { dg-additional-options "-fmodules-ts" } +#include "friend-7.h" +import "friend-7_a.H"; + +A a;