From patchwork Wed Feb 12 20:41:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Palka X-Patchwork-Id: 1237079 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-519434-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha1 header.s=default header.b=qfrpl0/K; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=DRnVlAhm; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48Hs6C5Hgpz9sPK for ; Thu, 13 Feb 2020 07:42:59 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; q=dns; s= default; b=jnJ/Hrn/yFFKHySlOJngDULmjOmuRpyhe1OJKVUayQr3pfdE8j747 bmaIn9NhbS6ys3VS8GphBdw4aTy8qLARFAYTsUA1FDTRTUldGp/ioaKzeO/0gOxQ OYhftadpXHIPoxRPiVeFbugEvMhSggUTkUOS3707r5X0DZy5468mmM= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; s=default; bh=nvfH3TvLfeJPax79PDHOBkrucMY=; b=qfrpl0/Kbub+NU53PZCad0xNEMxx bU3q7DKSjr8Sowa4tu03hOZ5ayQ0d53h3ZywT7M3rkYZtnFnJRr4WLM1b64zkY1K W/FSXxesCPMjkXXm85xhrx2AQGwEqhkLcT4/NKxNEgmQHu7rJiEfpoA7aW+mhVl7 sNlG1999NqVvA6I= Received: (qmail 102586 invoked by alias); 12 Feb 2020 20:42:10 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 102459 invoked by uid 89); 12 Feb 2020 20:42:09 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-24.3 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=unavailable version=3.3.1 spammy=2.18 X-HELO: us-smtp-1.mimecast.com Received: from us-smtp-delivery-1.mimecast.com (HELO us-smtp-1.mimecast.com) (207.211.31.120) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 12 Feb 2020 20:42:01 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581540119; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UolJa6JJoqSaA4/mwxLhE19Eg5PVPioQsMRakKj4Xoo=; b=DRnVlAhmApPnFQyngMPmm+TmNWtocvuHh/IQw0DLOYZJhjUxv6N78j5vGlF2lR00B+IrXm Ij823jtAS+SwJHyMItPN/s18awoj96QmsTClDr9+MuzJWlCB64IqbnfC6Ehk2hTdYu01Z+ 6W9ukGy7wa5brBTMw2u5tBMnauj7AJM= Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-277-qG_co9-IMvSdK51r1XDuZQ-1; Wed, 12 Feb 2020 15:41:51 -0500 Received: by mail-qk1-f197.google.com with SMTP id c206so2199002qkg.6 for ; Wed, 12 Feb 2020 12:41:51 -0800 (PST) Received: from localhost.localdomain (ool-457d493a.dyn.optonline.net. [69.125.73.58]) by smtp.gmail.com with ESMTPSA id n32sm161397qtk.66.2020.02.12.12.41.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Feb 2020 12:41:48 -0800 (PST) From: Patrick Palka To: gcc-patches@gcc.gnu.org Cc: libstdc++@gcc.gnu.org, jwakely@redhat.com, Patrick Palka Subject: [PATCH 2/2] libstdc++: Implement ranges [specialized.algorithms] Date: Wed, 12 Feb 2020 15:41:07 -0500 Message-Id: <20200212204107.4124217-2-ppalka@redhat.com> In-Reply-To: <20200212204107.4124217-1-ppalka@redhat.com> References: <20200212204107.4124217-1-ppalka@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-IsSubscribed: yes This implements all the ranges members defined in [specialized.algorithms]: ranges::uninitialized_default_construct ranges::uninitialized_value_construct ranges::uninitialized_copy ranges::uninitialized_copy_n ranges::uninitialized_move ranges::uninitialized_move_n ranges::uninitialized_fill ranges::uninitialized_fill_n ranges::construct_at ranges::destroy_at ranges::destroy It also implements (hopefully correctly) the "obvious" optimizations for these algos, namely that if the output range has a trivial value type and if the appropriate operation won't throw then we can dispatch to the standard ranges version of the algorithm which will then potentially enable further optimizations. libstdc++-v3/ChangeLog: * include/Makefile.am: Add . * include/Makefile.in: Regenerate. * include/bits/ranges_uninitialized.h: New header. * include/std/memory: Include it. * testsuite/20_util/specialized_algorithms/destroy/constrained.cc: New test. * .../uninitialized_copy/constrained.cc: New test. * .../uninitialized_default_construct/constrained.cc: New test. * .../uninitialized_fill/constrained.cc: New test. * .../uninitialized_move/constrained.cc: New test. * .../uninitialized_value_construct/constrained.cc: New test. --- libstdc++-v3/include/Makefile.am | 1 + libstdc++-v3/include/Makefile.in | 1 + .../include/bits/ranges_uninitialized.h | 491 ++++++++++++++++++ libstdc++-v3/include/std/memory | 1 + .../destroy/constrained.cc | 76 +++ .../uninitialized_copy/constrained.cc | 166 ++++++ .../constrained.cc | 147 ++++++ .../uninitialized_fill/constrained.cc | 137 +++++ .../uninitialized_move/constrained.cc | 176 +++++++ .../constrained.cc | 140 +++++ 10 files changed, 1336 insertions(+) create mode 100644 libstdc++-v3/include/bits/ranges_uninitialized.h create mode 100644 libstdc++-v3/testsuite/20_util/specialized_algorithms/destroy/constrained.cc create mode 100644 libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_copy/constrained.cc create mode 100644 libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_default_construct/constrained.cc create mode 100644 libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_fill/constrained.cc create mode 100644 libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_move/constrained.cc create mode 100644 libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_value_construct/constrained.cc diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am index 614222db400..e131ce04f8c 100644 --- a/libstdc++-v3/include/Makefile.am +++ b/libstdc++-v3/include/Makefile.am @@ -159,6 +159,7 @@ bits_headers = \ ${bits_srcdir}/range_cmp.h \ ${bits_srcdir}/ranges_algobase.h \ ${bits_srcdir}/ranges_algo.h \ + ${bits_srcdir}/ranges_uninitialized.h \ ${bits_srcdir}/refwrap.h \ ${bits_srcdir}/regex.h \ ${bits_srcdir}/regex.tcc \ diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in index 7ee6a1e3f61..ae20f6b1d21 100644 --- a/libstdc++-v3/include/Makefile.in +++ b/libstdc++-v3/include/Makefile.in @@ -504,6 +504,7 @@ bits_headers = \ ${bits_srcdir}/range_cmp.h \ ${bits_srcdir}/ranges_algobase.h \ ${bits_srcdir}/ranges_algo.h \ + ${bits_srcdir}/ranges_uninitialized.h \ ${bits_srcdir}/refwrap.h \ ${bits_srcdir}/regex.h \ ${bits_srcdir}/regex.tcc \ diff --git a/libstdc++-v3/include/bits/ranges_uninitialized.h b/libstdc++-v3/include/bits/ranges_uninitialized.h new file mode 100644 index 00000000000..252295faed7 --- /dev/null +++ b/libstdc++-v3/include/bits/ranges_uninitialized.h @@ -0,0 +1,491 @@ +// Raw memory manipulators -*- C++ -*- + +// Copyright (C) 2020 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// Under Section 7 of GPL version 3, you are granted additional +// permissions described in the GCC Runtime Library Exception, version +// 3.1, as published by the Free Software Foundation. + +// You should have received a copy of the GNU General Public License and +// a copy of the GCC Runtime Library Exception along with this program; +// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see +// . + +/** @file bits/ranges_uninitialized.h + * This is an internal header file, included by other library headers. + * Do not attempt to use it directly. @headername{memory} + */ + +#ifndef _RANGES_UNINITIALIZED_H +#define _RANGES_UNINITIALIZED_H 1 + +#if __cplusplus > 201703L +#if __cpp_lib_concepts + +#include + +namespace std _GLIBCXX_VISIBILITY(default) +{ +_GLIBCXX_BEGIN_NAMESPACE_VERSION +namespace ranges +{ + namespace __detail + { + template + constexpr void* + __voidify(_Tp& __obj) noexcept + { + return const_cast + (static_cast(std::__addressof(__obj))); + } + + template + concept __nothrow_input_iterator + = (input_iterator<_Iter> + && is_lvalue_reference_v> + && same_as>, + iter_value_t<_Iter>>); + + template + concept __nothrow_sentinel = sentinel_for<_Sent, _Iter>; + + template + concept __nothrow_input_range + = (range<_Range> + && __nothrow_input_iterator> + && __nothrow_sentinel, iterator_t<_Range>>); + + template + concept __nothrow_forward_iterator + = (__nothrow_input_iterator<_Iter> + && forward_iterator<_Iter> + && __nothrow_sentinel<_Iter, _Iter>); + + template + concept __nothrow_forward_range + = (__nothrow_input_range<_Range> + && __nothrow_forward_iterator>); + } // namespace __detail + + template<__detail::__nothrow_input_iterator _Iter, + __detail::__nothrow_sentinel<_Iter> _Sent> + requires destructible> + constexpr _Iter + destroy(_Iter __first, _Sent __last) noexcept; + + namespace __detail + { + template + requires destructible> + struct _DestroyGuard + { + private: + _Iter _M_first; + const _Iter* _M_cur; + + public: + explicit + _DestroyGuard(const _Iter* __iter) + : _M_first(*__iter), _M_cur(__iter) + { } + + void + release() noexcept + { _M_cur = nullptr; } + + ~_DestroyGuard() + { + if (_M_cur != nullptr) + ranges::destroy(std::move(_M_first), *_M_cur); + } + }; + + template + requires destructible> + && is_trivially_destructible_v> + struct _DestroyGuard<_Iter> + { + explicit + _DestroyGuard(const _Iter*) + { } + + void + release() noexcept + { } + }; + } // namespace __detail + + template<__detail::__nothrow_forward_iterator _Iter, + __detail::__nothrow_sentinel<_Iter> _Sent> + requires default_initializable> + _Iter + uninitialized_default_construct(_Iter __first, _Sent __last) + { + using _ValueType = remove_reference_t>; + if constexpr (is_trivially_default_constructible_v<_ValueType>) + return ranges::next(__first, __last); + else + { + auto __guard = __detail::_DestroyGuard(&__first); + for (; __first != __last; ++__first) + ::new (__detail::__voidify(*__first)) _ValueType; + __guard.release(); + return __first; + } + } + + template<__detail::__nothrow_forward_range _Range> + requires default_initializable> + safe_iterator_t<_Range> + uninitialized_default_construct(_Range&& __r) + { + return ranges::uninitialized_default_construct(ranges::begin(__r), + ranges::end(__r)); + } + + template<__detail::__nothrow_forward_iterator _Iter> + requires default_initializable> + _Iter + uninitialized_default_construct_n(_Iter __first, + iter_difference_t<_Iter> __n) + { + using _ValueType = remove_reference_t>; + if constexpr (is_trivially_default_constructible_v<_ValueType>) + return ranges::next(__first, __n); + else + { + auto __guard = __detail::_DestroyGuard(&__first); + for (; __n > 0; ++__first, (void) --__n) + ::new (__detail::__voidify(*__first)) _ValueType; + __guard.release(); + return __first; + } + } + + template<__detail::__nothrow_forward_iterator _Iter, + __detail::__nothrow_sentinel<_Iter> _Sent> + requires default_initializable> + _Iter + uninitialized_value_construct(_Iter __first, _Sent __last) + { + using _ValueType = remove_reference_t>; + if constexpr (is_trivial_v<_ValueType> + && is_copy_assignable_v<_ValueType>) + return ranges::fill(__first, __last, _ValueType()); + else + { + auto __guard = __detail::_DestroyGuard(&__first); + for (; __first != __last; ++__first) + ::new (__detail::__voidify(*__first)) _ValueType(); + __guard.release(); + return __first; + } + } + + template<__detail::__nothrow_forward_range _Range> + requires default_initializable> + safe_iterator_t<_Range> + uninitialized_value_construct(_Range&& __r) + { + return ranges::uninitialized_value_construct(ranges::begin(__r), + ranges::end(__r)); + } + + template<__detail::__nothrow_forward_iterator _Iter> + requires default_initializable> + _Iter + uninitialized_value_construct_n(_Iter __first, iter_difference_t<_Iter> __n) + { + using _ValueType = remove_reference_t>; + if constexpr (is_trivial_v<_ValueType> + && is_copy_assignable_v<_ValueType>) + return ranges::fill_n(__first, __n, _ValueType()); + else + { + auto __guard = __detail::_DestroyGuard(&__first); + for (; __n > 0; ++__first, (void) --__n) + ::new (__detail::__voidify(*__first)) _ValueType(); + __guard.release(); + return __first; + } + } + + template + using uninitialized_copy_result = copy_result<_Iter, _Out>; + + template _ISent, + __detail::__nothrow_forward_iterator _Out, + __detail::__nothrow_sentinel<_Out> _OSent> + requires constructible_from, iter_reference_t<_Iter>> + uninitialized_copy_result<_Iter, _Out> + uninitialized_copy(_Iter __ifirst, _ISent __ilast, + _Out __ofirst, _OSent __olast) + { + using _OutType = remove_reference_t>; + if constexpr (sized_sentinel_for<_ISent, _Iter> + && sized_sentinel_for<_OSent, _Out> + && is_trivial_v<_OutType> + && is_nothrow_assignable_v<_OutType, + iter_reference_t<_Iter>>) + { + auto __d1 = ranges::distance(__ifirst, __ilast); + auto __d2 = ranges::distance(__ofirst, __olast); + return ranges::copy_n(__ifirst, std::min(__d1, __d2), __ofirst); + } + else + { + auto __guard = __detail::_DestroyGuard(&__ofirst); + for (; __ifirst != __ilast && __ofirst != __olast; + ++__ofirst, (void)++__ifirst) + ::new (__detail::__voidify(*__ofirst)) _OutType(*__ifirst); + __guard.release(); + return {__ifirst, __ofirst}; + } + } + + template + requires constructible_from, + range_reference_t<_IRange>> + uninitialized_copy_result, + safe_iterator_t<_ORange>> + uninitialized_copy(_IRange&& __inr, _ORange&& __outr) + { + return ranges::uninitialized_copy(ranges::begin(__inr), + ranges::end(__inr), + ranges::begin(__outr), + ranges::end(__outr)); + } + + template + using uninitialized_copy_n_result = uninitialized_copy_result<_Iter, _Out>; + + template _Sent> + requires constructible_from, iter_reference_t<_Iter>> + uninitialized_copy_n_result<_Iter, _Out> + uninitialized_copy_n(_Iter __ifirst, iter_difference_t<_Iter> __n, + _Out __ofirst, _Sent __olast) + { + using _OutType = remove_reference_t>; + if constexpr (sized_sentinel_for<_Sent, _Out> + && is_trivial_v<_OutType> + && is_nothrow_assignable_v<_OutType, + iter_reference_t<_Iter>>) + { + auto __d = ranges::distance(__ofirst, __olast); + return ranges::copy_n(__ifirst, std::min(__n, __d), __ofirst); + } + else + { + auto __guard = __detail::_DestroyGuard(&__ofirst); + for (; __n > 0 && __ofirst != __olast; + ++__ofirst, (void)++__ifirst, (void)--__n) + ::new (__detail::__voidify(*__ofirst)) _OutType(*__ifirst); + __guard.release(); + return {__ifirst, __ofirst}; + } + } + + template + using uninitialized_move_result = uninitialized_copy_result<_Iter, _Out>; + + template _ISent, + __detail::__nothrow_forward_iterator _Out, + __detail::__nothrow_sentinel<_Out> _OSent> + requires constructible_from, + iter_rvalue_reference_t<_Iter>> + uninitialized_move_result<_Iter, _Out> + uninitialized_move(_Iter __ifirst, _ISent __ilast, + _Out __ofirst, _OSent __olast) + { + using _OutType = remove_reference_t>; + if constexpr (sized_sentinel_for<_ISent, _Iter> + && sized_sentinel_for<_OSent, _Out> + && is_trivial_v<_OutType> + && is_nothrow_assignable_v<_OutType, + iter_rvalue_reference_t<_Iter>>) + { + auto __d1 = ranges::distance(__ifirst, __ilast); + auto __d2 = ranges::distance(__ofirst, __olast); + return ranges::copy_n(std::make_move_iterator(__ifirst), + std::min(__d1, __d2), __ofirst); + } + else + { + auto __guard = __detail::_DestroyGuard(&__ofirst); + for (; __ifirst != __ilast && __ofirst != __olast; + ++__ofirst, (void)++__ifirst) + ::new (__detail::__voidify(*__ofirst)) + _OutType(ranges::iter_move(__ifirst)); + __guard.release(); + return {__ifirst, __ofirst}; + } + } + + template + requires constructible_from, + range_rvalue_reference_t<_IRange>> + uninitialized_move_result, + safe_iterator_t<_ORange>> + uninitialized_move(_IRange&& __inr, _ORange&& __outr) + { + return ranges::uninitialized_move(ranges::begin(__inr), + ranges::end(__inr), + ranges::begin(__outr), + ranges::end(__outr)); + } + + template + using uninitialized_move_n_result = uninitialized_copy_result<_Iter, _Out>; + + template _Sent> + requires constructible_from, + iter_rvalue_reference_t<_Iter>> + uninitialized_move_n_result<_Iter, _Out> + uninitialized_move_n(_Iter __ifirst, iter_difference_t<_Iter> __n, + _Out __ofirst, _Sent __olast) + { + using _OutType = remove_reference_t>; + if constexpr (sized_sentinel_for<_Sent, _Out> + && is_trivial_v<_OutType> + && is_nothrow_assignable_v<_OutType, + iter_rvalue_reference_t<_Iter>>) + { + auto __d = ranges::distance(__ofirst, __olast); + return ranges::copy_n(std::make_move_iterator(__ifirst), + std::min(__n, __d), __ofirst); + } + else + { + auto __guard = __detail::_DestroyGuard(&__ofirst); + for (; __n > 0 && __ofirst != __olast; + ++__ofirst, (void)++__ifirst, (void)--__n) + ::new (__detail::__voidify(*__ofirst)) + _OutType(ranges::iter_move(__ifirst)); + __guard.release(); + return {__ifirst, __ofirst}; + } + } + + template<__detail::__nothrow_forward_iterator _Iter, + __detail::__nothrow_sentinel<_Iter> _Sent, typename _Tp> + requires constructible_from, const _Tp&> + _Iter + uninitialized_fill(_Iter __first, _Sent __last, const _Tp& __x) + { + using _ValueType = remove_reference_t>; + if constexpr (is_trivial_v<_ValueType> + && is_nothrow_assignable_v<_ValueType, const _Tp&>) + return ranges::fill(__first, __last, __x); + else + { + auto __guard = __detail::_DestroyGuard(&__first); + for (; __first != __last; ++__first) + ::new (__detail::__voidify(*__first)) _ValueType(__x); + __guard.release(); + return __first; + } + } + + template<__detail::__nothrow_forward_range _Range, typename _Tp> + requires constructible_from, const _Tp&> + safe_iterator_t<_Range> + uninitialized_fill(_Range&& __r, const _Tp& __x) + { + return ranges::uninitialized_fill(ranges::begin(__r), ranges::end(__r), + __x); + } + + template<__detail::__nothrow_forward_iterator _Iter, typename _Tp> + requires constructible_from, const _Tp&> + _Iter + uninitialized_fill_n(_Iter __first, iter_difference_t<_Iter> __n, + const _Tp& __x) + { + using _ValueType = remove_reference_t>; + if constexpr (is_trivial_v<_ValueType> + && is_nothrow_assignable_v<_ValueType, const _Tp&>) + return ranges::fill_n(__first, __n, __x); + else + { + auto __guard = __detail::_DestroyGuard(&__first); + for (; __n > 0; ++__first, (void)--__n) + ::new (__detail::__voidify(*__first)) _ValueType(__x); + __guard.release(); + return __first; + } + } + + template + requires requires { ::new (declval()) _Tp(declval<_Args>()...); } + constexpr _Tp* + construct_at(_Tp* __location, _Args&&... __args) + { + return ::new (__detail::__voidify(*__location)) + _Tp(std::forward<_Args>(__args)...); + } + + template + constexpr void + destroy_at(_Tp* __location) noexcept + { + if constexpr (is_array_v<_Tp>) + ranges::destroy(ranges::begin(*__location), ranges::end(*__location)); + else + __location->~_Tp(); + } + + template<__detail::__nothrow_input_iterator _Iter, + __detail::__nothrow_sentinel<_Iter> _Sent> + requires destructible> + constexpr _Iter + destroy(_Iter __first, _Sent __last) noexcept + { + if constexpr (is_trivially_destructible_v>) + return ranges::next(__first, __last); + else + { + for (; __first != __last; ++__first) + ranges::destroy_at(addressof(*__first)); + return __first; + } + } + + template<__detail::__nothrow_input_range _Range> + requires destructible> + constexpr safe_iterator_t<_Range> + destroy(_Range&& __r) noexcept + { return ranges::destroy(ranges::begin(__r), ranges::end(__r)); } + + template<__detail::__nothrow_input_iterator _Iter> + requires destructible> + constexpr _Iter + destroy_n(_Iter __first, iter_difference_t<_Iter> __n) noexcept + { + if constexpr (is_trivially_destructible_v>) + return ranges::next(__first, __n); + else + { + for (; __n > 0; ++__first, (void)--__n) + ranges::destroy_at(addressof(*__first)); + return __first; + } + } +} +_GLIBCXX_END_NAMESPACE_VERSION +} // namespace std +#endif // concepts +#endif // C++20 +#endif // _RANGES_UNINITIALIZED_H diff --git a/libstdc++-v3/include/std/memory b/libstdc++-v3/include/std/memory index b4caa1167a7..823bd21a5ad 100644 --- a/libstdc++-v3/include/std/memory +++ b/libstdc++-v3/include/std/memory @@ -66,6 +66,7 @@ #include #include #include +#include #if __cplusplus >= 201103L # include // std::exception diff --git a/libstdc++-v3/testsuite/20_util/specialized_algorithms/destroy/constrained.cc b/libstdc++-v3/testsuite/20_util/specialized_algorithms/destroy/constrained.cc new file mode 100644 index 00000000000..730625d9a21 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/specialized_algorithms/destroy/constrained.cc @@ -0,0 +1,76 @@ +// Copyright (C) 2020 Free Software Foundation, Inc. +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +// { dg-options "-std=gnu++2a" } +// { dg-do run { target c++2a } } + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +namespace ranges = std::ranges; + +struct X +{ + X() + { ++count; } + + ~X() + { --count; } + + static inline int count = 0; +}; + +void +test01() +{ + for (int k = 0; k < 3; k++) + { + constexpr int size = 1024; + auto buffer = std::unique_ptr(new char[sizeof(X)*size]); + std::span rx((X *)buffer.get(), size); + + ranges::uninitialized_default_construct(rx); + VERIFY( X::count == size ); + + auto i = rx.cbegin(); + if (k == 0) + i = ranges::destroy(rx); + else if (k == 1) + i = ranges::destroy(rx.begin(), rx.end()); + else if (k == 2) + i = ranges::destroy_n(rx.begin(), size); + else + __builtin_abort(); + + VERIFY( i == rx.cend() ); + VERIFY( X::count == 0 ); + } +} + +int +main() +{ + test01(); +} diff --git a/libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_copy/constrained.cc b/libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_copy/constrained.cc new file mode 100644 index 00000000000..948406432cb --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_copy/constrained.cc @@ -0,0 +1,166 @@ +// Copyright (C) 2020 Free Software Foundation, Inc. +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +// { dg-options "-std=gnu++2a" } +// { dg-do run { target c++2a } } + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +using __gnu_test::test_input_range; +using __gnu_test::test_forward_range; + +namespace ranges = std::ranges; + +template +void +test01(const std::vector &ix) +{ + static_assert(std::copy_constructible); + static_assert(std::equality_comparable); + + for (int k = 0; k < 7; k++) + { + int size = ix.size(); + auto buffer = std::unique_ptr(new char[sizeof(T)*size]); + std::span rx((T *)buffer.get(), size); + + ranges::uninitialized_copy_result res = {ix.cbegin(), rx.cbegin()}; + if (k == 0) + res = ranges::uninitialized_copy(ix.begin(), ix.end(), + rx.begin(), rx.end()); + else if (k == 1) + res = ranges::uninitialized_copy(ix, rx); + else if (k == 2) + res = ranges::uninitialized_copy_n(ix.begin(), size, + rx.begin(), rx.end()); + else if (k == 3) + res = ranges::uninitialized_copy(ix.begin(), ix.end(), + rx.cbegin(), rx.cend()); + else if (k == 4) + res = ranges::uninitialized_copy(ix, std::as_const(rx)); + else if (k == 5) + res = ranges::uninitialized_copy_n(ix.begin(), size, + rx.cbegin(), rx.cend()); + else if (k == 6) + res = ranges::uninitialized_copy_n(ix.begin(), size/2, + rx.cbegin(), rx.cend()); + else if (k == 7) + res = ranges::uninitialized_copy_n(ix.begin(), size, + rx.cbegin(), rx.cbegin()+size/2); + else + __builtin_abort(); + + if (k == 6 || k == 7) + { + VERIFY( ranges::distance(ix.cbegin(), res.in) == size/2 ); + VERIFY( ranges::distance(rx.cbegin(), res.out) == size/2 ); + VERIFY( ranges::equal(ix.begin(), ix.begin()+size/2, + rx.begin(), rx.begin()+size/2) ); + ranges::destroy(rx.begin(), rx.begin()+size/2); + } + else + { + VERIFY( res.in == ix.cend() ); + VERIFY( res.out == rx.cend() ); + VERIFY( ranges::equal(ix, rx) ); + ranges::destroy(rx); + } + } +} + +struct X +{ + static constexpr int limit = 67; + static inline int copy_construct_count = 0; + static inline int destruct_count = 0; + + struct exception {}; + + bool live = false; + + X() + { live = true; } + + X& operator=(const X&) = delete; + + X(const X&) + { + live = true; + if (copy_construct_count >= limit) + throw exception{}; + copy_construct_count++; + } + + ~X() + { + VERIFY( live ); + live = false; + destruct_count++; + } +}; + +template +void +test02() +{ + constexpr int size = 100; + X x[size]; + // FIXME: Should be test_input_range? + test_forward_range ix(x); + + auto buffer = std::unique_ptr(new char[sizeof(X)*size]); + test_forward_range rx((X *)buffer.get(), (X *)buffer.get() + size); + try + { + X::copy_construct_count = 0; + X::destruct_count = 0; + if constexpr (test_sized) + ranges::uninitialized_copy_n(ix.begin(), size, rx.begin(), rx.end()); + else + ranges::uninitialized_copy(ix, rx); + VERIFY( false && "exception not thrown" ); + } + catch (const X::exception&) + { + VERIFY( X::copy_construct_count == X::limit ); + VERIFY( X::destruct_count == X::limit ); + } +} + +int +main() +{ + test01({1,2,3,4,5}); + test01({1,2,3,4,5}); + test01({1,2,3,4,5}); + test01({1.1,2.1,3.1,4.1}); + test01({1.1,2.1,3.1,4.1}); + test01>({{'a','b'}, {'c','d'}, {'e','f'}}); + test01({"the", "quick", "brown", "fox"}); + + test02(); + test02(); +} diff --git a/libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_default_construct/constrained.cc b/libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_default_construct/constrained.cc new file mode 100644 index 00000000000..6ef24cc7ea0 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_default_construct/constrained.cc @@ -0,0 +1,147 @@ +// Copyright (C) 2020 Free Software Foundation, Inc. +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +// { dg-options "-std=gnu++2a" } +// { dg-do run { target c++2a } } + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +using __gnu_test::test_forward_range; + +namespace ranges = std::ranges; + +template +void +test01() +{ + static_assert(std::default_initializable); + static_assert(std::equality_comparable); + + for (int k = 0; k < 6; k++) + { + constexpr int size = 1024; + auto buffer = std::unique_ptr(new char[sizeof(T)*size]); + std::span rx((T *)buffer.get(), size); + + T t; + if constexpr (std::is_fundamental_v) + { + std::memset(&t, 0xCC, sizeof(t)); + ranges::fill(rx, t); + } + + auto i = rx.cbegin(); + if (k == 0) + i = ranges::uninitialized_default_construct(rx.begin(), rx.end()); + else if (k == 1) + i = ranges::uninitialized_default_construct(rx); + else if (k == 2) + i = ranges::uninitialized_default_construct_n(rx.begin(), 1024); + else if constexpr (std::is_fundamental_v) + continue; + else if (k == 3) + i = ranges::uninitialized_default_construct(rx.cbegin(), rx.cend()); + else if (k == 4) + i = ranges::uninitialized_default_construct(std::as_const(rx)); + else if (k == 5) + i = ranges::uninitialized_default_construct_n(rx.cbegin(), 1024); + else + __builtin_abort(); + + VERIFY( i == rx.cend() ); + VERIFY( ranges::find_if(rx, [&t](const T& v) { return t != v; }) == i ); + + ranges::destroy(rx); + } +} + +struct X +{ + static constexpr int limit = 67; + static inline int construct_count = 0; + static inline int destruct_count = 0; + + struct exception {}; + + bool live = false; + + X() + { + if (construct_count >= limit) + throw exception{}; + construct_count++; + live = true; + } + + ~X() + { + VERIFY( live ); + live = false; + destruct_count++; + } +}; + +template +void +test02() +{ + constexpr int size = 100; + auto buffer = std::unique_ptr(new char[sizeof(X)*size]); + test_forward_range rx((X *)buffer.get(), (X *)buffer.get() + size); + try + { + X::construct_count = 0; + X::destruct_count = 0; + if constexpr (test_sized) + ranges::uninitialized_default_construct_n(rx.begin(), size); + else + ranges::uninitialized_default_construct(rx); + VERIFY( false && "exception not thrown" ); + } + catch (const X::exception&) + { + VERIFY( X::construct_count == X::limit ); + VERIFY( X::destruct_count == X::limit ); + } +} + +int +main() +{ + test01(); + test01(); + test01(); + test01(); + test01(); + test01>(); + test01(); + test01>(); + test01>>>(); + test01>(); + + test02(); + test02(); +} diff --git a/libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_fill/constrained.cc b/libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_fill/constrained.cc new file mode 100644 index 00000000000..c95fd666942 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_fill/constrained.cc @@ -0,0 +1,137 @@ +// Copyright (C) 2020 Free Software Foundation, Inc. +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +// { dg-options "-std=gnu++2a" } +// { dg-do run { target c++2a } } + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +using __gnu_test::test_forward_range; + +namespace ranges = std::ranges; + +template +void +test01(const T& value) +{ + static_assert(std::equality_comparable); + + for (int k = 0; k < 6; k++) + { + constexpr int size = 1024; + auto buffer = std::unique_ptr(new char[sizeof(T)*size]); + std::span rx((T *)buffer.get(), size); + + auto i = rx.cbegin(); + if (k == 0) + i = ranges::uninitialized_fill(rx.begin(), rx.end(), value); + else if (k == 1) + i = ranges::uninitialized_fill(rx, value); + else if (k == 2) + i = ranges::uninitialized_fill_n(rx.begin(), 1024, value); + else if (k == 3) + i = ranges::uninitialized_fill(rx.cbegin(), rx.cend(), value); + else if (k == 4) + i = ranges::uninitialized_fill(std::as_const(rx), value); + else if (k == 5) + i = ranges::uninitialized_fill_n(rx.cbegin(), 1024, value); + else + __builtin_abort(); + + VERIFY( i == rx.cend() ); + VERIFY( ranges::find_if(rx, [&value](const T& v) { return value != v; }) == i ); + + ranges::destroy(rx); + } +} + +struct X +{ + static constexpr int limit = 67; + static inline int construct_count = 0; + static inline int destruct_count = 0; + + struct exception {}; + + bool live = false; + + X(int) + { + if (construct_count >= limit) + throw exception{}; + construct_count++; + live = true; + } + + ~X() + { + VERIFY( live ); + live = false; + destruct_count++; + } +}; + +template +void +test02() +{ + constexpr int size = 100; + auto buffer = std::unique_ptr(new char[sizeof(X)*size]); + test_forward_range rx((X *)buffer.get(), (X *)buffer.get() + size); + int value = 5; + try + { + X::construct_count = 0; + X::destruct_count = 0; + if constexpr (test_sized) + ranges::uninitialized_fill_n(rx.begin(), size, value); + else + ranges::uninitialized_fill(rx, value); + VERIFY( false && "exception not thrown" ); + } + catch (const X::exception&) + { + VERIFY( X::construct_count == X::limit ); + VERIFY( X::destruct_count == X::limit ); + } +} + +int +main() +{ + test01(5); + test01(3); + test01(17); + test01(2.18); + test01(3.98); + test01>({'a', 'b', 'c', 'd'}); + test01("hello"); + test01>({1.1,2.1,3.1}); + test01>>>({{{3.4},{1}},{{7.9}}}); + + test02(); + test02(); +} diff --git a/libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_move/constrained.cc b/libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_move/constrained.cc new file mode 100644 index 00000000000..796c7ca8f46 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_move/constrained.cc @@ -0,0 +1,176 @@ +// Copyright (C) 2020 Free Software Foundation, Inc. +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +// { dg-options "-std=gnu++2a" } +// { dg-do run { target c++2a } } + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +using __gnu_test::test_input_range; +using __gnu_test::test_forward_range; + +namespace ranges = std::ranges; + +template +void +test01(std::vector ix) +{ + static_assert(std::move_constructible); + static_assert(std::equality_comparable); + + const auto saved_ix = ix; + + for (int k = 0; k < 7; k++) + { + ix = saved_ix; + + int size = ix.size(); + auto buffer = std::unique_ptr(new char[sizeof(T)*size]); + std::span rx((T *)buffer.get(), size); + + ranges::uninitialized_move_result res = {ix.cbegin(), rx.cbegin()}; + if (k == 0) + res = ranges::uninitialized_move(ix.begin(), ix.end(), + rx.begin(), rx.end()); + else if (k == 1) + res = ranges::uninitialized_move(ix, rx); + else if (k == 2) + res = ranges::uninitialized_move_n(ix.begin(), size, + rx.begin(), rx.end()); + else if (k == 3) + res = ranges::uninitialized_move(ix.begin(), ix.end(), + rx.cbegin(), rx.cend()); + else if (k == 4) + res = ranges::uninitialized_move(ix, std::as_const(rx)); + else if (k == 5) + res = ranges::uninitialized_move_n(ix.begin(), size, + rx.cbegin(), rx.cend()); + else if (k == 6) + res = ranges::uninitialized_move_n(ix.begin(), size/2, + rx.cbegin(), rx.cend()); + else if (k == 7) + res = ranges::uninitialized_move_n(ix.begin(), size, + rx.cbegin(), rx.cbegin()+size/2); + else + __builtin_abort(); + + if (k == 6 || k == 7) + { + VERIFY( ranges::distance(ix.cbegin(), res.in) == size/2 ); + VERIFY( ranges::distance(rx.cbegin(), res.out) == size/2 ); + VERIFY( ranges::equal(saved_ix.begin(), saved_ix.begin()+size/2, + rx.begin(), rx.begin()+size/2) ); + ranges::destroy(rx.begin(), rx.begin()+size/2); + } + else + { + VERIFY( res.in == ix.cend() ); + VERIFY( res.out == rx.cend() ); + VERIFY( ranges::equal(saved_ix, rx) ); + ranges::destroy(rx); + } + } +} + +struct X +{ + static constexpr int limit = 67; + static inline int move_construct_count = 0; + static inline int destruct_count = 0; + + struct exception {}; + + bool live = false; + bool moved_from = false; + + X() + { live = true; moved_from = false; } + + X& operator=(const X&) = delete; + X(const X&) = delete; + + X&& operator=(X&&) = delete; + + X(X&& other) + { + VERIFY( !other.moved_from ); + other.moved_from = true; + live = true; + if (move_construct_count >= limit) + throw exception{}; + move_construct_count++; + } + + ~X() + { + VERIFY( live ); + live = false; + destruct_count++; + } +}; + +template +void +test02() +{ + constexpr int size = 100; + X x[size]; + // FIXME: Should be test_input_range? + test_forward_range ix(x); + + auto buffer = std::unique_ptr(new char[sizeof(X)*size]); + test_forward_range rx((X *)buffer.get(), (X *)buffer.get() + size); + try + { + X::move_construct_count = 0; + X::destruct_count = 0; + if constexpr (test_sized) + ranges::uninitialized_move_n(ix.begin(), size, rx.begin(), rx.end()); + else + ranges::uninitialized_move(ix, rx); + VERIFY( false && "exception not thrown" ); + } + catch (const X::exception&) + { + VERIFY( X::move_construct_count == X::limit ); + VERIFY( X::destruct_count == X::limit ); + } +} + +int +main() +{ + test01({1,2,3,4,5}); + test01({1,2,3,4,5}); + test01({1,2,3,4,5}); + test01({1.1,2.1,3.1,4.1}); + test01({1.1,2.1,3.1,4.1}); + test01>({{'a','b'}, {'c','d'}, {'e','f'}}); + test01({"the", "quick", "brown", "fox"}); + + test02(); + test02(); +} diff --git a/libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_value_construct/constrained.cc b/libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_value_construct/constrained.cc new file mode 100644 index 00000000000..5928bc04c70 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/specialized_algorithms/uninitialized_value_construct/constrained.cc @@ -0,0 +1,140 @@ +// Copyright (C) 2020 Free Software Foundation, Inc. +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +// { dg-options "-std=gnu++2a" } +// { dg-do run { target c++2a } } + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +using __gnu_test::test_forward_range; + +namespace ranges = std::ranges; + +template +void +test01() +{ + static_assert(std::default_initializable); + static_assert(std::equality_comparable); + + for (int k = 0; k < 6; k++) + { + constexpr int size = 1024; + auto buffer = std::unique_ptr(new char[sizeof(T)*size]); + std::span rx((T *)buffer.get(), size); + + T t{}; + + auto i = rx.cbegin(); + if (k == 0) + i = ranges::uninitialized_value_construct(rx.begin(), rx.end()); + else if (k == 1) + i = ranges::uninitialized_value_construct(rx); + else if (k == 2) + i = ranges::uninitialized_value_construct_n(rx.begin(), 1024); + else if (k == 3) + i = ranges::uninitialized_value_construct(rx.cbegin(), rx.cend()); + else if (k == 4) + i = ranges::uninitialized_value_construct(std::as_const(rx)); + else if (k == 5) + i = ranges::uninitialized_value_construct_n(rx.cbegin(), 1024); + else + __builtin_abort(); + + VERIFY( i == rx.cend() ); + VERIFY( ranges::find_if(rx, [&t](const T& v) { return t != v; }) == i ); + + ranges::destroy(rx); + } +} + +struct X +{ + static constexpr int limit = 67; + static inline int construct_count = 0; + static inline int destruct_count = 0; + + struct exception {}; + + bool live = false; + + X() + { + if (construct_count >= limit) + throw exception{}; + construct_count++; + live = true; + } + + ~X() + { + VERIFY( live ); + live = false; + destruct_count++; + } +}; + +template +void +test02() +{ + constexpr int size = 100; + auto buffer = std::unique_ptr(new char[sizeof(X)*size]); + test_forward_range rx((X *)buffer.get(), (X *)buffer.get() + size); + try + { + X::construct_count = 0; + X::destruct_count = 0; + if constexpr (test_sized) + ranges::uninitialized_value_construct_n(rx.begin(), size); + else + ranges::uninitialized_value_construct(rx); + VERIFY( false && "exception not thrown" ); + } + catch (const X::exception&) + { + VERIFY( X::construct_count == X::limit ); + VERIFY( X::destruct_count == X::limit ); + } +} + +int +main() +{ + test01(); + test01(); + test01(); + test01(); + test01(); + test01>(); + test01(); + test01>(); + test01>>>(); + test01>(); + + test02(); + test02(); +}