diff options
| author | Jason Merrill <jason@redhat.com> | 2020-06-18 17:41:43 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@redhat.com> | 2020-06-19 12:25:37 -0400 |
| commit | 4058454c9e0ee141d049cefa8db315a345a4b30a (patch) | |
| tree | a12833a627dc92f855820c1d6d391e72e15cc19b /gcc/cp/method.c | |
| parent | 4cea81adabd7660838ebb3e59e8d28f820a3b789 (diff) | |
| download | gcc-4058454c9e0ee141d049cefa8db315a345a4b30a.zip gcc-4058454c9e0ee141d049cefa8db315a345a4b30a.tar.gz gcc-4058454c9e0ee141d049cefa8db315a345a4b30a.tar.bz2 | |
c++: Allow defaulted comparison outside class.
Implementing P2085, another refinement to the operator<=> specification from
the Prague meeting. It was deemed desirable to be able to have a non-inline
defaulted definition of a comparison operator just like you can with other
defaulted functions.
gcc/cp/ChangeLog:
* method.c (early_check_defaulted_comparison): Allow defaulting
comparison outside class. Complain if non-member operator isn't a
friend.
gcc/testsuite/ChangeLog:
* g++.dg/cpp2a/spaceship-friend1.C: New test.
* g++.dg/cpp2a/spaceship-err4.C: Adjust diagnostic.
Diffstat (limited to 'gcc/cp/method.c')
| -rw-r--r-- | gcc/cp/method.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/gcc/cp/method.c b/gcc/cp/method.c index b23764b..2a98907 100644 --- a/gcc/cp/method.c +++ b/gcc/cp/method.c @@ -1102,17 +1102,6 @@ early_check_defaulted_comparison (tree fn) return false; } - if (!ctx) - { - if (DECL_OVERLOADED_OPERATOR_IS (fn, SPACESHIP_EXPR)) - error_at (loc, "three-way comparison operator can only be defaulted " - "in a class definition"); - else - error_at (loc, "equality comparison operator can only be defaulted " - "in a class definition"); - return false; - } - if (!DECL_OVERLOADED_OPERATOR_IS (fn, SPACESHIP_EXPR) && !same_type_p (TREE_TYPE (TREE_TYPE (fn)), boolean_type_node)) { @@ -1146,16 +1135,27 @@ early_check_defaulted_comparison (tree fn) for (; parmnode != void_list_node; parmnode = TREE_CHAIN (parmnode)) { tree parmtype = TREE_VALUE (parmnode); - if (same_type_p (parmtype, ctx)) + if (CLASS_TYPE_P (parmtype)) saw_byval = true; - else if (TREE_CODE (parmtype) != REFERENCE_TYPE - || TYPE_REF_IS_RVALUE (parmtype) - || TYPE_QUALS (TREE_TYPE (parmtype)) != TYPE_QUAL_CONST - || !(same_type_ignoring_top_level_qualifiers_p - (TREE_TYPE (parmtype), ctx))) - saw_bad = true; + else if (TREE_CODE (parmtype) == REFERENCE_TYPE + && !TYPE_REF_IS_RVALUE (parmtype) + && TYPE_QUALS (TREE_TYPE (parmtype)) == TYPE_QUAL_CONST) + { + saw_byref = true; + parmtype = TREE_TYPE (parmtype); + } else - saw_byref = true; + saw_bad = true; + + if (!saw_bad && !ctx) + { + /* Defaulted outside the class body. */ + ctx = TYPE_MAIN_VARIANT (parmtype); + if (!is_friend (ctx, fn)) + error_at (loc, "defaulted %qD is not a friend of %qT", fn, ctx); + } + else if (!same_type_ignoring_top_level_qualifiers_p (parmtype, ctx)) + saw_bad = true; } if (saw_bad || (saw_byval && saw_byref)) |