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 013063858C2B for ; Sun, 10 Dec 2023 18:35:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 013063858C2B 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 013063858C2B 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=1702233321; cv=none; b=mcphKb+S0FDk6+KETVu/EFaqEv2j/ldN84KHMHGbXhkR6sILXAhSyackWLE2EwNvH3PbGSLNoJU1vvzCnF43AnrfqHvFzqg7HQVVarHdTGrRatjLPRlmPqDt0OHzkG7FOnlsoTgkU+3x6krKZWL0QGQ1tq0x5+bWS/UaWs2RRI4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1702233321; c=relaxed/simple; bh=OjMEC8vg1c5prJWlOGgRfuaPun2v5PVijARXr49pZiA=; h=DKIM-Signature:Message-ID:Date:MIME-Version:Subject:To:From; b=asHfoNlZcZ+zVCnq8J/ob3HzaDS4DvtH/C/7zeBHCkPe20GvVs0xP/Twq9MxseDTaE3R9iaU5bGydJojEjdk0+vU9yAyky3i4HQeYTgSIt+56mEw6ER5RJ7kJwt4ptYX0AS82bEIOU5TPFvzKA67p+j8afnd4sVIOMRsjC7dJ3Y= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1702233319; 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: in-reply-to:in-reply-to:references:references; bh=5LmyxbPSyG3zgUGqNuNGpq3iZDBS7iaBlVMWAm0vf8E=; b=imHnIjEpNHac6EP73Fook3CUHnebK4M8JhBZe9TqejBJB297KmcSdPYgSy1qMfcfOX2sDq Pd5x9kPfdR+OBdVcxTb4dij0Irk6nrkgjRhaJdfCKxWSMPQmkXUUNkkGbqfBMk8cg63oF7 LtT4XOS8RXNHKpciKPgtV2JZGFoY1ho= Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-588-K8PEQiykPp-lr8-YQmTnjw-1; Sun, 10 Dec 2023 13:35:17 -0500 X-MC-Unique: K8PEQiykPp-lr8-YQmTnjw-1 Received: by mail-qv1-f69.google.com with SMTP id 6a1803df08f44-67aa2707000so55824016d6.3 for ; Sun, 10 Dec 2023 10:35:17 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702233317; x=1702838117; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=5LmyxbPSyG3zgUGqNuNGpq3iZDBS7iaBlVMWAm0vf8E=; b=ExKq70ukUXtEnVS3uc/JqFRaNo4+6pnpVtXF3+EGl5yQ5fiTWm2TpMOKtaM5NnA4PL G745TrgbJ0Do5k99C/pq6kPXzfrR9/lrn4SG5HYqKwI/XEsyZfjHdKjW6gDs8doA8GSm LcyUeI9NkOY8ZqKaKcs+glWQU3xA1p93dhC4hgavNHb49Jyj1kivugI7Aci0QV6Rkpy5 ieOAGhvKTjvgqXdzYK8OtgZzpK6V0xu4k7UD/rEgScbitF15dc0NyUHF8BC7C0bFS6Jn yNz2bgJBsLLNzAa+yjhQzXPACLZ6fA+nFhvXvxKooOPKCWplyG5tNjTKOsSdCPB5Ud/o +W8g== X-Gm-Message-State: AOJu0YzE7Ib7jOHtzg0xLrl+KW533sY2WhKru+mAmbAIktaVXKSvuPm4 AGOAfXQQZHyZEk0eDXbnH9RVsocsGlx8h1zdTzVKFcMukHWJLoIsZz69ND4tj5glIcOHVS1yJzx 5uW2xm/pTe5tOc4viIw== X-Received: by 2002:a05:6214:180a:b0:67a:a721:b19a with SMTP id o10-20020a056214180a00b0067aa721b19amr4622672qvw.85.1702233316908; Sun, 10 Dec 2023 10:35:16 -0800 (PST) X-Google-Smtp-Source: AGHT+IEz39fvjb3m0SA3jdx5JJYu5Oqv4/8n6M31nhbsSFa5X3ISHXdR+FdKUp2acHkbVQbCCAdMqQ== X-Received: by 2002:a05:6214:180a:b0:67a:a721:b19a with SMTP id o10-20020a056214180a00b0067aa721b19amr4622660qvw.85.1702233316670; Sun, 10 Dec 2023 10:35:16 -0800 (PST) Received: from [192.168.1.108] (130-44-146-16.s12558.c3-0.arl-cbr1.sbo-arl.ma.cable.rcncustomer.com. [130.44.146.16]) by smtp.gmail.com with ESMTPSA id v4-20020ac87484000000b00423e9316931sm2536459qtq.83.2023.12.10.10.35.15 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 10 Dec 2023 10:35:16 -0800 (PST) Message-ID: Date: Sun, 10 Dec 2023 13:35:15 -0500 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] c++: Clear uninstantiated friend flag when instantiating [PR104234] To: Nathaniel Shead , gcc-patches@gcc.gnu.org Cc: Nathan Sidwell , Patrick Palka References: <655f4b9d.170a0220.5d81b.3377@mx.google.com> From: Jason Merrill In-Reply-To: X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.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_NONE,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,RCVD_IN_SORBS_WEB,SPF_HELO_NONE,SPF_NONE,TXREP,T_SCC_BODY_TEXT_LINE 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: On 11/23/23 08:40, Nathaniel Shead wrote: > Sorry, I just noticed I hadn't actually filled in the changelog. It > should say "Clear DECL_UNINSTANTIATED_TEMPLATE_FRIEND_P." OK with that change. > On Thu, Nov 23, 2023 at 11:54 PM Nathaniel Shead > wrote: >> >> Bootstrapped and regtested on x86_64-pc-linux-gnu. I don't have write >> access. >> >> -- >8 -- >> >> Otherwise attempting to get the originating module declaration ICEs >> because the DECL_CHAIN of an instantiated friend template is no longer >> its context. >> >> PR c++/104234 >> PR c++/112580 >> >> gcc/cp/ChangeLog: >> >> * pt.cc (tsubst_template_decl): >> >> gcc/testsuite/ChangeLog: >> >> * g++.dg/modules/pr104234.C: New test. >> >> Signed-off-by: Nathaniel Shead >> --- >> gcc/cp/pt.cc | 2 ++ >> gcc/testsuite/g++.dg/modules/pr104234.C | 16 ++++++++++++++++ >> 2 files changed, 18 insertions(+) >> create mode 100644 gcc/testsuite/g++.dg/modules/pr104234.C >> >> diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc >> index ed681afb5d4..5e10a523e1a 100644 >> --- a/gcc/cp/pt.cc >> +++ b/gcc/cp/pt.cc >> @@ -14789,6 +14789,8 @@ tsubst_template_decl (tree t, tree args, tsubst_flags_t complain, >> if (PRIMARY_TEMPLATE_P (t)) >> DECL_PRIMARY_TEMPLATE (r) = r; >> >> + DECL_UNINSTANTIATED_TEMPLATE_FRIEND_P (r) = false; >> + >> if (!lambda_fntype && !class_p) >> { >> /* Record this non-type partial instantiation. */ >> diff --git a/gcc/testsuite/g++.dg/modules/pr104234.C b/gcc/testsuite/g++.dg/modules/pr104234.C >> new file mode 100644 >> index 00000000000..d81f0d435bc >> --- /dev/null >> +++ b/gcc/testsuite/g++.dg/modules/pr104234.C >> @@ -0,0 +1,16 @@ >> +// PR c++/104234 >> +// { dg-additional-options "-fmodules-ts" } >> + >> +template struct _Node_handle_common { >> + template friend class _Rb_tree; >> +}; >> +struct _Hashtable { >> + using node_type = _Node_handle_common; >> + node_type __trans_tmp_1; >> +}; >> +template class _Rb_tree { >> + struct _Rb_tree_impl { >> + _Rb_tree_impl(); >> + } _M_impl; >> +}; >> +_Rb_tree _M_tmap_; >> -- >> 2.42.0 >> >