OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR c++/56534 (ICE Segfault on invalid code in check_elaborated_type_specifier)

Browse Source 
/cp
2013-03-06  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/56534
	* parser.c (cp_parser_elaborated_type_specifier): Don't call
	check_elaborated_type_specifier when TREE_CODE (decl) != TYPE_DECL.
	* decl.c (check_elaborated_type_specifier): Tidy.

/testsuite
2013-03-06  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/56534
	* g++.dg/template/crash115.C: New.

From-SVN: r196513
This commit is contained in:
Paolo Carlini 2013-03-06 23:47:20 +00:00 committed by Paolo Carlini
parent 01a454df84
commit 5fdbceff85
5 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/cp/ChangeLog
View File

@ -1,3 +1,10 @@
2013-03-06 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/56534
* parser.c (cp_parser_elaborated_type_specifier): Don't call
check_elaborated_type_specifier when TREE_CODE (decl) != TYPE_DECL.
* decl.c (check_elaborated_type_specifier): Tidy.
2013-03-06 Jakub Jelinek <jakub@redhat.com>
PR c++/56543

3
gcc/cp/decl.c
View File

@ -11712,9 +11712,6 @@ check_elaborated_type_specifier (enum tag_types tag_code,
{
tree type;
if (decl == error_mark_node)
return error_mark_node;
/* In the case of:
struct S { struct S *p; };

10
gcc/cp/parser.c
View File

@ -14248,12 +14248,14 @@ cp_parser_elaborated_type_specifier (cp_parser* parser,
typename_type,
/*complain=*/tf_error);
/* If the `typename' keyword is in effect and DECL is not a type
decl. Then type is non existant. */
decl, then type is non existent. */
else if (tag_type == typename_type && TREE_CODE (decl) != TYPE_DECL)
type = NULL_TREE;
else
type = check_elaborated_type_specifier (tag_type, decl,
;
else if (TREE_CODE (decl) == TYPE_DECL)
type = check_elaborated_type_specifier (tag_type, decl,
/*allow_template_p=*/true);
else if (decl == error_mark_node)
type = error_mark_node;
}
if (!type)

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2013-03-06 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/56534
* g++.dg/template/crash115.C: New.
2013-03-06 Jakub Jelinek <jakub@redhat.com>
PR tree-optimization/56539

3
gcc/testsuite/g++.dg/template/crash115.C Normal file
View File

@ -0,0 +1,3 @@
// PR c++/56534
template < struct template rebind < > // { dg-error "expected" }