From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id CFE54385842E; Fri, 15 Oct 2021 17:27:31 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CFE54385842E MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r12-4448] libstdc++: Make non-propagating-cache fully constexpr [PR101263] X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: ad820b0bb5f8342a8db2831d1f15c103583a3ba0 X-Git-Newrev: 2c564e813c0626802e5bfb066c094933d5e6a774 Message-Id: <20211015172731.CFE54385842E@sourceware.org> Date: Fri, 15 Oct 2021 17:27:31 +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: Fri, 15 Oct 2021 17:27:31 -0000 https://gcc.gnu.org/g:2c564e813c0626802e5bfb066c094933d5e6a774 commit r12-4448-g2c564e813c0626802e5bfb066c094933d5e6a774 Author: Jonathan Wakely Date: Fri Oct 15 14:49:21 2021 +0100 libstdc++: Make non-propagating-cache fully constexpr [PR101263] libstdc++-v3/ChangeLog: PR libstdc++/101263 * include/std/ranges (__cached): New wrapper struct. (__non_propagating_cache): Use __cached for contained value. (__non_propagating_cache::_M_emplace_deref): Add constexpr. Use std::construct_at instead of placement new. * testsuite/std/ranges/adaptors/join.cc: Check constexpr works. Diff: --- libstdc++-v3/include/std/ranges | 42 +++++++++++++++++----- libstdc++-v3/testsuite/std/ranges/adaptors/join.cc | 13 +++++++ 2 files changed, 46 insertions(+), 9 deletions(-) diff --git a/libstdc++-v3/include/std/ranges b/libstdc++-v3/include/std/ranges index 07eae0cf94b..b8de400dfbb 100644 --- a/libstdc++-v3/include/std/ranges +++ b/libstdc++-v3/include/std/ranges @@ -1159,9 +1159,34 @@ namespace views::__adaptor // (such as join_view::_M_inner). }; + template + struct __cached + { + struct _Deref_t { }; + static constexpr _Deref_t __deref{}; + + // Initialize _M_t directly from the result of dereferencing __i. + // This avoids any unwanted temporary materialization that would + // occur if *__i was bound to a reference before initializing _M_t. + template + constexpr explicit + __cached(_Deref_t, _Iter&& __i) + : _M_t(*__i) + { } + + template + constexpr explicit + __cached(_Args&&... __args) + : _M_t(std::forward<_Args>(__args)...) + { } + + _Tp _M_t; + }; + template requires is_object_v<_Tp> - struct __non_propagating_cache<_Tp> : protected _Optional_base<_Tp> + struct __non_propagating_cache<_Tp> + : protected _Optional_base<__cached<_Tp>> { __non_propagating_cache() = default; @@ -1205,23 +1230,22 @@ namespace views::__adaptor constexpr _Tp& operator*() noexcept - { return this->_M_get(); } + { return this->_M_get()._M_t; } constexpr const _Tp& operator*() const noexcept - { return this->_M_get(); } + { return this->_M_get()._M_t; } template - _Tp& + constexpr _Tp& _M_emplace_deref(const _Iter& __i) { this->_M_reset(); - // Using _Optional_base::_M_construct to initialize from '*__i' - // would incur an extra move due to the indirection, so we instead - // use placement new directly. - ::new ((void *) std::__addressof(this->_M_payload._M_payload)) _Tp(*__i); + // Use the special constructor of __cached<_Tp> that does *__i. + std::construct_at(std::__addressof(this->_M_payload._M_payload), + std::in_place, __cached<_Tp>::__deref, __i); this->_M_payload._M_engaged = true; - return this->_M_get(); + return **this; } }; diff --git a/libstdc++-v3/testsuite/std/ranges/adaptors/join.cc b/libstdc++-v3/testsuite/std/ranges/adaptors/join.cc index 50af3fdf729..1ec42381ad2 100644 --- a/libstdc++-v3/testsuite/std/ranges/adaptors/join.cc +++ b/libstdc++-v3/testsuite/std/ranges/adaptors/join.cc @@ -193,6 +193,18 @@ test11() ; } +void +test12() +{ + // PR libstdc++/101263 + constexpr auto b = [] { + auto r = std::views::iota(0, 5) + | std::views::lazy_split(0) + | std::views::join; + return r.begin() != r.end(); + }(); +} + int main() { @@ -207,4 +219,5 @@ main() test09(); test10(); test11(); + test12(); }