85f2411493
This patch is the first part of library support for constexpr std::vector and std::string. This only includes the changes to std::allocator, std::allocator_traits, std::construct_at, std::destroy_at, std::destroy and std::destroy_n. std::allocator::allocate and std::allocator::deallocate need to be added so that they can be intercepted by the compiler during constant evaluation. Outside of constant evaluation those new member functions just forward to the existing implementation in the base class. PR c++/91369 Implement P0784R7 changes to allocation and construction * include/bits/alloc_traits.h: Include <bits/stl_construct.h>. (allocator_traits::_S_allocate, allocator_traits::_S_construct) (allocator_traits::_S_destroy, allocator_traits::_S_max_size) (allocator_traits::_S_select, allocator_traits::allocate) (allocator_traits::deallocate, allocator_traits::construct) (allocator_traits::destroy, allocator_traits::max_size) (allocator_traits::select_on_container_copy_construction) (allocator_traits<allocator<T>>): Add constexpr specifier for C++20. (allocator_traits<allocator<T>>::construct): Use construct_at. (allocator_traits<allocator<T>>::destroy): Use destroy_at. (__alloc_on_copy, __alloc_on_move, __alloc_on_swap): Add constexpr specifier. (_Destroy(ForwardIterator, ForwardIterator, Alloc&)) (_Destroy(ForwardIterator, ForwardIterator, allocator<T>&)): Move here from <bits/stl_construct.h>. * include/bits/allocator.h (allocator::~allocator): Remove for C++20. (allocator::allocate, allocate::deallocate): Define for C++20 and up. (operator==, operator!=): Add constexpr specifier for C++20. * include/bits/stl_construct.h: Don't include <ext/alloc_traits.h>. (destroy_at): For C++20 add constexpr specifier and support for destroying arrays. (construct_at): Define new function for C++20. (_Construct): Return result of placement new-expression. For C++11 and up add constexpr. For C++20 dispatch to std::construct_at during constant evaluation. (_Destroy(pointer)): Add constexpr specifier. For C++20 dispatch to std::destroy_at during constant evaluation. (_Destroy_aux::__destroy, _Destroy_n_aux::__destroy_n): Add constexpr specifier for C++20. (_Destroy(ForwardIterator, ForwardIterator)) (_Destroy(ForwardIterator, Size)): Likewise. Do not elide trivial destructors during constant evaluation. (destroy, destroy_n): Add constexpr specifier for C++20. (_Destroy(ForwardIterator, ForwardIterator, Alloc&)) (_Destroy(ForwardIterator, ForwardIterator, allocator<T>&)): Move to <bits/alloc_traits.h>, to remove dependency on allocators. * include/bits/stl_uninitialized.h: Include <ext/alloc_traits.h>. Include <bits/stl_pair.h> instead of <utility>. * include/ext/alloc_traits.h: Always include <bits/alloc_traits.h>. (__alloc_traits::construct, __alloc_traits::destroy) (__alloc_traits::_S_select_on_copy, __alloc_traits::_S_on_swap): Add constexpr specifier. * include/ext/malloc_allocator.h (operator==, operator!=): Add constexpr specifier for C++20. * include/ext/new_allocator.h (operator==, operator!=): Likewise. * testsuite/20_util/headers/memory/synopsis.cc: Add constexpr. * testsuite/20_util/scoped_allocator/69293_neg.cc: Ignore additional errors due to constexpr function called after failed static_assert. * testsuite/20_util/specialized_algorithms/construct_at/1.cc: New test. * testsuite/23_containers/vector/cons/destructible_debug_neg.cc: Ignore additional errors due to constexpr function called after failed static_assert. * testsuite/23_containers/vector/cons/destructible_neg.cc: Likewise. From-SVN: r277342
198 lines
5.4 KiB
C++
198 lines
5.4 KiB
C++
// Allocator that wraps operator new -*- C++ -*-
|
|
|
|
// Copyright (C) 2001-2019 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
|
|
// <http://www.gnu.org/licenses/>.
|
|
|
|
/** @file ext/new_allocator.h
|
|
* This file is a GNU extension to the Standard C++ Library.
|
|
*/
|
|
|
|
#ifndef _NEW_ALLOCATOR_H
|
|
#define _NEW_ALLOCATOR_H 1
|
|
|
|
#include <bits/c++config.h>
|
|
#include <new>
|
|
#include <bits/functexcept.h>
|
|
#include <bits/move.h>
|
|
#if __cplusplus >= 201103L
|
|
#include <type_traits>
|
|
#endif
|
|
|
|
namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
|
|
{
|
|
_GLIBCXX_BEGIN_NAMESPACE_VERSION
|
|
|
|
/**
|
|
* @brief An allocator that uses global new, as per [20.4].
|
|
* @ingroup allocators
|
|
*
|
|
* This is precisely the allocator defined in the C++ Standard.
|
|
* - all allocation calls operator new
|
|
* - all deallocation calls operator delete
|
|
*
|
|
* @tparam _Tp Type of allocated object.
|
|
*/
|
|
template<typename _Tp>
|
|
class new_allocator
|
|
{
|
|
public:
|
|
typedef _Tp value_type;
|
|
typedef std::size_t size_type;
|
|
typedef std::ptrdiff_t difference_type;
|
|
#if __cplusplus <= 201703L
|
|
typedef _Tp* pointer;
|
|
typedef const _Tp* const_pointer;
|
|
typedef _Tp& reference;
|
|
typedef const _Tp& const_reference;
|
|
|
|
template<typename _Tp1>
|
|
struct rebind
|
|
{ typedef new_allocator<_Tp1> other; };
|
|
#endif
|
|
|
|
#if __cplusplus >= 201103L
|
|
// _GLIBCXX_RESOLVE_LIB_DEFECTS
|
|
// 2103. propagate_on_container_move_assignment
|
|
typedef std::true_type propagate_on_container_move_assignment;
|
|
#endif
|
|
|
|
_GLIBCXX20_CONSTEXPR
|
|
new_allocator() _GLIBCXX_USE_NOEXCEPT { }
|
|
|
|
_GLIBCXX20_CONSTEXPR
|
|
new_allocator(const new_allocator&) _GLIBCXX_USE_NOEXCEPT { }
|
|
|
|
template<typename _Tp1>
|
|
_GLIBCXX20_CONSTEXPR
|
|
new_allocator(const new_allocator<_Tp1>&) _GLIBCXX_USE_NOEXCEPT { }
|
|
|
|
#if __cplusplus <= 201703L
|
|
~new_allocator() _GLIBCXX_USE_NOEXCEPT { }
|
|
|
|
pointer
|
|
address(reference __x) const _GLIBCXX_NOEXCEPT
|
|
{ return std::__addressof(__x); }
|
|
|
|
const_pointer
|
|
address(const_reference __x) const _GLIBCXX_NOEXCEPT
|
|
{ return std::__addressof(__x); }
|
|
#endif
|
|
|
|
// NB: __n is permitted to be 0. The C++ standard says nothing
|
|
// about what the return value is when __n == 0.
|
|
_GLIBCXX_NODISCARD _Tp*
|
|
allocate(size_type __n, const void* = static_cast<const void*>(0))
|
|
{
|
|
if (__n > this->_M_max_size())
|
|
std::__throw_bad_alloc();
|
|
|
|
#if __cpp_aligned_new
|
|
if (alignof(_Tp) > __STDCPP_DEFAULT_NEW_ALIGNMENT__)
|
|
{
|
|
std::align_val_t __al = std::align_val_t(alignof(_Tp));
|
|
return static_cast<_Tp*>(::operator new(__n * sizeof(_Tp), __al));
|
|
}
|
|
#endif
|
|
return static_cast<_Tp*>(::operator new(__n * sizeof(_Tp)));
|
|
}
|
|
|
|
// __p is not permitted to be a null pointer.
|
|
void
|
|
deallocate(_Tp* __p, size_type __t)
|
|
{
|
|
#if __cpp_aligned_new
|
|
if (alignof(_Tp) > __STDCPP_DEFAULT_NEW_ALIGNMENT__)
|
|
{
|
|
::operator delete(__p,
|
|
# if __cpp_sized_deallocation
|
|
__t * sizeof(_Tp),
|
|
# endif
|
|
std::align_val_t(alignof(_Tp)));
|
|
return;
|
|
}
|
|
#endif
|
|
::operator delete(__p
|
|
#if __cpp_sized_deallocation
|
|
, __t * sizeof(_Tp)
|
|
#endif
|
|
);
|
|
}
|
|
|
|
#if __cplusplus <= 201703L
|
|
size_type
|
|
max_size() const _GLIBCXX_USE_NOEXCEPT
|
|
{ return _M_max_size(); }
|
|
|
|
#if __cplusplus >= 201103L
|
|
template<typename _Up, typename... _Args>
|
|
void
|
|
construct(_Up* __p, _Args&&... __args)
|
|
noexcept(noexcept(::new((void *)__p)
|
|
_Up(std::forward<_Args>(__args)...)))
|
|
{ ::new((void *)__p) _Up(std::forward<_Args>(__args)...); }
|
|
|
|
template<typename _Up>
|
|
void
|
|
destroy(_Up* __p)
|
|
noexcept(noexcept( __p->~_Up()))
|
|
{ __p->~_Up(); }
|
|
#else
|
|
// _GLIBCXX_RESOLVE_LIB_DEFECTS
|
|
// 402. wrong new expression in [some_] allocator::construct
|
|
void
|
|
construct(pointer __p, const _Tp& __val)
|
|
{ ::new((void *)__p) _Tp(__val); }
|
|
|
|
void
|
|
destroy(pointer __p) { __p->~_Tp(); }
|
|
#endif
|
|
#endif // ! C++20
|
|
|
|
template<typename _Up>
|
|
friend _GLIBCXX20_CONSTEXPR bool
|
|
operator==(const new_allocator&, const new_allocator<_Up>&)
|
|
_GLIBCXX_NOTHROW
|
|
{ return true; }
|
|
|
|
template<typename _Up>
|
|
friend _GLIBCXX20_CONSTEXPR bool
|
|
operator!=(const new_allocator&, const new_allocator<_Up>&)
|
|
_GLIBCXX_NOTHROW
|
|
{ return false; }
|
|
|
|
private:
|
|
_GLIBCXX_CONSTEXPR size_type
|
|
_M_max_size() const _GLIBCXX_USE_NOEXCEPT
|
|
{
|
|
#if __PTRDIFF_MAX__ < __SIZE_MAX__
|
|
return std::size_t(__PTRDIFF_MAX__) / sizeof(_Tp);
|
|
#else
|
|
return std::size_t(-1) / sizeof(_Tp);
|
|
#endif
|
|
}
|
|
};
|
|
|
|
_GLIBCXX_END_NAMESPACE_VERSION
|
|
} // namespace
|
|
|
|
#endif
|