From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 340B5384BC2C for ; Thu, 15 Sep 2022 20:16:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 340B5384BC2C Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1663272997; 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=WizLCyef7zHDjuWJcaBlitTrmM3RF1M34LpCcPxkbrU=; b=QNkZStNV5mGMU+DhPYBxYnMc42c2Y1pHaXtn1w9i8er5FrH4t+QpJMMuMD1aC3Fm48IDtc 9yQfZ6HOjysA+9MUJ56j3kLllulBNqL7iLcvOC6fGoo5Eh2SDn62wxZ3qOjlgnS1pwBnaX Ef/b4js2tlmq1kj2ULxgARWrwgkIrVk= Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-614-JOb7ZCc2M7CsuSCsdZPcmA-1; Thu, 15 Sep 2022 16:16:36 -0400 X-MC-Unique: JOb7ZCc2M7CsuSCsdZPcmA-1 Received: by mail-qt1-f200.google.com with SMTP id g21-20020ac87d15000000b0035bb6f08778so10012719qtb.2 for ; Thu, 15 Sep 2022 13:16:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date; bh=WizLCyef7zHDjuWJcaBlitTrmM3RF1M34LpCcPxkbrU=; b=HkHcCLONyVjvGR1IExUPAT8iDcYFeeuaoDl7bzBRKN4E863vwyz6kL0sbKJQLqK1jg /YTftbFrmsHNTH3QCM6KHoW5CEwPihDo3i4IzSy5l4n9k3Rh07qT7NVnR1CGKagL5XNa lKFnGDmTysMulgfRLBT0FzVEoSKdEsLqL9X8HPiUtxviznU+ubPvzIpsK6qwLXw07Kfg Mxng+hSvB7aJlILcyW1LxZQHvprmRmIeTYCPJ6KUf0zkIGjQHR66GWzpt1mZUiYnoTIn SrKk/kpQD9EBEbq/w7wmZB1/8ZtqaWps5E0RvgSHIXVNV07sFXMp+GEsC436jvjjiG6d XAnw== X-Gm-Message-State: ACrzQf0YSX4moW0NndLhAQ0nMmWxZxfsgaISttTxkeFp0c9tvSUVgZNf mQRBay8GCT4zC6KluTfKcpxK2r2ShGvUs1kmJC0Y8Vwy+FBrLyM8VvY+9qQ3m5NfnBVx9i4ZwX+ 5v7WoCut2Wh9TN2KZZyExNvtrdRpRoMJgzCALYCTBy2THoq4XLHR7qDJ/B5jolTBkhDI= X-Received: by 2002:a05:622a:138b:b0:35b:b619:b87d with SMTP id o11-20020a05622a138b00b0035bb619b87dmr1617083qtk.146.1663272996166; Thu, 15 Sep 2022 13:16:36 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5w7IgMzanCwrtaW1kl6/+THf8Xzp9Fvz47ympeCgjzzwwUS+SuZzCl+2bZ3DVMFCpY8hMVwA== X-Received: by 2002:a05:622a:138b:b0:35b:b619:b87d with SMTP id o11-20020a05622a138b00b0035bb619b87dmr1617062qtk.146.1663272995922; Thu, 15 Sep 2022 13:16:35 -0700 (PDT) Received: from localhost.localdomain (ool-457670bb.dyn.optonline.net. [69.118.112.187]) by smtp.gmail.com with ESMTPSA id a7-20020ac86107000000b0035ba3cae6basm4157138qtm.34.2022.09.15.13.16.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Sep 2022 13:16:35 -0700 (PDT) From: Patrick Palka To: gcc-patches@gcc.gnu.org Cc: jason@redhat.com, nathan@acm.org, Patrick Palka Subject: [PATCH] c++: modules ICE with typename friend declaration Date: Thu, 15 Sep 2022 16:16:27 -0400 Message-Id: <20220915201627.2942314-1-ppalka@redhat.com> X-Mailer: git-send-email 2.37.3.662.g36f8e7ed7d MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Spam-Status: No, score=-14.4 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,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: A couple of xtreme-header-* modules tests began ICEing in C++23 mode ever since r13-2650-g5d84a4418aa962 introduced into the dependently scoped friend declaration friend /* typename */ _OuterIter::value_type; ultimately because the streaming code assumes a TYPE_P friend must be a class type, but here it's a TYPENAME_TYPE, which doesn't have a TEMPLATE_INFO or CLASSTYPE_BEFRIENDING_CLASSES. This patch tries to correct this in a minimal way. Tested on x86_64-pc-linux-gnu, does this look OK for trunk? gcc/cp/ChangeLog: * module.cc (friend_from_decl_list): Don't consider CLASSTYPE_TEMPLATE_INFO for a TYPENAME_TYPE friend. (trees_in::read_class_def): Don't add to CLASSTYPE_BEFRIENDING_CLASSES for a TYPENAME_TYPE friend. gcc/testsuite/ChangeLog: * g++.dg/modules/typename-friend.C: New test. --- gcc/cp/module.cc | 5 +++-- gcc/testsuite/g++.dg/modules/typename-friend.C | 9 +++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/g++.dg/modules/typename-friend.C diff --git a/gcc/cp/module.cc b/gcc/cp/module.cc index f27f4d091e5..1a1ff5be574 100644 --- a/gcc/cp/module.cc +++ b/gcc/cp/module.cc @@ -4734,7 +4734,8 @@ friend_from_decl_list (tree frnd) if (TYPE_P (frnd)) { res = TYPE_NAME (frnd); - if (CLASSTYPE_TEMPLATE_INFO (frnd)) + if (CLASS_TYPE_P (frnd) + && CLASSTYPE_TEMPLATE_INFO (frnd)) tmpl = CLASSTYPE_TI_TEMPLATE (frnd); } else if (DECL_TEMPLATE_INFO (frnd)) @@ -12121,7 +12122,7 @@ trees_in::read_class_def (tree defn, tree maybe_template) { tree f = TREE_VALUE (friend_classes); - if (TYPE_P (f)) + if (CLASS_TYPE_P (f)) { CLASSTYPE_BEFRIENDING_CLASSES (f) = tree_cons (NULL_TREE, type, diff --git a/gcc/testsuite/g++.dg/modules/typename-friend.C b/gcc/testsuite/g++.dg/modules/typename-friend.C new file mode 100644 index 00000000000..d8faf7955c3 --- /dev/null +++ b/gcc/testsuite/g++.dg/modules/typename-friend.C @@ -0,0 +1,9 @@ +// { dg-additional-options "-fmodules-ts" } + +export module x; + +template +struct A { + friend typename T::type; + friend void f(A) { } +}; -- 2.37.3.662.g36f8e7ed7d