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 79A8F387544C for ; Wed, 22 Nov 2023 18:13:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 79A8F387544C 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 79A8F387544C 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=1700676801; cv=none; b=Mirvmvq6Rvz/6rkoZ9PIe2gIAccqIh+6K9fuE4oMf3OydHd1otX5e5aWDJx1Qex9er1N9YnjyLq8+Xcr6jB5UC/vr/tK4J5//1cBjzNSQ1euYkLdPYaavv4E/IqG/ZrMkrH6QhnGTRmwutrH8n11i2e4wx88FTj3aUIex8Be3js= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700676801; c=relaxed/simple; bh=DLzYgPlGdz7fdaMRbY9Fmji7tgoaoAg9vDHl3B0n/Tg=; h=DKIM-Signature:Message-ID:Date:MIME-Version:Subject:To:From; b=YNshcWdADPHvRNAw3YbKc58eVZd7K39DjjlhW0THIDzZAkEhCio4wdP+CMvgesfETJ9YldKTZcSRvAest/lWF0LWucyJv2rXpNkjUqVPk2dQ1WxPPrgC5Mpa+gbqgzPY9zfThR7pm4woUOIpqpr7XrGhrKllv6glS53hC6vFpCc= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700676791; 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=dbMhK0lCv+Qp0pak4biL/9nSswr/5lMTg+dztr0UhYs=; b=N13fm716vrNGEeTCneJkxeKZwCMCCkjfK4RJxkvUyiDulP8edK7hRWcpzshTeuUGHwjVuD KiF7eLxPMy0w7zeIZfXvbREjSRg7CsNa3jB/4C3v25CkyjwjFexApUBVnkvvLQKnEZrnOB 74rXT6xGdWDCghzcDLI52TgC+HIFry8= Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-148-gMa6vOCiPtWGiey9oHuHyQ-1; Wed, 22 Nov 2023 13:13:09 -0500 X-MC-Unique: gMa6vOCiPtWGiey9oHuHyQ-1 Received: by mail-qv1-f71.google.com with SMTP id 6a1803df08f44-66d155fc53eso1011456d6.1 for ; Wed, 22 Nov 2023 10:13:09 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700676789; x=1701281589; 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=dbMhK0lCv+Qp0pak4biL/9nSswr/5lMTg+dztr0UhYs=; b=F1H2f17WlLzunxra8cyKDPfuX5IaIUuBWD/3l7agPI5TwJp67lD3QEswk+lo6dssb/ 0vXc1xwd1pTtEnqljoqjkc74eT9Ys/QY42kzluBJ1xFvHaOB6Ov3a/fmzu5wvNhaKVBN qexOkE55GHyAUyiXVXDIYFk0F3chajevpkncs59phmbgOxqBcDWIYNTx+R/krHK5A7zP zx9IefD2zIEAXC4Nu28fC/GRswEN6T3i5kryXp6sUBTdFmD2guaQ6c81TX67bzr8rqIl NfSD8v0F1u4XCkt1dr0JTggLAhgM5pV36REUfMtjwgSXvLeZWUmv9w6ER4rhMZNqmOlW TNKQ== X-Gm-Message-State: AOJu0YwXwLdeV6oVUo27Le7Qj0nizAqQuGSJstLlSVzik8e4x074A4in r00rQXRHYq3kvH0KKnORrQdNcjwIMxxGI26tmuVxYn5xh6m0Vfz8IklcV607QQ+mSgWpClNWoX9 hlCv1sk1PWAXpR6KtGA== X-Received: by 2002:a05:6214:5084:b0:675:5059:2ed4 with SMTP id kk4-20020a056214508400b0067550592ed4mr2931154qvb.5.1700676789263; Wed, 22 Nov 2023 10:13:09 -0800 (PST) X-Google-Smtp-Source: AGHT+IE2VQpDQYuLYfEjVcLa8OSIKkP9vt1zi4eelucFdBbihe1ZjMspAsE4/zAtEhv7Rnr15LiI0g== X-Received: by 2002:a05:6214:5084:b0:675:5059:2ed4 with SMTP id kk4-20020a056214508400b0067550592ed4mr2931139qvb.5.1700676788870; Wed, 22 Nov 2023 10:13:08 -0800 (PST) Received: from [192.168.1.145] (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 ox21-20020a05620a829500b00767d4a3f4d9sm60690qkn.29.2023.11.22.10.13.07 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 22 Nov 2023 10:13:07 -0800 (PST) Message-ID: <42641f46-f54f-45c7-9df1-c739137ada46@redhat.com> Date: Wed, 22 Nov 2023 13:13:07 -0500 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] c++: alias template of non-template class [PR112633] To: Patrick Palka , gcc-patches@gcc.gnu.org References: <20231122172657.542419-1-ppalka@redhat.com> From: Jason Merrill In-Reply-To: <20231122172657.542419-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.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_H3,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 11/22/23 12:26, Patrick Palka wrote: > Bootstrapped and regtested on x86-64-pc-linux-gnu, does this look OK for > trunk/13? OK. > -- >8 -- > > The entering_scope adjustment in tsubst_aggr_type assumes if an alias is > dependent, then so is the aliased type (and therefore it has template info) > but that's not true for the dependent alias template specialization ty1 > below which aliases the non-template class A. > > PR c++/112633 > > gcc/cp/ChangeLog: > > * pt.cc (tsubst_aggr_type): Handle empty TYPE_TEMPLATE_INFO > in the entering_scope adjustment. > > gcc/testsuite/ChangeLog: > > * g++.dg/cpp0x/alias-decl-75.C: New test. > --- > gcc/cp/pt.cc | 1 + > gcc/testsuite/g++.dg/cpp0x/alias-decl-75.C | 13 +++++++++++++ > 2 files changed, 14 insertions(+) > create mode 100644 gcc/testsuite/g++.dg/cpp0x/alias-decl-75.C > > diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc > index ed681afb5d4..68ce4a87372 100644 > --- a/gcc/cp/pt.cc > +++ b/gcc/cp/pt.cc > @@ -13976,6 +13976,7 @@ tsubst_aggr_type (tree t, > if (entering_scope > && CLASS_TYPE_P (t) > && dependent_type_p (t) > + && TYPE_TEMPLATE_INFO (t) > && TYPE_CANONICAL (t) == TREE_TYPE (TYPE_TI_TEMPLATE (t))) > t = TYPE_CANONICAL (t); > > diff --git a/gcc/testsuite/g++.dg/cpp0x/alias-decl-75.C b/gcc/testsuite/g++.dg/cpp0x/alias-decl-75.C > new file mode 100644 > index 00000000000..1a73a99856e > --- /dev/null > +++ b/gcc/testsuite/g++.dg/cpp0x/alias-decl-75.C > @@ -0,0 +1,13 @@ > +// PR c++/112633 > +// { dg-do compile { target c++11 } } > + > +struct A { using type = void; }; > + > +template > +using ty1 = A; > + > +template > +using ty2 = typename ty1::type; > + > +template > +ty2 f();