From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-vk1-f170.google.com (mail-vk1-f170.google.com [209.85.221.170]) by sourceware.org (Postfix) with ESMTPS id C6609395B416 for ; Fri, 16 Sep 2022 07:45:56 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C6609395B416 Authentication-Results: sourceware.org; dmarc=fail (p=none dis=none) header.from=acm.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-vk1-f170.google.com with SMTP id h5so10283444vkc.5 for ; Fri, 16 Sep 2022 00:45:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date; bh=peYQLJ0nmcIQEGfNADrINwaq5D9KuyGjMRPtrz4e1Xc=; b=PpQfxQwycV78H8bIboMtjUKGNKlJyyxU+AWTlOo37qZWRmKku40PNNL/84Ugrxy9ai WehGU58Zsz4ob1vJMWadxmyx/zeX6YZwtkKTxvS9mE77OJjzGwg2sMVHQuGzk5fpEAcO 3jq2jQuSCtNfK0z9WgMIIf4+vvmVf+6zxfnxmrZ6raVU4b/QJr7aXDZhOOjM6px/EWc4 n3TFbf8kpgB6fR/8NqdfcEv58NDY9WjpKHPFVpwQ5yn/SciHYw4OtPagmFrwo2VGhGNK VnCsXAwI94EgtV6WDnwxDFpLs5TYVgNbThpEUbpCY0W4nqr4R78L7v5Rcr7Hw5fZ2J4W 1zWw== X-Gm-Message-State: ACrzQf3OF4L8C5JbEJk8jz1CE5XbUWthdtbYlDLHovXF85BS6l1rrY13 7M42VKjj5gI+RQ32p+yxk8AgpUI/lIeIngVq8JY= X-Google-Smtp-Source: AMsMyM7rKAM82srw04ywvmPVF9CFA8jI+QQ0+5Aea8H5HqbxaJ/P1ylA0e23vrIhe3mopxjNZCjevFvrveBFYZ3Yi8Q= X-Received: by 2002:a1f:24b:0:b0:3a3:ad4:a3b2 with SMTP id 72-20020a1f024b000000b003a30ad4a3b2mr493867vkc.13.1663314355959; Fri, 16 Sep 2022 00:45:55 -0700 (PDT) MIME-Version: 1.0 References: <20220915201627.2942314-1-ppalka@redhat.com> In-Reply-To: <20220915201627.2942314-1-ppalka@redhat.com> From: Nathan Sidwell Date: Fri, 16 Sep 2022 09:45:44 +0200 Message-ID: Subject: Re: [PATCH] c++: modules ICE with typename friend declaration To: Patrick Palka Cc: GCC Patches , Jason Merrill Content-Type: multipart/alternative; boundary="000000000000563e3b05e8c68daf" X-Spam-Status: No, score=-11.6 required=5.0 tests=BAYES_00,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,GIT_PATCH_0,HEADER_FROM_DIFFERENT_DOMAINS,HTML_MESSAGE,KAM_DMARC_STATUS,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS,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: --000000000000563e3b05e8c68daf Content-Type: text/plain; charset="UTF-8" Thanks, this looks right. Sigh templates can mess up ones mental invariants! The test case should really be a foo_[ab].C kind, to test both sides of the streaming. Bonus points for using the template after importing. And you need the dg-module-cmi annotation to check /and then delete/ the gcm file produced. nathan On Thu, Sep 15, 2022, 22:16 Patrick Palka wrote: > 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 > > --000000000000563e3b05e8c68daf--