procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR c++/47705 (internal compiler error: in convert_nontype_argument, at cp/pt.c:5006)

Browse source 
PR c++/47705
	* pt.c (convert_nontype_argument): Only call decay_conversion on
	arrays.

From-SVN: r170791
This commit is contained in:
Dodji Seketeli 2011-03-08 22:02:59 +00:00 • committed by Jason Merrill
parent ef78aed645
commit 918f238e7f
3 changed files with 18 additions and 16 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-03-08 Dodji Seketeli <dodji@redhat.com>
PR c++/47705
* pt.c (convert_nontype_argument): Only call decay_conversion on
arrays.
2011-03-08 Jason Merrill <jason@redhat.com>
PR c++/47488

26
gcc/cp/pt.c
View file

@ -5314,7 +5314,8 @@ convert_nontype_argument (tree type, tree expr, tsubst_flags_t complain)
/* Add the ADDR_EXPR now for the benefit of
value_dependent_expression_p. */
if (TYPE_PTROBV_P (type))
if (TYPE_PTROBV_P (type)
&& TREE_CODE (TREE_TYPE (expr)) == ARRAY_TYPE)
expr = decay_conversion (expr);
/* If we are in a template, EXPR may be non-dependent, but still
@ -5369,20 +5370,15 @@ convert_nontype_argument (tree type, tree expr, tsubst_flags_t complain)
qualification conversion. Let's strip everything. */
else if (TYPE_PTROBV_P (type))
{
tree sub = expr;
STRIP_NOPS (sub);
if (TREE_CODE (sub) == ADDR_EXPR)
{
gcc_assert (TREE_CODE (TREE_TYPE (sub)) == POINTER_TYPE);
/* Skip the ADDR_EXPR only if it is part of the decay for
an array. Otherwise, it is part of the original argument
in the source code. */
if (TREE_CODE (TREE_TYPE (TREE_OPERAND (sub, 0))) == ARRAY_TYPE)
expr = TREE_OPERAND (sub, 0);
else
expr = sub;
expr_type = TREE_TYPE (expr);
}
STRIP_NOPS (expr);
gcc_assert (TREE_CODE (expr) == ADDR_EXPR);
gcc_assert (TREE_CODE (TREE_TYPE (expr)) == POINTER_TYPE);
/* Skip the ADDR_EXPR only if it is part of the decay for
an array. Otherwise, it is part of the original argument
in the source code. */
if (TREE_CODE (TREE_TYPE (TREE_OPERAND (expr, 0))) == ARRAY_TYPE)
expr = TREE_OPERAND (expr, 0);
expr_type = TREE_TYPE (expr);
}
}

2
gcc/testsuite/g++.dg/template/nontype21.C
View file

@ -4,4 +4,4 @@ template<char const * const x> class Something { };
extern char const xyz;
class SomethingElse:public Something<xyz> { }; // { dg-error "const char *" }
class SomethingElse:public Something<xyz> { }; // { dg-error "xyz. is a variable" }