diff options
| author | Jason Merrill <jason@redhat.com> | 2010-08-29 15:24:37 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2010-08-29 15:24:37 -0400 |
| commit | 98d4336049e3fa17b351960d4133dcefe71aced7 (patch) | |
| tree | 1dc468dac8b2322ad4a4a42a9e4ba9b981dd5458 | |
| parent | 1f5ca1a15c802a554be3ddbe29f7f48bead433e0 (diff) | |
| download | gcc-98d4336049e3fa17b351960d4133dcefe71aced7.zip gcc-98d4336049e3fa17b351960d4133dcefe71aced7.tar.gz gcc-98d4336049e3fa17b351960d4133dcefe71aced7.tar.bz2 | |
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
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/parser.c | 5 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/parse/defarg15.C | 5 |
4 files changed, 21 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index f485d6f..ac879d7 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -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> * Make-lang.in (g++spec.o): Update dependencies. diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 6c4fe1d..b71d145 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -15564,6 +15564,7 @@ cp_parser_parameter_declaration (cp_parser *parser, the default argument; otherwise the default argument continues. */ bool error = false; + tree t; /* Set ITALP so cp_parser_parameter_declaration_list 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_lexer_consume_token (parser->lexer); + begin_scope (sk_function_parms, NULL_TREE); 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) done = true; cp_parser_abort_tentative_parse (parser); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 5a9f38a..3ef4c0e 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -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> PR fortran/45439 diff --git a/gcc/testsuite/g++.dg/parse/defarg15.C b/gcc/testsuite/g++.dg/parse/defarg15.C new file mode 100644 index 0000000..b93af4c --- /dev/null +++ b/gcc/testsuite/g++.dg/parse/defarg15.C @@ -0,0 +1,5 @@ +// PR c++/44991 + +class bar { + void foo(bool a = 3 < 2, bool b = true) {} +}; |