From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 630E5384646C for ; Mon, 15 Apr 2024 18:30:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 630E5384646C Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 630E5384646C Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713205826; cv=none; b=Pl/u1pepqs911wKoM6ZFREBK0PIFFwzOl63z1yToyOcAIg9s2tzyXzL44fX4BLqh8uhqfbTLL9Ez8EbTQ8eCC6WCgSJuz4Prs4zqJ/8mO9OLs6kE4C81ernYBHUPAUdlcBvRfJUXaPy/Ve7udAlZSfHPMdjm8ffbOOtMcdjxL9k= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713205826; c=relaxed/simple; bh=3IN4BaG2tFYH0yiZ4gcsUgM8nHfeyjvGbC6K0y7MpFc=; h=DKIM-Signature:MIME-Version:From:Date:Message-ID:Subject:To; b=Be8fBbN3kR8zei9ELFIItilpEYwmwFJMBFcf8o95F99P9s4T7f7peuTZMFJMlsOnMltnlTX3SwRI2BtxrXqNSGGOFiWvqL6SNWNuI52humyLihmpZwc9kjQ5nr3RzBYYyYZVeEc1GZaHP6vCwvMkn1ne5Nif1H+KL8oNpOByCQQ= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1713205823; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=+VF6nrR+Q5mdky56QvVEDIV3naiyZaMqn4Z66BlKXYc=; b=DueCeCgP0iFwuorzR0czAiUqmPvuGgtqAohnsuX0D1u5/Z7i7M4mE949kgVd5tbjbXkI5/ FhzmOV3Byvn5vPS6w9S4A0G01uSBaEYaDfL++BVc9yFHq9iBrrTnPNmGZzMAdWc6FUy8QA EqzUj1idLRliJ3FKkrTAIwlhFT0ThqQ= Received: from mail-yb1-f200.google.com (mail-yb1-f200.google.com [209.85.219.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-546-md1ejgZvMpK1DnqcK761xQ-1; Mon, 15 Apr 2024 14:30:21 -0400 X-MC-Unique: md1ejgZvMpK1DnqcK761xQ-1 Received: by mail-yb1-f200.google.com with SMTP id 3f1490d57ef6-dd8e82dd47eso4754456276.2 for ; Mon, 15 Apr 2024 11:30:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713205821; x=1713810621; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=+VF6nrR+Q5mdky56QvVEDIV3naiyZaMqn4Z66BlKXYc=; b=l97h48RH67E0dkGde+wHa74YS0if5n/YTOAvgBCzhKdvkESmKyDsovhOeIRSZB3vFT laTrPdYIFZOAI95LzQAReedB49BpoMTPcluNnmiBdG15+5k+MmwueVZPYIQE5AoEwOVP b6gAUIHbG2ZviMfXCQ8cB/ogKhOlraLLrHTUVg5wqdIJUhlulgqDC3WW6pssdw5jHA8+ AAsXzV5vmpqIOwAOuasiQxdnuMlH8tMoChH1irIxL3pHwdsnZNpGssJVSzFtte0Nj6lq pg7rda/sny2MCkohMXdcu/p1TG0xjDFzBkyS/ewTbe/fjFPsexCf2nz4KM1plNUU6KS4 Pj9w== X-Gm-Message-State: AOJu0YzZEcM5YymevJGZ+04mkuXVYBBanFLNxTdi+/CP7/VpHo/1uLjf QVY+QaiT5PoLEayWXPhgiSqVvBiGDuZPmFmLyewiqgZSSrwm8xuwcQ/8zB7W6Z0VlcxeTUVGEYN QUkYuucrYbwFPPuzaIg7PK4IWuncDztjoBzkYKTnjQOIRJBVGWGYVoeb7VoVzharCfT0V6CLtJQ OldWsIT863WHpclfA/xfc1A19ihcbH/POlkyAYUQ== X-Received: by 2002:a25:b908:0:b0:dc2:3113:8700 with SMTP id x8-20020a25b908000000b00dc231138700mr9044710ybj.24.1713205820936; Mon, 15 Apr 2024 11:30:20 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHw2nmN9oLFwxi0Qyc8ZUAl1wWiX2SOy3iOvNHgoxv44H7O8VrnTwx59EVW1A/eLNICBZzL7aaKRjeFhOydV28= X-Received: by 2002:a25:b908:0:b0:dc2:3113:8700 with SMTP id x8-20020a25b908000000b00dc231138700mr9044687ybj.24.1713205820640; Mon, 15 Apr 2024 11:30:20 -0700 (PDT) MIME-Version: 1.0 References: <20240410085039.267589-1-jwakely@redhat.com> <20240410085039.267589-2-jwakely@redhat.com> In-Reply-To: <20240410085039.267589-2-jwakely@redhat.com> From: Jonathan Wakely Date: Mon, 15 Apr 2024 19:30:04 +0100 Message-ID: Subject: Re: [PATCH 2/4] libstdc++: Add std::reference_wrapper comparison operators for C++26 To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-13.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_NUMSUBJECT,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Pushed to trunk now. On Wed, 10 Apr 2024 at 09:53, Jonathan Wakely wrote: > > Tested x86_64-linux. > > Since this only affects C++26 it seems OK for trunk now. > > -- >8 -- > > This C++26 change was just approved in Tokyo, in P2944R3. It adds > operator== and operator<=> overloads to std::reference_wrapper. > > The operator<=> overloads in the paper cause compilation errors for any > type without <=> so they're implemented here with deduced return types > and constrained by a requires clause. > > libstdc++-v3/ChangeLog: > > * include/bits/refwrap.h (reference_wrapper): Add comparison > operators as proposed by P2944R3. > * include/bits/version.def (reference_wrapper): Define. > * include/bits/version.h: Regenerate. > * include/std/functional: Enable feature test macro. > * testsuite/20_util/reference_wrapper/compare.cc: New test. > --- > libstdc++-v3/include/bits/refwrap.h | 45 +++++++++ > libstdc++-v3/include/bits/version.def | 8 ++ > libstdc++-v3/include/bits/version.h | 10 ++ > libstdc++-v3/include/std/functional | 1 + > .../20_util/reference_wrapper/compare.cc | 95 +++++++++++++++++++ > 5 files changed, 159 insertions(+) > create mode 100644 libstdc++-v3/testsuite/20_util/reference_wrapper/compare.cc > > diff --git a/libstdc++-v3/include/bits/refwrap.h b/libstdc++-v3/include/bits/refwrap.h > index 2d4338b718f..fd1cc2b63e6 100644 > --- a/libstdc++-v3/include/bits/refwrap.h > +++ b/libstdc++-v3/include/bits/refwrap.h > @@ -38,6 +38,10 @@ > #include > #include // for unary_function and binary_function > > +#if __glibcxx_reference_wrapper >= 202403L // >= C++26 > +# include > +#endif > + > namespace std _GLIBCXX_VISIBILITY(default) > { > _GLIBCXX_BEGIN_NAMESPACE_VERSION > @@ -358,6 +362,47 @@ _GLIBCXX_MEM_FN_TRAITS(&& noexcept, false_type, true_type) > #endif > return std::__invoke(get(), std::forward<_Args>(__args)...); > } > + > +#if __glibcxx_reference_wrapper >= 202403L // >= C++26 > + // [refwrap.comparisons], comparisons > + [[nodiscard]] > + friend constexpr bool > + operator==(reference_wrapper __x, reference_wrapper __y) > + requires requires { { __x.get() == __y.get() } -> convertible_to; } > + { return __x.get() == __y.get(); } > + > + [[nodiscard]] > + friend constexpr bool > + operator==(reference_wrapper __x, const _Tp& __y) > + requires requires { { __x.get() == __y } -> convertible_to; } > + { return __x.get() == __y; } > + > + [[nodiscard]] > + friend constexpr bool > + operator==(reference_wrapper __x, reference_wrapper __y) > + requires (!is_const_v<_Tp>) > + && requires { { __x.get() == __y.get() } -> convertible_to; } > + { return __x.get() == __y.get(); } > + > + [[nodiscard]] > + friend constexpr auto > + operator<=>(reference_wrapper __x, reference_wrapper<_Tp> __y) > + requires requires { __detail::__synth3way(__x.get(), __y.get()); } > + { return __detail::__synth3way(__x.get(), __y.get()); } > + > + [[nodiscard]] > + friend constexpr auto > + operator<=>(reference_wrapper __x, const _Tp& __y) > + requires requires { __detail::__synth3way(__x.get(), __y); } > + { return __detail::__synth3way(__x.get(), __y); } > + > + [[nodiscard]] > + friend constexpr auto > + operator<=>(reference_wrapper __x, reference_wrapper __y) > + requires (!is_const_v<_Tp>) > + && requires { __detail::__synth3way(__x.get(), __y.get()); } > + { return __detail::__synth3way(__x.get(), __y.get()); } > +#endif > }; > > #if __cpp_deduction_guides > diff --git a/libstdc++-v3/include/bits/version.def b/libstdc++-v3/include/bits/version.def > index 5ad44941bff..5c0477fb61e 100644 > --- a/libstdc++-v3/include/bits/version.def > +++ b/libstdc++-v3/include/bits/version.def > @@ -1760,6 +1760,14 @@ ftms = { > }; > }; > > +ftms = { > + name = reference_wrapper; > + values = { > + v = 202403; > + cxxmin = 26; > + }; > +}; > + > ftms = { > name = saturation_arithmetic; > values = { > diff --git a/libstdc++-v3/include/bits/version.h b/libstdc++-v3/include/bits/version.h > index 460a3e0116a..65e708c73fb 100644 > --- a/libstdc++-v3/include/bits/version.h > +++ b/libstdc++-v3/include/bits/version.h > @@ -1963,6 +1963,16 @@ > #endif /* !defined(__cpp_lib_ratio) && defined(__glibcxx_want_ratio) */ > #undef __glibcxx_want_ratio > > +#if !defined(__cpp_lib_reference_wrapper) > +# if (__cplusplus > 202302L) > +# define __glibcxx_reference_wrapper 202403L > +# if defined(__glibcxx_want_all) || defined(__glibcxx_want_reference_wrapper) > +# define __cpp_lib_reference_wrapper 202403L > +# endif > +# endif > +#endif /* !defined(__cpp_lib_reference_wrapper) && defined(__glibcxx_want_reference_wrapper) */ > +#undef __glibcxx_want_reference_wrapper > + > #if !defined(__cpp_lib_saturation_arithmetic) > # if (__cplusplus > 202302L) > # define __glibcxx_saturation_arithmetic 202311L > diff --git a/libstdc++-v3/include/std/functional b/libstdc++-v3/include/std/functional > index 766558b3ce0..99364286a72 100644 > --- a/libstdc++-v3/include/std/functional > +++ b/libstdc++-v3/include/std/functional > @@ -83,6 +83,7 @@ > #define __glibcxx_want_move_only_function > #define __glibcxx_want_not_fn > #define __glibcxx_want_ranges > +#define __glibcxx_want_reference_wrapper > #define __glibcxx_want_transparent_operators > #include > > diff --git a/libstdc++-v3/testsuite/20_util/reference_wrapper/compare.cc b/libstdc++-v3/testsuite/20_util/reference_wrapper/compare.cc > new file mode 100644 > index 00000000000..039c9d26496 > --- /dev/null > +++ b/libstdc++-v3/testsuite/20_util/reference_wrapper/compare.cc > @@ -0,0 +1,95 @@ > +// { dg-do compile { target c++26 } } > + > + > +#include > + > +#ifndef __cpp_lib_reference_wrapper > +# error "Feature-test macro for reference_wrapper missing" > +#elif __cpp_lib_reference_wrapper != 202403 > +# error "Feature-test macro for reference_wrapper has wrong value" > +#endif > + > +// P2944R3 Comparisons for reference_wrapper > + > +auto check(int i, std::reference_wrapper r) -> bool { > + return i == r; > +} > + > +template using Ref = std::reference_wrapper; > + > +template > +concept ref_equality_comparable > += requires (T a, T const ca, Ref r, Ref cr) { > + // the usual T is equality-comparable with itself > + a == a; > + a == ca; > + ca == ca; > + > + // Ref is equality-comparable with itself > + r == r; > + r == cr; > + cr == cr; > + > + // T and Ref are equality-comparable > + a == r; > + a == cr; > + ca == r; > + ca == cr; > +}; > + > +static_assert( ref_equality_comparable ); > + > +struct A { > + auto operator==(A const&) const -> bool { return true; } > +}; > + > +struct B { > + friend auto operator==(B const&, B const&) -> bool { return true; } > +}; > + > +template > +struct C { > + friend auto operator==(C const&, C const&) -> bool { return true; } > +}; > + > +template > +struct D { }; > +template > +auto operator==(D const&, D const&) -> bool { return true; } > + > +static_assert(ref_equality_comparable); > +static_assert(ref_equality_comparable); > +static_assert(ref_equality_comparable); > +static_assert(ref_equality_comparable>); > +static_assert(ref_equality_comparable>); > +#include > +static_assert(ref_equality_comparable); > + > +template > +struct ValArray { > + friend auto operator==(ValArray const&, ValArray const&) -> ValArray { > + return {}; > + } > +}; > + > +void f(ValArray v) { > + // this is valid and has type ValArray > + v == v; > + > + // this is also valid today and has the same type > + std::ref(v) == std::ref(v); > +} > + > +struct ComparesAsInt { > + friend auto operator==(ComparesAsInt, ComparesAsInt) -> int; > +}; > + > +auto f(std::reference_wrapper a, > + std::reference_wrapper b) { > + // today: compiles and returns int > + // proposed: compiles and returns bool > + return a == b; > +} > + > +ComparesAsInt& c(); > +static_assert( std::is_same_v ); > -- > 2.44.0 >