@@ -6775,7 +6775,7 @@ convert_nontype_argument (tree type, tree expr, tsubst_flags_t complain)
to a null value, but otherwise still need to be of a specific form. */
if (cxx_dialect >= cxx11)
{
- if (TREE_CODE (expr) == PTRMEM_CST)
+ if (TREE_CODE (expr) == PTRMEM_CST && TYPE_PTRMEM_P (type))
/* A PTRMEM_CST is already constant, and a valid template
argument for a parameter of pointer to member type, we just want
to leave it in that form rather than lower it to a
@@ -5,5 +5,5 @@ template<int> struct A {};
struct B
{
int i;
- A<&B::i> a; // { dg-error "could not convert template argument" }
+ A<&B::i> a; // { dg-error "could not convert" }
};
new file mode 100644
@@ -0,0 +1,6 @@
+// PR c++/88196
+// { dg-do compile { target c++2a } }
+
+struct C { C *c; };
+template <C> struct D;
+D <&C::c> d; // { dg-error "could not convert" }
@@ -5,17 +5,17 @@ template <int> struct A {};
template <typename T, T *> struct B {};
template <typename D> struct C
{
- A<0> c0; B<A<0>, &C::c0> d0; // { dg-error "could not convert template argument" }
- A<0> c1; B<A<0>, &C::c1> d1; // { dg-error "could not convert template argument" }
- A<0> c2; B<A<0>, &C::c2> d2; // { dg-error "could not convert template argument" }
- A<0> c3; B<A<0>, &C::c3> d3; // { dg-error "could not convert template argument" }
- A<0> c4; B<A<0>, &C::c4> d4; // { dg-error "could not convert template argument" }
- A<0> c5; B<A<0>, &C::c5> d5; // { dg-error "could not convert template argument" }
- A<0> c6; B<A<0>, &C::c6> d6; // { dg-error "could not convert template argument" }
- A<0> c7; B<A<0>, &C::c7> d7; // { dg-error "could not convert template argument" }
- A<0> c8; B<A<0>, &C::c8> d8; // { dg-error "could not convert template argument" }
- A<0> c9; B<A<0>, &C::c9> d9; // { dg-error "could not convert template argument" }
- A<0> ca; B<A<0>, &C::ca> da; // { dg-error "could not convert template argument" }
- A<0> cb; B<A<0>, &C::cb> db; // { dg-error "could not convert template argument" }
+ A<0> c0; B<A<0>, &C::c0> d0; // { dg-error "could not convert" }
+ A<0> c1; B<A<0>, &C::c1> d1; // { dg-error "could not convert" }
+ A<0> c2; B<A<0>, &C::c2> d2; // { dg-error "could not convert" }
+ A<0> c3; B<A<0>, &C::c3> d3; // { dg-error "could not convert" }
+ A<0> c4; B<A<0>, &C::c4> d4; // { dg-error "could not convert" }
+ A<0> c5; B<A<0>, &C::c5> d5; // { dg-error "could not convert" }
+ A<0> c6; B<A<0>, &C::c6> d6; // { dg-error "could not convert" }
+ A<0> c7; B<A<0>, &C::c7> d7; // { dg-error "could not convert" }
+ A<0> c8; B<A<0>, &C::c8> d8; // { dg-error "could not convert" }
+ A<0> c9; B<A<0>, &C::c9> d9; // { dg-error "could not convert" }
+ A<0> ca; B<A<0>, &C::ca> da; // { dg-error "could not convert" }
+ A<0> cb; B<A<0>, &C::cb> db; // { dg-error "could not convert" }
};
C<int> e;