From: Jason Merrill <jason@redhat.com>
To: Patrick Palka <ppalka@redhat.com>, GCC Patches <gcc-patches@gcc.gnu.org>
Subject: Re: [PATCH] c++: CTAD for class tmpl defined inside partial spec [PR104294]
Date: Mon, 31 Jan 2022 15:20:28 -0500 [thread overview]
Message-ID: <2fbeb0d0-d0ce-5902-bae2-757979641db5@redhat.com> (raw)
In-Reply-To: <CAMOnLZbxbuxM985hAT5ogvFHKgZRLK+93q_ROQfc2RNx1uLcUQ@mail.gmail.com>
On 1/31/22 11:14, Patrick Palka wrote:
> On Mon, Jan 31, 2022 at 11:07 AM Patrick Palka <ppalka@redhat.com> wrote:
>>
>> Here during deduction guide generation for the nested class template
>> B<char(int)>::C, the computation of outer_targs yields the template
>> arguments relative to the primary template for B (i.e. {char(int)})
>> but what we really what is those relative to the enclosing scope, the
>> partial specialization of B (i.e. {char, int}).
>>
>> Bootstrapped and regtested on x86_64-pc-linux-gnu, does this look OK for
>> trunk?
>>
>> PR c++/104294
>>
>> gcc/cp/ChangeLog:
>>
>> * pt.cc (ctor_deduction_guides_for): Correct computation of
>> outer_targs.
>>
>> gcc/testsuite/ChangeLog:
>>
>> * g++.dg/cpp1z/class-deduction106.C: New test.
>> ---
>> gcc/cp/pt.cc | 4 +++-
>> .../g++.dg/cpp1z/class-deduction106.C | 19 +++++++++++++++++++
>> 2 files changed, 22 insertions(+), 1 deletion(-)
>> create mode 100644 gcc/testsuite/g++.dg/cpp1z/class-deduction106.C
>>
>> diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc
>> index f46a7ad6655..0fe0ad4e44e 100644
>> --- a/gcc/cp/pt.cc
>> +++ b/gcc/cp/pt.cc
>> @@ -29568,7 +29568,9 @@ ctor_deduction_guides_for (tree tmpl, tsubst_flags_t complain)
>> if (DECL_CLASS_SCOPE_P (tmpl)
>> && CLASSTYPE_TEMPLATE_INSTANTIATION (DECL_CONTEXT (tmpl)))
>> {
>> - outer_args = CLASSTYPE_TI_ARGS (DECL_CONTEXT (tmpl));
>> + outer_args = copy_node (CLASSTYPE_TI_ARGS (type));
>> + gcc_assert (TMPL_ARGS_HAVE_MULTIPLE_LEVELS (outer_args));
>
> Whoops, this assert should be slightly stronger: TMPL_ARGS_DEPTH
> (outer_args) > 1. Consider that fixed (pending another
> bootstrap/regtest cycle).
OK.
>> + --TREE_VEC_LENGTH (outer_args);
>> type = TREE_TYPE (most_general_template (tmpl));
>> }
>>
>> diff --git a/gcc/testsuite/g++.dg/cpp1z/class-deduction106.C b/gcc/testsuite/g++.dg/cpp1z/class-deduction106.C
>> new file mode 100644
>> index 00000000000..382f6b70ef5
>> --- /dev/null
>> +++ b/gcc/testsuite/g++.dg/cpp1z/class-deduction106.C
>> @@ -0,0 +1,19 @@
>> +// PR c++/104294
>> +// { dg-do compile { target c++17 } }
>> +
>> +template<class>
>> +struct B;
>> +
>> +template <class R, class... Args>
>> +struct B<R(Args...)> {
>> + template<class T>
>> + struct C { C(T); };
>> +
>> + C(decltype(nullptr)) -> C<void*>;
>> +};
>> +
>> +using ty1 = decltype(B<char(int)>::C{0});
>> +using ty1 = B<char(int)>::C<int>;
>> +
>> +using ty2 = decltype(B<char(int)>::C{nullptr});
>> +using ty2 = B<char(int)>::C<void*>;
>> --
>> 2.35.0
>>
>
prev parent reply other threads:[~2022-01-31 20:20 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-31 16:07 Patrick Palka
2022-01-31 16:14 ` Patrick Palka
2022-01-31 20:20 ` Jason Merrill [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2fbeb0d0-d0ce-5902-bae2-757979641db5@redhat.com \
--to=jason@redhat.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=ppalka@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).