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

re PR c++/43076 (ICE: SIGSEGV with invalid C++ code after giving diagnostics)

Browse source 
PR c++/43076
	* pt.c (push_template_decl_real): Deal better with running out of
	scopes before running out of template parms.

From-SVN: r157842
This commit is contained in:
Jason Merrill 2010-03-30 18:34:02 -04:00 • committed by Jason Merrill
parent fb07795554
commit 745370784f
4 changed files with 19 additions and 0 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 @@
2010-03-30 Jason Merrill <jason@redhat.com>
PR c++/43076
* pt.c (push_template_decl_real): Deal better with running out of
scopes before running out of template parms.
PR c++/41185
PR c++/41786
* parser.c (cp_parser_direct_declarator): Don't allow VLAs in

3
gcc/cp/pt.c
View file

@ -4548,6 +4548,9 @@ push_template_decl_real (tree decl, bool is_friend)
if (current == decl)
current = ctx;
else if (current == NULL_TREE)
/* Can happen in erroneous input. */
break;
else
current = (TYPE_P (current)
? TYPE_CONTEXT (current)

3
gcc/testsuite/ChangeLog
View file

@ -1,5 +1,8 @@
2010-03-30 Jason Merrill <jason@redhat.com>
PR c++/43076
* g++.dg/template/error-recovery1.C: New.
PR c++/41786
* g++.dg/parse/ambig5.C: New.

9
gcc/testsuite/g++.dg/template/error-recovery1.C Normal file
View file

@ -0,0 +1,9 @@
// PR c++/43076
struct S;
template < typename > struct T
{
template < typename >
template < bool > struct T < S > // { dg-error "" }
{
void f () { // { dg-error "" }