From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2122) id 80A8D3858C53; Tue, 12 Apr 2022 20:14:18 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 80A8D3858C53 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jason Merrill To: gcc-cvs@gcc.gnu.org Subject: [gcc r11-9823] c++: conversion with trailing return type [PR101051] X-Act-Checkin: gcc X-Git-Author: Jason Merrill X-Git-Refname: refs/heads/releases/gcc-11 X-Git-Oldrev: 0b6d4ee830b01ee70cc5dc32722d73ac3ea4e0db X-Git-Newrev: 25167a3d8cfc738deb4b2bfb74ad37fd8a0f1ca4 Message-Id: <20220412201418.80A8D3858C53@sourceware.org> Date: Tue, 12 Apr 2022 20:14:18 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Apr 2022 20:14:18 -0000 https://gcc.gnu.org/g:25167a3d8cfc738deb4b2bfb74ad37fd8a0f1ca4 commit r11-9823-g25167a3d8cfc738deb4b2bfb74ad37fd8a0f1ca4 Author: Jason Merrill Date: Wed Apr 6 21:57:33 2022 -0400 c++: conversion with trailing return type [PR101051] We've had a diagnostic for this, but since r10-6571 added an assert to splice_late_return_type, we need to diagnose before we call it. PR c++/101051 gcc/cp/ChangeLog: * decl.c (grokdeclarator): Reject conversion with trailing return sooner. gcc/testsuite/ChangeLog: * g++.dg/cpp0x/trailing15.C: New test. Diff: --- gcc/cp/decl.c | 7 +++++-- gcc/testsuite/g++.dg/cpp0x/trailing15.C | 14 ++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index f71904fcf22..491a03cd94f 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -12594,6 +12594,11 @@ grokdeclarator (const cp_declarator *declarator, "type specifier", name); return error_mark_node; } + if (late_return_type && sfk == sfk_conversion) + { + error ("a conversion function cannot have a trailing return type"); + return error_mark_node; + } type = splice_late_return_type (type, late_return_type); if (type == error_mark_node) return error_mark_node; @@ -12758,8 +12763,6 @@ grokdeclarator (const cp_declarator *declarator, maybe_warn_cpp0x (CPP0X_EXPLICIT_CONVERSION); explicitp = 2; } - if (late_return_type_p) - error ("a conversion function cannot have a trailing return type"); } else if (sfk == sfk_deduction_guide) { diff --git a/gcc/testsuite/g++.dg/cpp0x/trailing15.C b/gcc/testsuite/g++.dg/cpp0x/trailing15.C new file mode 100644 index 00000000000..3fa74d08e39 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/trailing15.C @@ -0,0 +1,14 @@ +// PR c++/101051 +// { dg-do compile { target c++11 } } + +template +class Foo +{ + constexpr operator T() -> T {} // { dg-error "trailing return" } +}; + +struct S { + operator int() const -> double; // { dg-error "trailing return" } +}; + +class A { operator auto*() -> int; }; // { dg-error "auto|trailing return" }