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): Don't crash on non-pointer
	argument to pointer parameter.

From-SVN: r170782
This commit is contained in:
Jason Merrill 2011-03-08 12:30:36 -05:00 • committed by Jason Merrill
parent 2c86a82aa4
commit 8c0672ff88
4 changed files with 27 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gcc/cp/ChangeLog
View file

@ -1,5 +1,9 @@
2011-03-08 Jason Merrill <jason@redhat.com>
PR c++/47705
* pt.c (convert_nontype_argument): Don't crash on non-pointer
argument to pointer parameter.
PR c++/45651
* pt.c (instantiate_decl): Don't clear DECL_INTERFACE_KNOWN on
!TREE_PUBLIC decls.

23
gcc/cp/pt.c
View file

@ -5369,15 +5369,20 @@ convert_nontype_argument (tree type, tree expr, tsubst_flags_t complain)
qualification conversion. Let's strip everything. */
else if (TYPE_PTROBV_P (type))
{
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);
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);
}
}
}

2
gcc/testsuite/ChangeLog
View file

@ -1,5 +1,7 @@
2011-03-08 Jason Merrill <jason@redhat.com>
* g++.dg/template/nontype21.C: New.
* g++.dg/template/anon5.C: New.
2011-03-08 Jakub Jelinek <jakub@redhat.com>

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

@ -0,0 +1,7 @@
// PR c++/47705
template<char const * const x> class Something { };
extern char const xyz;
class SomethingElse:public Something<xyz> { }; // { dg-error "const char *" }