PR c++/44991

	* parser.c (cp_parser_parameter_declaration): Pop parameter decls
	after tentative parsing.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@163629 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index f485d6f..ac879d7 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
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) {}
+};