From 8dca7e9303de95cd422deb8703a7554740550c8a Mon Sep 17 00:00:00 2001
From: Paolo Carlini <paolo.carlini@oracle.com>
Date: Tue, 31 Jul 2012 09:46:46 +0000
Subject: [PATCH] re PR c++/53624 (GCC rejects function local types in template
 function with default template arguments)

/cp
2012-07-31  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/53624
	* pt.c (check_default_tmpl_args): Don't check local types.

/testsuite
2012-07-31  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/53624
	* g++.dg/cpp0x/temp_default5.C: New.

From-SVN: r190001
---
 gcc/cp/ChangeLog                           |  6 +++++-
 gcc/cp/pt.c                                |  6 +++---
 gcc/testsuite/ChangeLog                    |  5 +++++
 gcc/testsuite/g++.dg/cpp0x/temp_default5.C | 13 +++++++++++++
 4 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100644 gcc/testsuite/g++.dg/cpp0x/temp_default5.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 2d87bdc3e821..86041697d182 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,8 +1,12 @@
+2012-07-31  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/53624
+	* pt.c (check_default_tmpl_args): Don't check local types.
+
 2012-07-25  Sandra Loosemore  <sandra@codesourcery.com>
 	    Paul Brook  <paul@codesourcery.com>
 
 	PR target/53633
-
 	* decl.c (finish_function): Check targetm.warn_func_return.
 
 2012-07-25  Jason Merrill  <jason@redhat.com>
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 07b294f36eeb..31ae3efb0120 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -4267,7 +4267,8 @@ check_default_tmpl_args (tree decl, tree parms, int is_primary,
 
   /* Core issue 226 (C++0x only): the following only applies to class
      templates.  */
-  if ((cxx_dialect == cxx98) || TREE_CODE (decl) != FUNCTION_DECL)
+  if (is_primary
+      && ((cxx_dialect == cxx98) || TREE_CODE (decl) != FUNCTION_DECL))
     {
       /* [temp.param]
 
@@ -4299,8 +4300,7 @@ check_default_tmpl_args (tree decl, tree parms, int is_primary,
                   TREE_PURPOSE (parm) = error_mark_node;
                   no_errors = false;
                 }
-	      else if (is_primary
-		       && !is_partial
+	      else if (!is_partial
 		       && !is_friend_decl
 		       /* Don't complain about an enclosing partial
 			  specialization.  */
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 1ee69471d29a..2802689c361b 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-31  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/53624
+	* g++.dg/cpp0x/temp_default5.C: New.
+
 2012-07-30  Janus Weil  <janus@gcc.gnu.org>
 
 	PR fortran/51081
diff --git a/gcc/testsuite/g++.dg/cpp0x/temp_default5.C b/gcc/testsuite/g++.dg/cpp0x/temp_default5.C
new file mode 100644
index 000000000000..21ad5fb03809
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/temp_default5.C
@@ -0,0 +1,13 @@
+// { dg-options "-std=c++11" }
+
+template <class Z = void, class T>
+void Foo(T)
+{
+  struct X {};
+}
+
+template <class T = int, typename U>
+void f(const U&)
+{
+  auto g = [] () {};
+}
-- 
2.39.5