From d1d1af106b3e735c2e29a63840ee1687f12927d2 Mon Sep 17 00:00:00 2001 From: Adam Butcher Date: Mon, 25 Nov 2013 07:43:55 +0000 Subject: [PATCH] Disallow implicit function templates in local functions unless defining a lambda. gcc/cp/ PR c++/59112 PR c++/59113 * parser.c (cp_parser_parameter_declaration_clause): Disallow implicit function templates in local functions unless defining a lambda. gcc/testsuite/ PR c++/59112 PR c++/59113 g++.dg/cpp1y/pr58533.C: Updated testcase. g++.dg/cpp1y/pr59112.C: New testcase. g++.dg/cpp1y/pr59113.C: New testcase. From-SVN: r205343 --- gcc/cp/ChangeLog | 7 +++++++ gcc/cp/parser.c | 4 +++- gcc/testsuite/ChangeLog | 8 ++++++++ gcc/testsuite/g++.dg/cpp1y/pr58533.C | 2 +- gcc/testsuite/g++.dg/cpp1y/pr59112.C | 12 ++++++++++++ gcc/testsuite/g++.dg/cpp1y/pr59113.C | 11 +++++++++++ 6 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/g++.dg/cpp1y/pr59112.C create mode 100644 gcc/testsuite/g++.dg/cpp1y/pr59113.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index aadecddc4138..92b520b45ede 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,10 @@ +2013-11-25 Adam Butcher + + PR c++/59112 + PR c++/59113 + * parser.c (cp_parser_parameter_declaration_clause): Disallow implicit + function templates in local functions unless defining a lambda. + 2013-11-23 Easwaran Raman PR c++/59031 diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 141974745b15..d7092cc6759b 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -18042,7 +18042,9 @@ cp_parser_parameter_declaration_clause (cp_parser* parser) (void) cleanup; if (!processing_specialization) - parser->auto_is_implicit_function_template_parm_p = true; + if (!current_function_decl + || (current_class_type && LAMBDA_TYPE_P (current_class_type))) + parser->auto_is_implicit_function_template_parm_p = true; /* Peek at the next token. */ token = cp_lexer_peek_token (parser->lexer); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index a2e144f3bd31..ddc0fa21167f 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2013-11-25 Adam Butcher + + PR c++/59112 + PR c++/59113 + g++.dg/cpp1y/pr58533.C: Updated testcase. + g++.dg/cpp1y/pr59112.C: New testcase. + g++.dg/cpp1y/pr59113.C: New testcase. + 2013-11-25 Terry Guo * gcc.target/arm/thumb2-slow-flash-data.c: New. diff --git a/gcc/testsuite/g++.dg/cpp1y/pr58533.C b/gcc/testsuite/g++.dg/cpp1y/pr58533.C index e1855d78e084..9bcd7716697f 100644 --- a/gcc/testsuite/g++.dg/cpp1y/pr58533.C +++ b/gcc/testsuite/g++.dg/cpp1y/pr58533.C @@ -3,5 +3,5 @@ void foo() { - void (*fp)(auto); // { dg-error "template" } + void (*fp)(auto); // { dg-error "auto|not permitted" } } diff --git a/gcc/testsuite/g++.dg/cpp1y/pr59112.C b/gcc/testsuite/g++.dg/cpp1y/pr59112.C new file mode 100644 index 000000000000..e7326ac31130 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1y/pr59112.C @@ -0,0 +1,12 @@ +// { dg-do compile } +// { dg-options "-std=gnu++1y" } + +// PR c++/59112 + +void foo() +{ + struct A + { + A(auto) {} // { dg-error "auto|not permitted" } + }; +} diff --git a/gcc/testsuite/g++.dg/cpp1y/pr59113.C b/gcc/testsuite/g++.dg/cpp1y/pr59113.C new file mode 100644 index 000000000000..f909a76bd358 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1y/pr59113.C @@ -0,0 +1,11 @@ +// { dg-do compile } +// { dg-options "-std=gnu++1y" } + +// PR c++/59113 + +void foo() +{ + void bar(auto) {} // { dg-error "function-definition|auto|not permitted" } +} + +auto i = 0; -- 2.47.3