2
0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-13 15:01:21 +08:00

re PR c++/28879 (ICE with VLA in template function)

PR c++/28879
	* tree.c (build_cplus_array_type_1): Don't pass any VLA types
	when processing_template_decl to build_array_type.

	* g++.dg/template/vla2.C: New test.

From-SVN: r130309
This commit is contained in:
Jakub Jelinek 2007-11-20 07:38:48 +01:00 committed by Jakub Jelinek
parent 63d34078b6
commit 6da06848ec
4 changed files with 31 additions and 4 deletions
gcc
cp
testsuite
ChangeLog
g++.dg/template

@ -1,5 +1,9 @@
2007-11-20 Jakub Jelinek <jakub@redhat.com>
PR c++/28879
* tree.c (build_cplus_array_type_1): Don't pass any VLA types
when processing_template_decl to build_array_type.
PR c++/33962
* pt.c (more_specialized_fn): Don't segfault if one or
both argument list end with ellipsis.

@ -529,9 +529,9 @@ build_cplus_array_type_1 (tree elt_type, tree index_type)
if (elt_type == error_mark_node || index_type == error_mark_node)
return error_mark_node;
if (dependent_type_p (elt_type)
|| (index_type
&& value_dependent_expression_p (TYPE_MAX_VALUE (index_type))))
if (processing_template_decl
&& (dependent_type_p (elt_type)
|| (index_type && !TREE_CONSTANT (TYPE_MAX_VALUE (index_type)))))
{
void **e;
cplus_array_info cai;
@ -570,7 +570,7 @@ build_cplus_array_type_1 (tree elt_type, tree index_type)
TYPE_CANONICAL (t)
= build_cplus_array_type
(TYPE_CANONICAL (elt_type),
index_type? TYPE_CANONICAL (index_type) : index_type);
index_type ? TYPE_CANONICAL (index_type) : index_type);
else
TYPE_CANONICAL (t) = t;
}

@ -1,5 +1,8 @@
2007-11-20 Jakub Jelinek <jakub@redhat.com>
PR c++/28879
* g++.dg/template/vla2.C: New test.
PR c++/33962
* g++.dg/overload/template3.C: New test.

@ -0,0 +1,20 @@
// PR c++/28879
// { dg-do compile }
// { dg-options "" }
struct A
{
static int i;
int j;
};
template<int> void foo ()
{
int x[A::i];
//int y[A().j];
}
void bar ()
{
foo<6> ();
}