diff options
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp2a/nontype-class21.C | 10 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp2a/nontype-class22.C | 21 |
4 files changed, 38 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index cef36b2..c1fc980 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2019-07-19 Jason Merrill <jason@redhat.com> + + PR c++/90101 - dependent class non-type parameter. + * pt.c (invalid_nontype_parm_type_p): Check for dependent class type. + 2019-07-18 Jason Merrill <jason@redhat.com> PR c++/90098 - partial specialization and class non-type parms. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 53aaad1..e433413 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -25228,6 +25228,8 @@ invalid_nontype_parm_type_p (tree type, tsubst_flags_t complain) "with %<-std=c++2a%> or %<-std=gnu++2a%>"); return true; } + if (dependent_type_p (type)) + return false; if (!complete_type_or_else (type, NULL_TREE)) return true; if (!literal_type_p (type)) diff --git a/gcc/testsuite/g++.dg/cpp2a/nontype-class21.C b/gcc/testsuite/g++.dg/cpp2a/nontype-class21.C new file mode 100644 index 0000000..c58fe05 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp2a/nontype-class21.C @@ -0,0 +1,10 @@ +// PR c++/90101 +// { dg-do compile { target c++2a } } + +template<int N> +struct A{}; + +template<int N, A<N>> +struct B {}; + +B<2,A<2>{}> b; diff --git a/gcc/testsuite/g++.dg/cpp2a/nontype-class22.C b/gcc/testsuite/g++.dg/cpp2a/nontype-class22.C new file mode 100644 index 0000000..026855f --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp2a/nontype-class22.C @@ -0,0 +1,21 @@ +// PR c++/90100 +// { dg-do compile { target c++2a } } + +template<typename T> +inline constexpr bool is_nontype_list = false; + +template<template<auto...> typename T, auto... NonTypes> +inline constexpr bool is_nontype_list<T<NonTypes...>> = true; + +// works +template<auto...> +struct A {}; + +static_assert(is_nontype_list<A<1, 2, 3>>); + +// fails +struct X { + int v; +}; + +static_assert(is_nontype_list<A<X{1}, X{2}, X{3}>>); |