Message ID | m3ty545v3a.fsf@redhat.com |
---|---|
State | New |
Headers | show |
On 12/13/2011 10:50 AM, Dodji Seketeli wrote: > - if (INTEGRAL_OR_ENUMERATION_TYPE_P (type)) > + if (INTEGRAL_OR_ENUMERATION_TYPE_P (type) > + && TREE_CODE (expr) != PTRMEM_CST) > expr = maybe_constant_value (expr); > else if (TYPE_PTR_P (type) > || (TYPE_PTR_TO_MEMBER_P (type) This could still break for a parameter of object pointer type. Let's check for PTRMEM_CST separately, before any of the other tests. Jason
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index bb5aa0c..8c9f97b 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -5720,7 +5720,8 @@ 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 >= cxx0x) { - if (INTEGRAL_OR_ENUMERATION_TYPE_P (type)) + if (INTEGRAL_OR_ENUMERATION_TYPE_P (type) + && TREE_CODE (expr) != PTRMEM_CST) expr = maybe_constant_value (expr); else if (TYPE_PTR_P (type) || (TYPE_PTR_TO_MEMBER_P (type) diff --git a/gcc/testsuite/g++.dg/cpp0x/ptrmem-cst-arg1.C b/gcc/testsuite/g++.dg/cpp0x/ptrmem-cst-arg1.C new file mode 100644 index 0000000..b6c81d5 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/ptrmem-cst-arg1.C @@ -0,0 +1,9 @@ +// Origin PR c++/51476 +// { dg-options "-std=c++11" } + +template<int> struct A {}; +struct B +{ + int i; + A<&B::i> a; // { dg-error "could not convert template argument" } +};