diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 83a35859e3d..07ac2b27f0a 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,10 @@
+2014-03-08  Adam Butcher  <adam@jessamine.co.uk>
+
+	PR c++/60393
+	* parser.c (cp_parser_parameter_declaration_clause): Move generic
+	function template unwinding on error into a more general location, ...
+	(cp_parser_skip_to_end_of_statement): ... here.
+
 2014-03-07  Jason Merrill  <jason@redhat.com>
 
 	* Make-lang.in (check_g++_parallelize): Split dg.exp.
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 572528358f5..64583ba98bd 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -3136,6 +3136,10 @@ cp_parser_skip_to_end_of_statement (cp_parser* parser)
 {
   unsigned nesting_depth = 0;
 
+  /* Unwind generic function template scope if necessary.  */
+  if (parser->fully_implicit_function_template_p)
+    finish_fully_implicit_template (parser, /*member_decl_opt=*/0);
+
   while (true)
     {
       cp_token *token = cp_lexer_peek_token (parser->lexer);
@@ -18242,12 +18246,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/ChangeLog b/gcc/testsuite/ChangeLog
index e46a9fc913b..9a0b752e001 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-03-08  Adam Butcher  <adam@jessamine.co.uk>
+
+	PR c++/60393
+	* g++.dg/cpp1y/pr60393.C: New testcase.
+
 2014-03-08  Dominique d'Humieres  <dominiq@lps.ens.fr>
 
 	PR libfortran/60128
diff --git a/gcc/testsuite/g++.dg/cpp1y/pr60393.C b/gcc/testsuite/g++.dg/cpp1y/pr60393.C
new file mode 100644
index 00000000000..38b8b911919
--- /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;
+};