diff options
| author | Jason Merrill <jason@redhat.com> | 2014-06-17 23:09:20 +0000 |
|---|---|---|
| committer | Jason Merrill <jason@redhat.com> | 2014-06-17 23:09:20 +0000 |
| commit | 819d274f0886815c9768fb287b664f2360c42179 (patch) | |
| tree | 17ddfa51adbd4d5297c171ec8dbec42f6379bd84 | |
| parent | 72584831e9571021f4fdaeb8a019184cc6c536b0 (diff) | |
PR c++/60605
* pt.c (check_default_tmpl_args): Check DECL_LOCAL_FUNCTION_P.
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@211754 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/local-fn1.C | 8 |
3 files changed, 15 insertions, 1 deletions
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 <jason@redhat.com> + + PR c++/60605 + * pt.c (check_default_tmpl_args): Check DECL_LOCAL_FUNCTION_P. + 2014-06-15 Jason Merrill <jason@redhat.com> 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 <typename T = int> +struct Foo { + void bar() { + void bug(); + } +}; |