From 5a96dac608806ab37202bb7a4275a0f84755bde5 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Tue, 17 Jun 2014 19:09:20 -0400 Subject: [PATCH] re PR c++/60605 (incorrect diagosis of default template argument for function declaration inside class template member function) PR c++/60605 * pt.c (check_default_tmpl_args): Check DECL_LOCAL_FUNCTION_P. From-SVN: r211754 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/pt.c | 3 ++- gcc/testsuite/g++.dg/template/local-fn1.C | 8 ++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/template/local-fn1.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 5a8c01dad66..9705f641893 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2014-06-17 Jason Merrill + + PR c++/60605 + * pt.c (check_default_tmpl_args): Check DECL_LOCAL_FUNCTION_P. + 2014-06-15 Jason Merrill PR c++/61488 diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index df57293d03d..d5cc2576f9d 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -4418,7 +4418,8 @@ check_default_tmpl_args (tree decl, tree parms, bool is_primary, in the template-parameter-list of the definition of a member of a class template. */ - if (TREE_CODE (CP_DECL_CONTEXT (decl)) == FUNCTION_DECL) + if (TREE_CODE (CP_DECL_CONTEXT (decl)) == FUNCTION_DECL + || (TREE_CODE (decl) == FUNCTION_DECL && DECL_LOCAL_FUNCTION_P (decl))) /* You can't have a function template declaration in a local scope, nor you can you define a member of a class template in a local scope. */ diff --git a/gcc/testsuite/g++.dg/template/local-fn1.C b/gcc/testsuite/g++.dg/template/local-fn1.C new file mode 100644 index 00000000000..88acd17d741 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/local-fn1.C @@ -0,0 +1,8 @@ +// PR c++/60605 + +template +struct Foo { + void bar() { + void bug(); + } +}; -- 2.30.2