diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/nullptr39.C | 15 |
3 files changed, 21 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 792a42a..0115f68 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2017-08-11 Jason Merrill <jason@redhat.com> + + PR c++/81671 - nullptr_t template parameter + * pt.c (convert_nontype_argument): Fix nullptr_t check. + 2017-08-10 Jason Merrill <jason@redhat.com> PR c++/81359 - Unparsed NSDMI error from SFINAE context. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 0f899b9..bf1f75d 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -6879,7 +6879,7 @@ convert_nontype_argument (tree type, tree expr, tsubst_flags_t complain) } else if (NULLPTR_TYPE_P (type)) { - if (expr != nullptr_node) + if (!NULLPTR_TYPE_P (TREE_TYPE (expr))) { if (complain & tf_error) error ("%qE is not a valid template argument for type %qT " diff --git a/gcc/testsuite/g++.dg/cpp0x/nullptr39.C b/gcc/testsuite/g++.dg/cpp0x/nullptr39.C new file mode 100644 index 0000000..a34a6af --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/nullptr39.C @@ -0,0 +1,15 @@ +// PR c++/81671 +// { dg-do compile { target c++11 } } + +namespace std { typedef decltype(nullptr) nullptr_t; } + +template<class R, class CB> struct Bar +{}; +template<class R> struct Bar<R, std::nullptr_t> +{ + template<std::nullptr_t> struct Bind { constexpr static int const cb = 0; }; +}; +int foo() +{ + return Bar<int, decltype(nullptr)>::Bind<nullptr>::cb; +} |