From 13ff3e166de379e0386bfaeadf3ae5fba56a0ef5 Mon Sep 17 00:00:00 2001 From: Marek Polacek Date: Fri, 24 Aug 2018 15:48:43 +0000 Subject: 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 --- gcc/cp/ChangeLog | 8 ++++++++ gcc/cp/decl.c | 15 ++++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) (limited to 'gcc/cp') 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 + + 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 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 " + "% as its type rather than " + "plain %", name); + else + error ("invalid use of %"); + return error_mark_node; + } tree tmpl = CLASS_PLACEHOLDER_TEMPLATE (auto_node); if (!tmpl) if (tree late_auto = type_uses_auto (late_return_type)) -- cgit v1.1