mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-02-14 20:00:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

re PR c++/10926 (ICE in build_delete when trying to declare template destructor)

Browse Source 
PR c++/10926
	* decl2.c (grokfield): Robustify.

	PR c++/11116
	* parser.c (cp_parser_throw_expression): Determine whether or not
	an assignment-expression is present by doing one-token lookahead.

	PR c++/10926
	* g++.dg/template/error9.C: New test.

	PR c++/11116
	* g++.dg/template/error8.C: New test.

From-SVN: r74664
This commit is contained in:
Mark Mitchell 2003-12-16 02:46:31 +00:00 committed by Mark Mitchell
parent 040fc92803
commit 89f1a6eccc
6 changed files with 47 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/cp/ChangeLog
View File

@ -1,5 +1,12 @@
2003-12-15 Mark Mitchell <mark@codesourcery.com>
PR c++/10926
* decl2.c (grokfield): Robustify.
PR c++/11116
* parser.c (cp_parser_throw_expression): Determine whether or not
an assignment-expression is present by doing one-token lookahead.
PR c++/13269
* parser.c (cp_parser_function_definition_after_declarator): Stop
scanning tokens when reaching EOF.

10
gcc/cp/decl2.c
View File

@ -882,10 +882,8 @@ grokfield (tree declarator, tree declspecs, tree init, tree asmspec_tree,
init = NULL_TREE;
value = grokdeclarator (declarator, declspecs, FIELD, init != 0, &attrlist);
if (! value || value == error_mark_node)
if (! value || error_operand_p (value))
/* friend or constructor went bad. */
return value;
if (TREE_TYPE (value) == error_mark_node)
return error_mark_node;
if (TREE_CODE (value) == TYPE_DECL && init)
@ -981,7 +979,11 @@ grokfield (tree declarator, tree declspecs, tree init, tree asmspec_tree,
if (processing_template_decl
&& (TREE_CODE (value) == VAR_DECL || TREE_CODE (value) == FUNCTION_DECL))
value = push_template_decl (value);
{
value = push_template_decl (value);
if (error_operand_p (value))
return error_mark_node;
}
if (attrlist)
cplus_decl_attributes (&value, attrlist, 0);

18
gcc/cp/parser.c
View File

@ -12784,15 +12784,21 @@ static tree
cp_parser_throw_expression (cp_parser* parser)
{
tree expression;
cp_token* token;
cp_parser_require_keyword (parser, RID_THROW, "`throw'");
/* We can't be sure if there is an assignment-expression or not. */
cp_parser_parse_tentatively (parser);
/* Try it. */
expression = cp_parser_assignment_expression (parser);
/* If it didn't work, this is just a rethrow. */
if (!cp_parser_parse_definitely (parser))
token = cp_lexer_peek_token (parser->lexer);
/* Figure out whether or not there is an assignment-expression
following the "throw" keyword. */
if (token->type == CPP_COMMA
|| token->type == CPP_SEMICOLON
|| token->type == CPP_CLOSE_PAREN
|| token->type == CPP_CLOSE_SQUARE
|| token->type == CPP_CLOSE_BRACE
|| token->type == CPP_COLON)
expression = NULL_TREE;
else
expression = cp_parser_assignment_expression (parser);
return build_throw (expression);
}

8
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,11 @@
2003-12-15 Mark Mitchell <mark@codesourcery.com>
PR c++/10926
* g++.dg/template/error9.C: New test.
PR c++/11116
* g++.dg/template/error8.C: New test.
2003-12-15 Roger Sayle <roger@eyesopen.com>
PR middle-end/13400

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

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

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

@ -0,0 +1,7 @@
// PR c++/10926
struct Foo
{
template <int i>
~Foo(); // { dg-error "" }
};