mirror of
https://github.com/gcc-mirror/gcc.git
synced 2026-05-06 23:25:24 +02:00
C++20 removes a number of std::allocator members that have correct defaults provided by std::allocator_traits, so aren't needed. Several extensions including __gnu_cxx::hash_map and tr1 containers are no longer usable with std::allocator in C++20 mode. They need to be updated to use __gnu_cxx::__alloc_traits in a follow-up patch. * include/bits/alloc_traits.h (allocator_traits<allocator<T>>::allocate): Ignore hint for C++20. (allocator_traits<allocator<T>>::construct): Perform placement new directly for C++20, instead of calling allocator<T>::construct. (allocator_traits<allocator<T>>::destroy): Call destructor directly for C++20, instead of calling allocator<T>::destroy. (allocator_traits<allocator<T>>::max_size): Return value directly for C++20, instead of calling std::allocator<T>::max_size(). (__do_alloc_on_copy, __do_alloc_on_move, __do_alloc_on_swap): Do not define for C++17 and up. (__alloc_on_copy, __alloc_on_move, __alloc_on_swap): Use if-constexpr for C++17 and up, instead of tag dispatching. * include/bits/allocator.h (allocator<void>): Remove for C++20. (allocator::pointer, allocator::const_pointer, allocator::reference) (allocator::const_reference, allocator::rebind): Remove for C++20. * include/bits/basic_string.h (basic_string): Use __alloc_traits to rebind allocator. * include/bits/memoryfwd.h (allocator<void>): Remove for C++20. * include/ext/debug_allocator.h: Use __alloc_traits for rebinding. * include/ext/malloc_allocator.h (malloc_allocator::~malloc_allocator) (malloc_allocator::pointer, malloc_allocator::const_pointer) (malloc_allocator::reference, malloc_allocator::const_reference) (malloc_allocator::rebind, malloc_allocator::max_size) (malloc_allocator::construct, malloc_allocator::destroy): Do not define for C++20. (malloc_allocator::_M_max_size): Define new function. * include/ext/new_allocator.h (new_allocator::~new_allocator) (new_allocator::pointer, new_allocator::const_pointer) (new_allocator::reference, new_allocator::const_reference) (new_allocator::rebind, new_allocator::max_size) (new_allocator::construct, new_allocator::destroy): Do not define for C++20. (new_allocator::_M_max_size): Define new function. * include/ext/rc_string_base.h (__rc_string_base::_Rep): Use __alloc_traits to rebind allocator. * include/ext/rope (_Rope_rep_base, _Rope_base): Likewise. (rope::rope(CharT, const allocator_type&)): Use __alloc_traits to construct character. * include/ext/slist (_Slist_base): Use __alloc_traits to rebind allocator. * include/ext/sso_string_base.h (__sso_string_base::_M_max_size): Use __alloc_traits. * include/ext/throw_allocator.h (throw_allocator): Do not use optional members of std::allocator, use __alloc_traits members instead. * include/ext/vstring.h (__versa_string): Use __alloc_traits. * include/ext/vstring_util.h (__vstring_utility): Likewise. * include/std/memory: Include <bits/alloc_traits.h>. * testsuite/20_util/allocator/8230.cc: Use __gnu_test::max_size. * testsuite/20_util/allocator/rebind_c++20.cc: New test. * testsuite/20_util/allocator/requirements/typedefs.cc: Do not check for pointer, const_pointer, reference, const_reference or rebind in C++20. * testsuite/20_util/allocator/requirements/typedefs_c++20.cc: New test. * testsuite/23_containers/deque/capacity/29134.cc: Use __gnu_test::max_size. * testsuite/23_containers/forward_list/capacity/1.cc: Likewise. * testsuite/23_containers/list/capacity/29134.cc: Likewise. * testsuite/23_containers/map/capacity/29134.cc: Likewise. * testsuite/23_containers/multimap/capacity/29134.cc: Likewise. * testsuite/23_containers/multiset/capacity/29134.cc: Likewise. * testsuite/23_containers/set/capacity/29134.cc: Likewise. * testsuite/23_containers/vector/capacity/29134.cc: Likewise. * testsuite/ext/malloc_allocator/variadic_construct.cc: Do not run test for C++20. * testsuite/ext/new_allocator/variadic_construct.cc: Likewise. * testsuite/ext/vstring/capacity/29134.cc: Use __gnu_test::max_size. * testsuite/util/replacement_memory_operators.h: Do not assume Alloc::pointer exists. * testsuite/util/testsuite_allocator.h (__gnu_test::max_size): Define helper to call max_size for any allocator. From-SVN: r277300
193 lines
5.7 KiB
C++
193 lines
5.7 KiB
C++
// Allocators -*- 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/>.
|
|
|
|
/*
|
|
* Copyright (c) 1996-1997
|
|
* Silicon Graphics Computer Systems, Inc.
|
|
*
|
|
* Permission to use, copy, modify, distribute and sell this software
|
|
* and its documentation for any purpose is hereby granted without fee,
|
|
* provided that the above copyright notice appear in all copies and
|
|
* that both that copyright notice and this permission notice appear
|
|
* in supporting documentation. Silicon Graphics makes no
|
|
* representations about the suitability of this software for any
|
|
* purpose. It is provided "as is" without express or implied warranty.
|
|
*/
|
|
|
|
/** @file ext/debug_allocator.h
|
|
* This file is a GNU extension to the Standard C++ Library.
|
|
*/
|
|
|
|
#ifndef _DEBUG_ALLOCATOR_H
|
|
#define _DEBUG_ALLOCATOR_H 1
|
|
|
|
#include <stdexcept>
|
|
#include <bits/functexcept.h>
|
|
#include <ext/alloc_traits.h>
|
|
|
|
namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
|
|
{
|
|
_GLIBCXX_BEGIN_NAMESPACE_VERSION
|
|
|
|
/**
|
|
* @brief A meta-allocator with debugging bits.
|
|
* @ingroup allocators
|
|
*
|
|
* This is precisely the allocator defined in the C++03 Standard.
|
|
*/
|
|
template<typename _Alloc>
|
|
class debug_allocator
|
|
{
|
|
template<typename> friend class debug_allocator;
|
|
|
|
typedef __alloc_traits<_Alloc> _Traits;
|
|
|
|
public:
|
|
typedef typename _Traits::size_type size_type;
|
|
typedef typename _Traits::difference_type difference_type;
|
|
typedef typename _Traits::pointer pointer;
|
|
typedef typename _Traits::const_pointer const_pointer;
|
|
typedef typename _Traits::reference reference;
|
|
typedef typename _Traits::const_reference const_reference;
|
|
typedef typename _Traits::value_type value_type;
|
|
|
|
template<typename _Up>
|
|
class rebind
|
|
{
|
|
typedef typename _Traits::template rebind<_Up>::other __other;
|
|
|
|
public:
|
|
typedef debug_allocator<__other> other;
|
|
};
|
|
|
|
private:
|
|
// _M_extra is the number of objects that correspond to the
|
|
// extra space where debug information is stored.
|
|
size_type _M_extra;
|
|
|
|
_Alloc _M_allocator;
|
|
|
|
template<typename _Alloc2,
|
|
typename = typename __alloc_traits<_Alloc2>::template
|
|
rebind<value_type>::other>
|
|
struct __convertible
|
|
{ };
|
|
|
|
template<typename _Alloc2>
|
|
struct __convertible<_Alloc2, _Alloc>
|
|
{
|
|
typedef void* __type;
|
|
};
|
|
|
|
size_type _S_extra()
|
|
{
|
|
const std::size_t __obj_size = sizeof(value_type);
|
|
return (sizeof(size_type) + __obj_size - 1) / __obj_size;
|
|
}
|
|
|
|
public:
|
|
debug_allocator() : _M_extra(_S_extra()) { }
|
|
|
|
template<typename _Alloc2>
|
|
debug_allocator(const debug_allocator<_Alloc2>& __a2,
|
|
typename __convertible<_Alloc2>::__type = 0)
|
|
: _M_allocator(__a2._M_allocator), _M_extra(_S_extra()) { }
|
|
|
|
debug_allocator(const _Alloc& __a)
|
|
: _M_allocator(__a), _M_extra(_S_extra()) { }
|
|
|
|
_GLIBCXX_NODISCARD pointer
|
|
allocate(size_type __n)
|
|
{
|
|
pointer __res = _M_allocator.allocate(__n + _M_extra);
|
|
size_type* __ps = reinterpret_cast<size_type*>(__res);
|
|
*__ps = __n;
|
|
return __res + _M_extra;
|
|
}
|
|
|
|
_GLIBCXX_NODISCARD pointer
|
|
allocate(size_type __n, const void* __hint)
|
|
{
|
|
pointer __res = _M_allocator.allocate(__n + _M_extra, __hint);
|
|
size_type* __ps = reinterpret_cast<size_type*>(__res);
|
|
*__ps = __n;
|
|
return __res + _M_extra;
|
|
}
|
|
|
|
void
|
|
deallocate(pointer __p, size_type __n)
|
|
{
|
|
using std::__throw_runtime_error;
|
|
if (__p)
|
|
{
|
|
pointer __real_p = __p - _M_extra;
|
|
if (*reinterpret_cast<size_type*>(__real_p) != __n)
|
|
__throw_runtime_error("debug_allocator::deallocate wrong size");
|
|
_M_allocator.deallocate(__real_p, __n + _M_extra);
|
|
}
|
|
else
|
|
__throw_runtime_error("debug_allocator::deallocate null pointer");
|
|
}
|
|
|
|
void
|
|
construct(pointer __p, const value_type& __val)
|
|
{ _Traits::construct(_M_allocator, __p, __val); }
|
|
|
|
#if __cplusplus >= 201103L
|
|
template<typename _Tp, typename... _Args>
|
|
void
|
|
construct(_Tp* __p, _Args&&... __args)
|
|
{
|
|
_Traits::construct(_M_allocator, __p,
|
|
std::forward<_Args>(__args)...);
|
|
}
|
|
#endif
|
|
|
|
template<typename _Tp>
|
|
void
|
|
destroy(_Tp* __p)
|
|
{ _Traits::destroy(_M_allocator, __p); }
|
|
|
|
size_type
|
|
max_size() const throw()
|
|
{ return _Traits::max_size(_M_allocator) - _M_extra; }
|
|
|
|
template<typename _Alloc2>
|
|
friend bool
|
|
operator==(const debug_allocator& __lhs,
|
|
const debug_allocator<_Alloc2>& __rhs) _GLIBCXX_NOTHROW
|
|
{ return __lhs._M_allocator == debug_allocator(__rhs)._M_allocator; }
|
|
|
|
template<typename _Alloc2>
|
|
friend bool
|
|
operator!=(const debug_allocator& __lhs,
|
|
const debug_allocator<_Alloc2>& __rhs) _GLIBCXX_NOTHROW
|
|
{ return !(__lhs == __rhs); }
|
|
};
|
|
|
|
_GLIBCXX_END_NAMESPACE_VERSION
|
|
} // namespace
|
|
|
|
#endif
|