diff options
| author | Jason Merrill <jason@redhat.com> | 2019-02-21 21:08:05 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2019-02-21 21:08:05 -0500 |
| commit | c8b7e64d363069c6682bdeb51ba397e8bd4a4f9e (patch) | |
| tree | a9da6338120e570e260212e3e5db836d65e130bc | |
| parent | 148864cb8c972b4c87e2e6a3183a83047666edcb (diff) | |
| download | gcc-c8b7e64d363069c6682bdeb51ba397e8bd4a4f9e.zip gcc-c8b7e64d363069c6682bdeb51ba397e8bd4a4f9e.tar.gz gcc-c8b7e64d363069c6682bdeb51ba397e8bd4a4f9e.tar.bz2 | |
PR c++/88869 - C++17 ICE with CTAD and explicit specialization.
The members of an explicit specialization of a class template don't have the
template parameters of that class template, so we shouldn't try to provide
arguments for them. Only set outer_args when the class is an instantiation.
* pt.c (do_class_deduction): Don't include explicit specialization
args in outer_args.
From-SVN: r269093
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp1z/class-deduction63.C | 11 |
3 files changed, 16 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 2f99f2b..013bca5 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2019-02-21 Jason Merrill <jason@redhat.com> + PR c++/88869 - C++17 ICE with CTAD and explicit specialization. + * pt.c (do_class_deduction): Don't include explicit specialization + args in outer_args. + PR c++/89422 - ICE with -g and lambda in default arg in template. * pt.c (tsubst_function_decl): SET_DECL_FRIEND_CONTEXT sooner. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 76fb625..42dd095 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -27224,7 +27224,7 @@ do_class_deduction (tree ptype, tree tmpl, tree init, int flags, tree outer_args = NULL_TREE; if (DECL_CLASS_SCOPE_P (tmpl) - && CLASSTYPE_TEMPLATE_INFO (DECL_CONTEXT (tmpl))) + && CLASSTYPE_TEMPLATE_INSTANTIATION (DECL_CONTEXT (tmpl))) { outer_args = CLASSTYPE_TI_ARGS (DECL_CONTEXT (tmpl)); type = TREE_TYPE (most_general_template (tmpl)); diff --git a/gcc/testsuite/g++.dg/cpp1z/class-deduction63.C b/gcc/testsuite/g++.dg/cpp1z/class-deduction63.C new file mode 100644 index 0000000..4fc66fc --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1z/class-deduction63.C @@ -0,0 +1,11 @@ +// PR c++/88869 +// { dg-do compile { target c++17 } } + +template <typename> struct B; +template <> struct B<int> { + template <typename T> struct C { + T e; + C (T f) : e(f) {} + }; + void foo () { C c (42); } +}; |