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

re PR c++/44991 (default argument with '<' cause compilation error) 

PR c++/44991
	* parser.c (cp_parser_parameter_declaration): Pop parameter decls
	after tentative parsing.

From-SVN: r163629
This commit is contained in:
Jason Merrill 2010-08-29 15:24:37 -04:00 committed by Jason Merrill
parent 1f5ca1a15c
commit 98d4336049
4 changed files with 21 additions and 0 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 @@
2010-08-29 Jason Merrill <jason@redhat.com>
PR c++/44991
* parser.c (cp_parser_parameter_declaration): Pop parameter decls
after tentative parsing.
2010-08-22 Joseph Myers <joseph@codesourcery.com> 2010-08-22 Joseph Myers <joseph@codesourcery.com>
* Make-lang.in (g++spec.o): Update dependencies. * Make-lang.in (g++spec.o): Update dependencies.

5
gcc/cp/parser.c
View File

@ -15564,6 +15564,7 @@ cp_parser_parameter_declaration (cp_parser *parser,
the default argument; otherwise the default the default argument; otherwise the default
argument continues. */ argument continues. */
bool error = false; bool error = false;
tree t;
/* Set ITALP so cp_parser_parameter_declaration_list /* Set ITALP so cp_parser_parameter_declaration_list
doesn't decide to commit to this parse. */ doesn't decide to commit to this parse. */
@ -15572,7 +15573,11 @@ cp_parser_parameter_declaration (cp_parser *parser,
cp_parser_parse_tentatively (parser); cp_parser_parse_tentatively (parser);
cp_lexer_consume_token (parser->lexer); cp_lexer_consume_token (parser->lexer);
begin_scope (sk_function_parms, NULL_TREE);
cp_parser_parameter_declaration_list (parser, &error); cp_parser_parameter_declaration_list (parser, &error);
for (t = current_binding_level->names; t; t = DECL_CHAIN (t))
pop_binding (DECL_NAME (t), t);
leave_scope ();
if (!cp_parser_error_occurred (parser) && !error) if (!cp_parser_error_occurred (parser) && !error)
done = true; done = true;
cp_parser_abort_tentative_parse (parser); cp_parser_abort_tentative_parse (parser);

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2010-08-29 Jason Merrill <jason@redhat.com>
PR c++/44991
* g++.dg/parse/defarg15.C: New.
2010-08-29 Janus Weil <janus@gcc.gnu.org> 2010-08-29 Janus Weil <janus@gcc.gnu.org>
PR fortran/45439 PR fortran/45439

5
gcc/testsuite/g++.dg/parse/defarg15.C Normal file
View File

@ -0,0 +1,5 @@
// PR c++/44991
class bar {
void foo(bool a = 3 < 2, bool b = true) {}
};