[PATCH] Fix PR c++/60393

[Adam Butcher]

	PR c++/60393
	* parser.c (cp_parser_parameter_declaration_clause): Move generic
	function template unwinding on error into a move general location, ...
	(cp_parser_error): ... here.

	PR c++/60393
	* g++.dg/cpp1y/pr60393.C: New testcase.
---
 gcc/cp/parser.c                      | 11 +++++------
 gcc/testsuite/g++.dg/cpp1y/pr60393.C |  9 +++++++++
 2 files changed, 14 insertions(+), 6 deletions(-)
 create mode 100644 gcc/testsuite/g++.dg/cpp1y/pr60393.C

diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 8c78262..7feae3d 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -2524,6 +2524,10 @@ cp_parser_error (cp_parser* parser, const char* gmsgid)
 	 of the token we just peeked at.  */
       cp_lexer_set_source_position_from_token (token);
 
+      /* Unwind generic function template scope if necessary.  */
+      if (parser->fully_implicit_function_template_p)
+	finish_fully_implicit_template (parser, /*member_decl_opt=*/0);
+
       if (token->type == CPP_PRAGMA)
 	{
 	  error_at (token->location,
@@ -18208,12 +18212,7 @@ cp_parser_parameter_declaration_clause (cp_parser* parser)
      parameter-declaration-list, then the entire
      parameter-declaration-clause is erroneous.  */
   if (is_error)
-    {
-      /* Unwind generic function template scope if necessary.  */
-      if (parser->fully_implicit_function_template_p)
-	finish_fully_implicit_template (parser, /*member_decl_opt=*/0);
-      return NULL;
-    }
+    return NULL;
 
   /* Peek at the next token.  */
   token = cp_lexer_peek_token (parser->lexer);
diff --git a/gcc/testsuite/g++.dg/cpp1y/pr60393.C b/gcc/testsuite/g++.dg/cpp1y/pr60393.C
new file mode 100644
index 0000000..38b8b91
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp1y/pr60393.C
@@ -0,0 +1,9 @@
+// PR c++/60393
+// { dg-options -std=c++1y }
+
+void (*f)(auto) + 0; // { dg-error "expected" }
+
+struct A
+{
+  int i;
+};
-- 
1.9.0