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.129.124]) by sourceware.org (Postfix) with ESMTPS id 3445A3858CD1 for ; Fri, 14 Jul 2023 22:24:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3445A3858CD1 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=1689373473; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xStH3sNsrZ0Vc/OvtXRyrauC+iExOhHPDviIjjHzpMU=; b=ENVb1mDvoaOIKdb82aYnHqsb5Z0h6Gabf/sOVs3CM0CjTORxyw1NyMNp6SDbxLGKc02UOB fratcZDSqychYTIcfoz7ZuKlJ9x6OE99DcJYR+hTYnx1/8YhXhFLy8BhZ0upNdg7gTTcda yK+jzZirF0G9DR4jSuz1U5t/JXfdS9Q= 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-541-ORKrFStXPkuK_AEh3a8uxw-1; Fri, 14 Jul 2023 18:24:32 -0400 X-MC-Unique: ORKrFStXPkuK_AEh3a8uxw-1 Received: by mail-qv1-f69.google.com with SMTP id 6a1803df08f44-635f12395b5so23100916d6.3 for ; Fri, 14 Jul 2023 15:24:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689373472; x=1691965472; h=content-transfer-encoding:in-reply-to:from:references: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=xStH3sNsrZ0Vc/OvtXRyrauC+iExOhHPDviIjjHzpMU=; b=IsIeEMSzSu54NEKy1FUk3mHrpfOwtWFqsuoOI+D3u4xNFIkFq8p2mauT39c6UKhQTO LDPZpmMTIaAC/1sRh1CK6ur1gL9HAQXrNSfaBkjoGoEZGfrU6/7C+YqHU4F5AkFz1mr6 O6j0NLGCc266wNU2vGliDceLr/yPCcu9/bQdongEgLwSpuF6Z5nuZw4ZEqPdAiy9PN4n gNk98AAOanTGSCSfZigfJ46/ZWbjqLMG+l5uYy9pN+I8yA9LDuFt1DGudBdjPivh8C0S BMR4MP8F1S4elIq/KlfAjMITuInEeKfz2YgXq41m+6L5/RzY0r0k9bueRHaej0BETQDx Xr/g== X-Gm-Message-State: ABy/qLZb37tTUBMc4Bbz66dBWuRSRektFxPWsvXbFz1ygQQo2l1jNQJP BqhBegHU1JtLCo7M4HHMoRkOYRzU89Dyye87Fmz+sEv8pQL+G/fEVE+P81DHPXEzZBs8WMCY4rD n69I2iMQvUs1nAbyRdA== X-Received: by 2002:a0c:c981:0:b0:635:e242:e4bb with SMTP id b1-20020a0cc981000000b00635e242e4bbmr5380709qvk.59.1689373472013; Fri, 14 Jul 2023 15:24:32 -0700 (PDT) X-Google-Smtp-Source: APBJJlG0pYrTXCzSTX5V6xtUssY4Ga6YU74NzXwz1XuU5yZIssYqTB3W5u/z3lI6ugM0avQLidtxlQ== X-Received: by 2002:a0c:c981:0:b0:635:e242:e4bb with SMTP id b1-20020a0cc981000000b00635e242e4bbmr5380703qvk.59.1689373471764; Fri, 14 Jul 2023 15:24:31 -0700 (PDT) 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 r4-20020a0ce284000000b00637abbfaac9sm4308883qvl.98.2023.07.14.15.24.30 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 14 Jul 2023 15:24:31 -0700 (PDT) Message-ID: <50e83bb2-ca98-fd31-09f4-4c0e41feaf0a@redhat.com> Date: Fri, 14 Jul 2023 18:24:30 -0400 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Subject: Re: [PATCH] c++: mangling template-id of unknown template [PR110524] To: Patrick Palka , gcc-patches@gcc.gnu.org References: <20230713132017.3289546-1-ppalka@redhat.com> From: Jason Merrill In-Reply-To: <20230713132017.3289546-1-ppalka@redhat.com> 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: 7bit X-Spam-Status: No, score=-12.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,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 7/13/23 09:20, Patrick Palka wrote: > Bootstrapped and regtested on x86_64-pc-linux-gnu, does this look OK > for trunk and perhaps 13? OK for both. > -- >8 -- > > This fixes a crash when mangling an ADL-enabled call to a template-id > naming an unknown template (as per P0846R0). > > PR c++/110524 > > gcc/cp/ChangeLog: > > * mangle.cc (write_expression): Handle TEMPLATE_ID_EXPR > whose template is already an IDENTIFIER_NODE. > > gcc/testsuite/ChangeLog: > > * g++.dg/cpp2a/fn-template26.C: New test. > --- > gcc/cp/mangle.cc | 3 ++- > gcc/testsuite/g++.dg/cpp2a/fn-template26.C | 16 ++++++++++++++++ > 2 files changed, 18 insertions(+), 1 deletion(-) > create mode 100644 gcc/testsuite/g++.dg/cpp2a/fn-template26.C > > diff --git a/gcc/cp/mangle.cc b/gcc/cp/mangle.cc > index 7dab4e62bc9..bef0fda6d22 100644 > --- a/gcc/cp/mangle.cc > +++ b/gcc/cp/mangle.cc > @@ -3312,7 +3312,8 @@ write_expression (tree expr) > else if (TREE_CODE (expr) == TEMPLATE_ID_EXPR) > { > tree fn = TREE_OPERAND (expr, 0); > - fn = OVL_NAME (fn); > + if (!identifier_p (fn)) > + fn = OVL_NAME (fn); > if (IDENTIFIER_ANY_OP_P (fn)) > write_string ("on"); > write_unqualified_id (fn); > diff --git a/gcc/testsuite/g++.dg/cpp2a/fn-template26.C b/gcc/testsuite/g++.dg/cpp2a/fn-template26.C > new file mode 100644 > index 00000000000..d4a17eb9bd1 > --- /dev/null > +++ b/gcc/testsuite/g++.dg/cpp2a/fn-template26.C > @@ -0,0 +1,16 @@ > +// PR c++/110524 > +// { dg-do compile { target c++20 } } > + > +template > +auto f(T t) -> decltype(g(t)); > + > +namespace N { > + struct A { }; > + template void g(T); > +}; > + > +int main() { > + f(N::A{}); > +} > + > +// { dg-final { scan-assembler "_Z1fIN1N1AEEDTcl1gIT_Efp_EES2_" } }