diff options
author | Marek Polacek <polacek@redhat.com> | 2018-08-24 15:48:43 +0000 |
---|---|---|
committer | Marek Polacek <mpolacek@gcc.gnu.org> | 2018-08-24 15:48:43 +0000 |
commit | 13ff3e166de379e0386bfaeadf3ae5fba56a0ef5 (patch) | |
tree | aad412b6ba7bdb890f4d5e7a8ae9bedb29a470db /gcc/cp | |
parent | eafa30efd073d937054788c0915957508c85ac8b (diff) | |
download | gcc-13ff3e166de379e0386bfaeadf3ae5fba56a0ef5.zip gcc-13ff3e166de379e0386bfaeadf3ae5fba56a0ef5.tar.gz gcc-13ff3e166de379e0386bfaeadf3ae5fba56a0ef5.tar.bz2 |
re PR c++/67012 (decltype(auto) with trailing return type)
PR c++/67012
PR c++/86942
* decl.c (grokdeclarator): Disallow functions with trailing return
type with decltype(auto) as its type. Also check the function if
it's inner declarator doesn't exist
* g++.dg/cpp0x/auto52.C: New test.
* g++.dg/cpp1y/auto-fn52.C: New test.
* g++.dg/cpp1y/auto-fn53.C: New test.
* g++.dg/cpp1y/auto-fn54.C: New test.
From-SVN: r263836
Diffstat (limited to 'gcc/cp')
-rw-r--r-- | gcc/cp/ChangeLog | 8 | ||||
-rw-r--r-- | gcc/cp/decl.c | 15 |
2 files changed, 22 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 0fbd816..ccb771b 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,11 @@ +2018-08-24 Marek Polacek <polacek@redhat.com> + + PR c++/67012 + PR c++/86942 + * decl.c (grokdeclarator): Disallow functions with trailing return + type with decltype(auto) as its type. Also check the function if + it's inner declarator doesn't exist + 2018-08-21 Marek Polacek <polacek@redhat.com> PR c++/86499 diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 82ec4af..9056ad0 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -11246,7 +11246,10 @@ grokdeclarator (const cp_declarator *declarator, /* Handle a late-specified return type. */ tree late_return_type = declarator->u.function.late_return_type; - if (funcdecl_p) + if (funcdecl_p + /* This is the case e.g. for + using T = auto () -> int. */ + || inner_declarator == NULL) { if (tree auto_node = type_uses_auto (type)) { @@ -11278,6 +11281,16 @@ grokdeclarator (const cp_declarator *declarator, name, type); return error_mark_node; } + else if (is_auto (type) && AUTO_IS_DECLTYPE (type)) + { + if (funcdecl_p) + error ("%qs function with trailing return type has " + "%<decltype(auto)%> as its type rather than " + "plain %<auto%>", name); + else + error ("invalid use of %<decltype(auto)%>"); + return error_mark_node; + } tree tmpl = CLASS_PLACEHOLDER_TEMPLATE (auto_node); if (!tmpl) if (tree late_auto = type_uses_auto (late_return_type)) |