OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

PR c++/51476 - ICE on PTRMEM_CST as template argument in c++11

Browse Source 
gcc/cp/

	PR c++/51476
	* pt.c (convert_nontype_argument): Don't call maybe_constant_value
	for PTRMEM_CST nodes.

gcc/testsuite/

	PR c++/51476
	* g++.dg/cpp0x/ptrmem-cst-arg1.C: New test.

From-SVN: r182324
This commit is contained in:
Dodji Seketeli 2011-12-14 08:46:13 +00:00 committed by Dodji Seketeli
parent 58fc93fb00
commit 56f05abd0f
4 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/cp/ChangeLog
View File

@ -1,3 +1,9 @@
2011-12-14 Dodji Seketeli <dodji@redhat.com>
PR c++/51476
* pt.c (convert_nontype_argument): Don't call maybe_constant_value
for PTRMEM_CST nodes.
2011-12-13 Jason Merrill <jason@redhat.com>
PR c++/51406

10
gcc/cp/pt.c
View File

@ -5720,11 +5720,15 @@ 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 (TREE_CODE (expr) == PTRMEM_CST)
/* 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
CONSTRUCTOR. */;
else if (INTEGRAL_OR_ENUMERATION_TYPE_P (type))
expr = maybe_constant_value (expr);
else if (TYPE_PTR_P (type)
|| (TYPE_PTR_TO_MEMBER_P (type)
&& TREE_CODE (expr) != PTRMEM_CST))
|| TYPE_PTR_TO_MEMBER_P (type))
{
tree folded = maybe_constant_value (expr);
if (TYPE_PTR_P (type) ? integer_zerop (folded)

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2011-12-14 Dodji Seketeli <dodji@redhat.com>
PR c++/51476
* g++.dg/cpp0x/ptrmem-cst-arg1.C: New test.
2011-12-13 Jason Merrill <jason@redhat.com>
PR c++/51406

9
gcc/testsuite/g++.dg/cpp0x/ptrmem-cst-arg1.C Normal file
View File

@ -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" }
};