diff options
| author | Jason Merrill <jason@redhat.com> | 2022-04-06 21:57:33 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@redhat.com> | 2022-04-06 23:26:08 -0400 |
| commit | f44a5c700f409b96ba923864158349700628133d (patch) | |
| tree | ceecff41b8b06abf9c433553c8ce82f2fdac9948 /gcc | |
| parent | 8e4339f5023286d25c7dfa40b4c88e63b780cfd7 (diff) | |
| download | gcc-f44a5c700f409b96ba923864158349700628133d.zip gcc-f44a5c700f409b96ba923864158349700628133d.tar.gz gcc-f44a5c700f409b96ba923864158349700628133d.tar.bz2 | |
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.cc (grokdeclarator): Reject conversion with trailing return
sooner.
gcc/testsuite/ChangeLog:
* g++.dg/cpp0x/trailing15.C: New test.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/decl.cc | 7 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/trailing15.C | 14 |
2 files changed, 19 insertions, 2 deletions
diff --git a/gcc/cp/decl.cc b/gcc/cp/decl.cc index 0ff13e9..c136dbb 100644 --- a/gcc/cp/decl.cc +++ b/gcc/cp/decl.cc @@ -12866,6 +12866,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; @@ -13030,8 +13035,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 0000000..3fa74d0 --- /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 T> +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" } |