From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1888) id 72A67384841D; Mon, 14 Jun 2021 03:23:56 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 72A67384841D MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Patrick Palka To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r11-8566] libstdc++: Fix up semiregular-box partial specialization [PR100475] X-Act-Checkin: gcc X-Git-Author: Patrick Palka X-Git-Refname: refs/heads/releases/gcc-11 X-Git-Oldrev: 3a9aea9586363dd7c3b6680d7a495ada11275da3 X-Git-Newrev: 258aedd9ad1ea4597528632e93dee860acc2eaf5 Message-Id: <20210614032357.72A67384841D@sourceware.org> Date: Mon, 14 Jun 2021 03:23:56 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jun 2021 03:23:57 -0000 https://gcc.gnu.org/g:258aedd9ad1ea4597528632e93dee860acc2eaf5 commit r11-8566-g258aedd9ad1ea4597528632e93dee860acc2eaf5 Author: Patrick Palka Date: Tue May 18 00:28:44 2021 -0400 libstdc++: Fix up semiregular-box partial specialization [PR100475] This makes the in-place constructor of our partial specialization of __box for already-semiregular types perform direct-non-list-initialization (in accordance with the specification of the primary template), and additionally makes the member function data() use std::__addressof. libstdc++-v3/ChangeLog: PR libstdc++/100475 * include/std/ranges (__box::__box): Use non-list-initialization in member initializer list of in-place constructor of the partial specialization for semiregular types. (__box::operator->): Use std::__addressof. * testsuite/std/ranges/adaptors/detail/semiregular_box.cc (test02): New test. * testsuite/std/ranges/single_view.cc (test04): New test. (cherry picked from commit fe993b469c528230d9a01e1ae2208610f960dd9f) Diff: --- libstdc++-v3/include/std/ranges | 6 +++--- .../std/ranges/adaptors/detail/semiregular_box.cc | 18 ++++++++++++++++++ libstdc++-v3/testsuite/std/ranges/single_view.cc | 16 ++++++++++++++++ 3 files changed, 37 insertions(+), 3 deletions(-) diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges index b3173f4f7c7..5486dd86000 100644 --- a/libstdc++-v3/include/std/ranges +++ b/libstdc++-v3/include/std/ranges @@ -163,7 +163,7 @@ namespace ranges constexpr explicit __box(in_place_t, _Args&&... __args) noexcept(is_nothrow_constructible_v<_Tp, _Args...>) - : _M_value{std::forward<_Args>(__args)...} + : _M_value(std::forward<_Args>(__args)...) { } constexpr bool @@ -180,11 +180,11 @@ namespace ranges constexpr _Tp* operator->() noexcept - { return &_M_value; } + { return std::__addressof(_M_value); } constexpr const _Tp* operator->() const noexcept - { return &_M_value; } + { return std::__addressof(_M_value); } }; } // namespace __detail diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/detail/semiregular_box.cc b/libstdc++-v3/testsuite/std/ranges/adaptors/detail/semiregular_box.cc index 65931dea51a..ed694e04fd1 100644 --- a/libstdc++-v3/testsuite/std/ranges/adaptors/detail/semiregular_box.cc +++ b/libstdc++-v3/testsuite/std/ranges/adaptors/detail/semiregular_box.cc @@ -81,3 +81,21 @@ test01() return true; } static_assert(test01()); + +template + struct A { + A() requires make_semiregular; + A(int, int); + A(std::initializer_list) = delete; + }; + +void +test02() +{ + // PR libstdc++/100475 + static_assert(std::semiregular>); + __box> x2(std::in_place, 0, 0); + + static_assert(!std::semiregular>); + __box> x1(std::in_place, 0, 0); +} diff --git a/libstdc++-v3/testsuite/std/ranges/single_view.cc b/libstdc++-v3/testsuite/std/ranges/single_view.cc index 97bc39bb636..f530cc07565 100644 --- a/libstdc++-v3/testsuite/std/ranges/single_view.cc +++ b/libstdc++-v3/testsuite/std/ranges/single_view.cc @@ -58,9 +58,25 @@ test03() VERIFY(*std::ranges::begin(s3) == 'a'); } +void +test04() +{ + // PR libstdc++/100475 + struct A { + A() = default; + A(int, int) { } + A(std::initializer_list) = delete; + void operator&() const = delete; + }; + std::ranges::single_view s(std::in_place, 0, 0); + s.data(); + std::as_const(s).data(); +} + int main() { test01(); test02(); test03(); + test04(); }