git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

re PR c++/51430 (ICE with array as static const member) 

PR c++/51430
	* pt.c (tsubst_decl): Don't call strip_array_domain on
	error_mark_node.

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

From-SVN: r182063
This commit is contained in:
Jakub Jelinek 2011-12-06 20:52:39 +01:00 committed by Jakub Jelinek
parent 70d63e4883
commit 0e642d0671
4 changed files with 23 additions and 1 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-06 Jakub Jelinek <jakub@redhat.com>
PR c++/51430
* pt.c (tsubst_decl): Don't call strip_array_domain on
error_mark_node.
2011-12-06 Paolo Carlini <paolo.carlini@oracle.com> 2011-12-06 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/51431 PR c++/51431

4
gcc/cp/pt.c
View File

@ -10622,7 +10622,9 @@ tsubst_decl (tree t, tree args, tsubst_flags_t complain)
type = DECL_ORIGINAL_TYPE (t); type = DECL_ORIGINAL_TYPE (t);
else else
type = TREE_TYPE (t); type = TREE_TYPE (t);
if (TREE_CODE (t) == VAR_DECL && VAR_HAD_UNKNOWN_BOUND (t)) if (TREE_CODE (t) == VAR_DECL
&& VAR_HAD_UNKNOWN_BOUND (t)
&& type != error_mark_node)
type = strip_array_domain (type); type = strip_array_domain (type);
type = tsubst (type, args, complain, in_decl); type = tsubst (type, args, complain, in_decl);
} }

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2011-12-06 Jakub Jelinek <jakub@redhat.com>
PR c++/51430
* g++.dg/template/static32.C: New test.
2011-12-06 Uros Bizjak <ubizjak@gmail.com> 2011-12-06 Uros Bizjak <ubizjak@gmail.com>
* g++.dg/opt/pr51396.C: Use dg-additional-options. * g++.dg/opt/pr51396.C: Use dg-additional-options.

9
gcc/testsuite/g++.dg/template/static32.C Normal file
View File

@ -0,0 +1,9 @@
// PR c++/51430
// { dg-do compile }
template<int> struct A
{
static const int x[] = 0; // { dg-error "in-class initialization|initializer fails" }
};
A<0> a;