caio/clang-p2996
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "[libc++] Remove extension to support allocator<const T>"

Browse Source 
This reverts commit 276ca873. That commit has quite a history at this
point. It was first landed in dbc647643577, which broke std::shared_ptr<T const>
and was reverted in 9138666f5. It was then re-applied in 276ca873, with
the std::shared_ptr issue fixed, but it caused widespread breakage at
Google (which suggests it would cause similar breakage in the wild too),
so now I'm reverting again.

Instead, I will add a escape hatch that vendors can turn on to enable
the extension and perform a phased transition over one or two releases
like we sometimes do when things become non-trivial.
This commit is contained in:
Louis Dionne
2022-03-09 16:59:59 -05:00
parent 0b647fc529
commit a54d028895
32 changed files with 296 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libcxx/docs/ReleaseNotes.rst
View File

@@ -74,11 +74,6 @@ API Changes
- The C++14 function ``std::quoted(const char*)`` is no longer supported in
C++03 or C++11 modes.
- libc++ no longer supports containers of ``const``-qualified element type,
such as ``vector<const T>`` and ``list<const T>``. This used to be supported
as an extension. Likewise, ``std::allocator<const T>`` is no longer supported.
If you were using ``vector<const T>``, replace it with ``vector<T>`` instead.
ABI Changes
-----------

90
libcxx/include/__memory/allocator.h
View File

@@ -37,6 +37,17 @@ public:
template <class _Up> struct _LIBCPP_DEPRECATED_IN_CXX17 rebind {typedef allocator<_Up> other;};
};
template <>
class _LIBCPP_TEMPLATE_VIS allocator<const void>
{
public:
_LIBCPP_DEPRECATED_IN_CXX17 typedef const void* pointer;
_LIBCPP_DEPRECATED_IN_CXX17 typedef const void* const_pointer;
_LIBCPP_DEPRECATED_IN_CXX17 typedef const void value_type;
template <class _Up> struct _LIBCPP_DEPRECATED_IN_CXX17 rebind {typedef allocator<_Up> other;};
};
#endif
// This class provides a non-trivial default constructor to the class that derives from it
@@ -69,7 +80,6 @@ template <class _Tp>
class _LIBCPP_TEMPLATE_VIS allocator
: private __non_trivial_if<!is_void<_Tp>::value, allocator<_Tp> >
{
static_assert(!is_const<_Tp>::value, "std::allocator does not support const types");
static_assert(!is_volatile<_Tp>::value, "std::allocator does not support volatile types");
public:
typedef size_t size_type;
@@ -148,6 +158,84 @@ public:
#endif
};
template <class _Tp>
class _LIBCPP_TEMPLATE_VIS allocator<const _Tp>
: private __non_trivial_if<!is_void<_Tp>::value, allocator<const _Tp> >
{
static_assert(!is_volatile<_Tp>::value, "std::allocator does not support volatile types");
public:
typedef size_t size_type;
typedef ptrdiff_t difference_type;
typedef const _Tp value_type;
typedef true_type propagate_on_container_move_assignment;
typedef true_type is_always_equal;
_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
allocator() _NOEXCEPT = default;
template <class _Up>
_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
allocator(const allocator<_Up>&) _NOEXCEPT { }
_LIBCPP_NODISCARD_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
const _Tp* allocate(size_t __n) {
if (__n > allocator_traits<allocator>::max_size(*this))
__throw_bad_array_new_length();
if (__libcpp_is_constant_evaluated()) {
return static_cast<const _Tp*>(::operator new(__n * sizeof(_Tp)));
} else {
return static_cast<const _Tp*>(_VSTD::__libcpp_allocate(__n * sizeof(_Tp), _LIBCPP_ALIGNOF(_Tp)));
}
}
_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
void deallocate(const _Tp* __p, size_t __n) {
if (__libcpp_is_constant_evaluated()) {
::operator delete(const_cast<_Tp*>(__p));
} else {
_VSTD::__libcpp_deallocate((void*) const_cast<_Tp *>(__p), __n * sizeof(_Tp), _LIBCPP_ALIGNOF(_Tp));
}
}
// C++20 Removed members
#if _LIBCPP_STD_VER <= 17 || defined(_LIBCPP_ENABLE_CXX20_REMOVED_ALLOCATOR_MEMBERS)
_LIBCPP_DEPRECATED_IN_CXX17 typedef const _Tp* pointer;
_LIBCPP_DEPRECATED_IN_CXX17 typedef const _Tp* const_pointer;
_LIBCPP_DEPRECATED_IN_CXX17 typedef const _Tp& reference;
_LIBCPP_DEPRECATED_IN_CXX17 typedef const _Tp& const_reference;
template <class _Up>
struct _LIBCPP_DEPRECATED_IN_CXX17 rebind {
typedef allocator<_Up> other;
};
_LIBCPP_DEPRECATED_IN_CXX17 _LIBCPP_INLINE_VISIBILITY
const_pointer address(const_reference __x) const _NOEXCEPT {
return _VSTD::addressof(__x);
}
_LIBCPP_NODISCARD_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY _LIBCPP_DEPRECATED_IN_CXX17
const _Tp* allocate(size_t __n, const void*) {
return allocate(__n);
}
_LIBCPP_DEPRECATED_IN_CXX17 _LIBCPP_INLINE_VISIBILITY size_type max_size() const _NOEXCEPT {
return size_type(~0) / sizeof(_Tp);
}
template <class _Up, class... _Args>
_LIBCPP_DEPRECATED_IN_CXX17 _LIBCPP_INLINE_VISIBILITY
void construct(_Up* __p, _Args&&... __args) {
::new ((void*)__p) _Up(_VSTD::forward<_Args>(__args)...);
}
_LIBCPP_DEPRECATED_IN_CXX17 _LIBCPP_INLINE_VISIBILITY
void destroy(pointer __p) {
__p->~_Tp();
}
#endif
};
template <class _Tp, class _Up>
inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX17
bool operator==(const allocator<_Tp>&, const allocator<_Up>&) _NOEXCEPT {return true;}

15
libcxx/include/__memory/shared_ptr.h
View File

@@ -282,15 +282,13 @@ template <class _Tp, class _Alloc>
struct __shared_ptr_emplace
: __shared_weak_count
{
using _TpAlloc = typename __allocator_traits_rebind<_Alloc, typename remove_cv<_Tp>::type>::type;
using _ControlBlockAlloc = typename __allocator_traits_rebind<_Alloc, __shared_ptr_emplace>::type;
template<class ..._Args>
_LIBCPP_HIDE_FROM_ABI
explicit __shared_ptr_emplace(_Alloc __a, _Args&& ...__args)
: __storage_(_VSTD::move(__a))
{
#if _LIBCPP_STD_VER > 17
using _TpAlloc = typename __allocator_traits_rebind<_Alloc, _Tp>::type;
_TpAlloc __tmp(*__get_alloc());
allocator_traits<_TpAlloc>::construct(__tmp, __get_elem(), _VSTD::forward<_Args>(__args)...);
#else
@@ -307,6 +305,7 @@ struct __shared_ptr_emplace
private:
virtual void __on_zero_shared() _NOEXCEPT {
#if _LIBCPP_STD_VER > 17
using _TpAlloc = typename __allocator_traits_rebind<_Alloc, _Tp>::type;
_TpAlloc __tmp(*__get_alloc());
allocator_traits<_TpAlloc>::destroy(__tmp, __get_elem());
#else
@@ -315,6 +314,7 @@ private:
}
virtual void __on_zero_shared_weak() _NOEXCEPT {
using _ControlBlockAlloc = typename __allocator_traits_rebind<_Alloc, __shared_ptr_emplace>::type;
using _ControlBlockPointer = typename allocator_traits<_ControlBlockAlloc>::pointer;
_ControlBlockAlloc __tmp(*__get_alloc());
__storage_.~_Storage();
@@ -643,9 +643,8 @@ public:
shared_ptr(auto_ptr<_Yp>&& __r)
: __ptr_(__r.get())
{
typedef allocator<typename remove_cv<_Yp>::type> _YpAlloc;
typedef __shared_ptr_pointer<_Yp*, default_delete<_Yp>, _YpAlloc> _CntrlBlk;
__cntrl_ = new _CntrlBlk(__r.get(), default_delete<_Yp>(), _YpAlloc());
typedef __shared_ptr_pointer<_Yp*, default_delete<_Yp>, allocator<_Yp> > _CntrlBlk;
__cntrl_ = new _CntrlBlk(__r.get(), default_delete<_Yp>(), allocator<_Yp>());
__enable_weak_this(__r.get(), __r.get());
__r.release();
}
@@ -891,7 +890,7 @@ private:
template <class _Yp, bool = is_function<_Yp>::value>
struct __shared_ptr_default_allocator
{
typedef allocator<typename remove_cv<_Yp>::type> type;
typedef allocator<_Yp> type;
};
template <class _Yp>
@@ -961,7 +960,7 @@ template<class _Tp, class ..._Args, class = __enable_if_t<!is_array<_Tp>::value>
_LIBCPP_HIDE_FROM_ABI
shared_ptr<_Tp> make_shared(_Args&& ...__args)
{
return _VSTD::allocate_shared<_Tp>(allocator<typename remove_cv<_Tp>::type>(), _VSTD::forward<_Args>(__args)...);
return _VSTD::allocate_shared<_Tp>(allocator<_Tp>(), _VSTD::forward<_Args>(__args)...);
}
template<class _Tp, class _Up>

6
libcxx/include/memory
View File

@@ -895,17 +895,19 @@ void __construct_range_forward(_Alloc& __a, _Iter __begin1, _Iter __end1, _Ptr&
}
template <class _Alloc, class _Source, class _Dest,
class _RawSource = typename remove_const<_Source>::type,
class _RawDest = typename remove_const<_Dest>::type,
class =
typename enable_if<
is_trivially_copy_constructible<_Dest>::value &&
is_same<typename remove_const<_Source>::type, _Dest>::value &&
is_same<_RawSource, _RawDest>::value &&
(__is_default_allocator<_Alloc>::value || !__has_construct<_Alloc, _Dest*, _Source&>::value)
>::type>
_LIBCPP_INLINE_VISIBILITY
void __construct_range_forward(_Alloc&, _Source* __begin1, _Source* __end1, _Dest*& __begin2) {
ptrdiff_t _Np = __end1 - __begin1;
if (_Np > 0) {
_VSTD::memcpy(__begin2, __begin1, _Np * sizeof(_Dest));
_VSTD::memcpy(const_cast<_RawDest*>(__begin2), __begin1, _Np * sizeof(_Dest));
__begin2 += _Np;
}
}

25
libcxx/test/libcxx/containers/sequences/vector/const_value_type.pass.cpp Normal file
View File

@@ -0,0 +1,25 @@
//===----------------------------------------------------------------------===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
//===----------------------------------------------------------------------===//
// UNSUPPORTED: c++03
// <vector>
// vector<const int> v; // an extension
#include <vector>
#include <type_traits>
#include "test_macros.h"
int main(int, char**)
{
std::vector<const int> v = {1, 2, 3};
return 0;
}

10
libcxx/test/libcxx/memory/allocator_void.trivial.compile.pass.cpp
View File

@@ -17,10 +17,18 @@
#include <type_traits>
typedef std::allocator<void> A1;
struct A2 : std::allocator<void> { };
typedef std::allocator<void const> A2;
struct A3 : std::allocator<void> { };
struct A4 : std::allocator<void const> { };
static_assert(std::is_trivially_default_constructible<A1>::value, "");
static_assert(std::is_trivial<A1>::value, "");
static_assert(std::is_trivially_default_constructible<A2>::value, "");
static_assert(std::is_trivial<A2>::value, "");
static_assert(std::is_trivially_default_constructible<A3>::value, "");
static_assert(std::is_trivial<A3>::value, "");
static_assert(std::is_trivially_default_constructible<A4>::value, "");
static_assert(std::is_trivial<A4>::value, "");

4
libcxx/test/libcxx/memory/allocator.cv.verify.cpp → libcxx/test/libcxx/memory/allocator_volatile.verify.cpp
View File

@@ -6,9 +6,9 @@
//
//===----------------------------------------------------------------------===//
// http://wg21.link/LWG2447 gives implementors freedom to reject const or volatile types in `std::allocator`.
// http://wg21.link/LWG2447 gives implementors freedom to reject volatile types in `std::allocator`.
#include <memory>
std::allocator<volatile int> A1; // expected-error@*:* {{std::allocator does not support volatile types}}
std::allocator<const int> A2; // expected-error@*:* {{std::allocator does not support const types}}
std::allocator<const volatile int> A2; // expected-error@*:* {{std::allocator does not support volatile types}}

6
libcxx/test/std/concepts/concepts.lang/concept.default.init/default_initializable.compile.pass.cpp
View File

@@ -202,6 +202,9 @@ void test()
test_not_const<std::array< volatile int, 1>>();
test_false <std::array<const volatile int, 1>>();
test_true <std::deque< int>>();
#ifdef _LIBCPP_VERSION
test_true <std::deque<const int>>();
#endif // _LIBCPP_VERSION
test_true <std::forward_list<int>>();
test_true <std::list<int>>();
test_true <std::vector<int>>();
@@ -220,6 +223,9 @@ void test()
// Container adaptors
test_true <std::stack< int>>();
#ifdef _LIBCPP_VERSION
test_true <std::stack<const int>>();
#endif // _LIBCPP_VERSION
test_true <std::queue<int>>();
test_true <std::priority_queue<int>>();

4
libcxx/test/std/utilities/memory/default.allocator/allocator.ctor.pass.cpp
View File

@@ -37,12 +37,12 @@ TEST_CONSTEXPR_CXX20 bool test() {
int main(int, char**) {
test<char>();
test<int>();
test<char const>();
test<void>();
#if TEST_STD_VER > 17
static_assert(test<char>());
static_assert(test<int>());
static_assert(test<char const>());
static_assert(test<void>());
#endif
return 0;

6
libcxx/test/std/utilities/memory/default.allocator/allocator.dtor.pass.cpp
View File

@@ -26,9 +26,15 @@ int main(int, char**)
{
test<int>();
test<void>();
#ifdef _LIBCPP_VERSION // extension
test<int const>();
#endif // _LIBCPP_VERSION
static_assert(test<int>());
static_assert(test<void>());
#ifdef _LIBCPP_VERSION // extension
static_assert(test<int const>());
#endif // _LIBCPP_VERSION
return 0;
}

1
libcxx/test/std/utilities/memory/default.allocator/allocator.members/allocate.constexpr.size.verify.cpp
View File

@@ -35,5 +35,6 @@ constexpr bool test()
int main(int, char**)
{
static_assert(test<double>()); // expected-error {{static_assert expression is not an integral constant expression}}
LIBCPP_STATIC_ASSERT(test<const double>()); // expected-error {{static_assert expression is not an integral constant expression}}
return 0;
}

1
libcxx/test/std/utilities/memory/default.allocator/allocator.members/allocate.size.pass.cpp
View File

@@ -44,6 +44,7 @@ void test()
int main(int, char**)
{
test<double>();
LIBCPP_ONLY(test<const double>());
return 0;
}

7
libcxx/test/std/utilities/memory/default.allocator/allocator_types.deprecated_in_cxx17.verify.cpp
View File

@@ -35,6 +35,13 @@ int main(int, char**) {
typedef std::allocator<char>::const_reference ConstReference; // expected-warning {{'const_reference' is deprecated}}
typedef std::allocator<char>::rebind<int>::other Rebind; // expected-warning {{'rebind<int>' is deprecated}}
}
{
typedef std::allocator<char const>::pointer Pointer; // expected-warning {{'pointer' is deprecated}}
typedef std::allocator<char const>::const_pointer ConstPointer; // expected-warning {{'const_pointer' is deprecated}}
typedef std::allocator<char const>::reference Reference; // expected-warning {{'reference' is deprecated}}
typedef std::allocator<char const>::const_reference ConstReference; // expected-warning {{'const_reference' is deprecated}}
typedef std::allocator<char const>::rebind<int>::other Rebind; // expected-warning {{'rebind<int>' is deprecated}}
}
{
typedef std::allocator<void>::pointer Pointer; // expected-warning {{'pointer' is deprecated}}
typedef std::allocator<void>::const_pointer ConstPointer; // expected-warning {{'const_pointer' is deprecated}}

3
libcxx/test/std/utilities/memory/default.allocator/allocator_types.pass.cpp
View File

@@ -59,5 +59,8 @@ void test() {
int main(int, char**) {
test<char>();
#ifdef _LIBCPP_VERSION
test<char const>(); // extension
#endif
return 0;
}

11
libcxx/test/std/utilities/memory/default.allocator/allocator_types.removed_in_cxx20.verify.cpp
View File

@@ -31,16 +31,17 @@
template <typename T>
void check()
{
typedef typename std::allocator<T>::pointer AP; // expected-error 2 {{no type named 'pointer'}}
typedef typename std::allocator<T>::const_pointer ACP; // expected-error 2 {{no type named 'const_pointer'}}
typedef typename std::allocator<T>::reference AR; // expected-error 2 {{no type named 'reference'}}
typedef typename std::allocator<T>::const_reference ACR; // expected-error 2 {{no type named 'const_reference'}}
typedef typename std::allocator<T>::template rebind<int>::other ARO; // expected-error 2 {{no member named 'rebind'}}
typedef typename std::allocator<T>::pointer AP; // expected-error 3 {{no type named 'pointer'}}
typedef typename std::allocator<T>::const_pointer ACP; // expected-error 3 {{no type named 'const_pointer'}}
typedef typename std::allocator<T>::reference AR; // expected-error 3 {{no type named 'reference'}}
typedef typename std::allocator<T>::const_reference ACR; // expected-error 3 {{no type named 'const_reference'}}
typedef typename std::allocator<T>::template rebind<int>::other ARO; // expected-error 3 {{no member named 'rebind'}}
}
int main(int, char**)
{
check<char>();
check<char const>();
check<void>();
return 0;
}

4
libcxx/test/std/utilities/memory/specialized.algorithms/specialized.construct/construct_at.pass.cpp
View File

@@ -82,7 +82,7 @@ constexpr bool test()
}
{
std::allocator<Counted> a;
std::allocator<Counted const> a;
Counted const* p = a.allocate(2);
int count = 0;
std::construct_at(p, count);
@@ -93,7 +93,7 @@ constexpr bool test()
assert(count == 1);
p->~Counted();
assert(count == 0);
a.deallocate(const_cast<Counted*>(p), 2);
a.deallocate(p, 2);
}
return true;

37
libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/auto_ptr.pass.cpp
View File

@@ -46,34 +46,19 @@ int A::count = 0;
int main(int, char**)
{
globalMemCounter.reset();
{
std::auto_ptr<A> ptr(new A);
A* raw_ptr = ptr.get();
std::shared_ptr<B> p(std::move(ptr));
assert(A::count == 1);
assert(B::count == 1);
assert(p.use_count() == 1);
assert(p.get() == raw_ptr);
assert(ptr.get() == 0);
}
globalMemCounter.reset();
{
std::auto_ptr<A> ptr(new A);
A* raw_ptr = ptr.get();
std::shared_ptr<B> p(std::move(ptr));
assert(A::count == 1);
assert(B::count == 1);
assert(p.use_count() == 1);
assert(p.get() == raw_ptr);
assert(ptr.get() == 0);
}
assert(A::count == 0);
assert(globalMemCounter.checkOutstandingNewEq(0));
globalMemCounter.reset();
{
std::auto_ptr<A const> ptr(new A);
A const* raw_ptr = ptr.get();
std::shared_ptr<B const> p(std::move(ptr));
assert(A::count == 1);
assert(B::count == 1);
assert(p.use_count() == 1);
assert(p.get() == raw_ptr);
assert(ptr.get() == 0);
}
assert(A::count == 0);
assert(globalMemCounter.checkOutstandingNewEq(0));
#if !defined(TEST_HAS_NO_EXCEPTIONS) && !defined(DISABLE_NEW_COUNT)
{
std::auto_ptr<A> ptr(new A);

33
libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/deduction.pass.cpp
View File

@@ -22,7 +22,7 @@
struct A {};
struct D {
void operator()(A const* ptr) const
void operator()(A* ptr) const
{
delete ptr;
}
@@ -39,49 +39,22 @@ int main(int, char**)
assert(s.use_count() == 2);
assert(s0.get() == s.get());
}
{
std::shared_ptr<A const> s0(new A);
std::weak_ptr<A const> w = s0;
auto s = std::shared_ptr(w);
ASSERT_SAME_TYPE(decltype(s), std::shared_ptr<A const>);
assert(s0.use_count() == 2);
assert(s.use_count() == 2);
assert(s0.get() == s.get());
}
{
std::unique_ptr<A> u(new A);
A* uPointee = u.get();
A* const uPointee = u.get();
std::shared_ptr s = std::move(u);
ASSERT_SAME_TYPE(decltype(s), std::shared_ptr<A>);
assert(u == nullptr);
assert(s.get() == uPointee);
}
{
std::unique_ptr<A const> u(new A);
A const* uPointee = u.get();
std::shared_ptr s = std::move(u);
ASSERT_SAME_TYPE(decltype(s), std::shared_ptr<A const>);
assert(u == nullptr);
assert(s.get() == uPointee);
}
{
std::unique_ptr<A, D> u(new A, D{});
A* uPointee = u.get();
A* const uPointee = u.get();
std::shared_ptr s(std::move(u));
ASSERT_SAME_TYPE(decltype(s), std::shared_ptr<A>);
assert(u == nullptr);
assert(s.get() == uPointee);
}
{
std::unique_ptr<A const, D> u(new A, D{});
A const* uPointee = u.get();
std::shared_ptr s(std::move(u));
ASSERT_SAME_TYPE(decltype(s), std::shared_ptr<A const>);
assert(u == nullptr);
assert(s.get() == uPointee);
}
return 0;
}

3
libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/default.pass.cpp
View File

@@ -26,11 +26,8 @@ void test() {
int main(int, char**) {
test<int>();
test<int const>();
test<A>();
test<A const>();
test<int*>();
test<int const*>();
test<int[]>();
test<int[8]>();

8
libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t.pass.cpp
View File

@@ -17,17 +17,9 @@
int main(int, char**)
{
{
std::shared_ptr<int> p(nullptr);
assert(p.use_count() == 0);
assert(p.get() == 0);
}
{
std::shared_ptr<int const> p(nullptr);
assert(p.use_count() == 0);
assert(p.get() == 0);
}
return 0;
}

25
libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter.pass.cpp
View File

@@ -31,26 +31,21 @@ int A::count = 0;
int main(int, char**)
{
{
std::shared_ptr<A> p(nullptr, test_deleter<A>(3));
assert(A::count == 0);
assert(p.use_count() == 1);
assert(p.get() == 0);
assert(test_deleter<A>::count == 1);
assert(test_deleter<A>::dealloc_count == 0);
std::shared_ptr<A> p(nullptr, test_deleter<A>(3));
assert(A::count == 0);
assert(p.use_count() == 1);
assert(p.get() == 0);
assert(test_deleter<A>::count == 1);
assert(test_deleter<A>::dealloc_count == 0);
#ifndef TEST_HAS_NO_RTTI
test_deleter<A>* d = std::get_deleter<test_deleter<A> >(p);
assert(d);
assert(d->state() == 3);
test_deleter<A>* d = std::get_deleter<test_deleter<A> >(p);
assert(d);
assert(d->state() == 3);
#endif
}
assert(A::count == 0);
assert(test_deleter<A>::count == 0);
assert(test_deleter<A>::dealloc_count == 1);
{
std::shared_ptr<A const> p(nullptr, test_deleter<A const>(3));
assert(p.get() == nullptr);
}
return 0;
return 0;
}

66
libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator.pass.cpp
View File

@@ -32,19 +32,19 @@ int main(int, char**)
{
test_allocator_statistics alloc_stats;
{
std::shared_ptr<A> p(nullptr, test_deleter<A>(3), test_allocator<A>(5, &alloc_stats));
assert(A::count == 0);
assert(p.use_count() == 1);
assert(p.get() == 0);
assert(test_deleter<A>::count == 1);
assert(test_deleter<A>::dealloc_count == 0);
std::shared_ptr<A> p(nullptr, test_deleter<A>(3), test_allocator<A>(5, &alloc_stats));
assert(A::count == 0);
assert(p.use_count() == 1);
assert(p.get() == 0);
assert(test_deleter<A>::count == 1);
assert(test_deleter<A>::dealloc_count == 0);
#ifndef TEST_HAS_NO_RTTI
test_deleter<A>* d = std::get_deleter<test_deleter<A> >(p);
assert(d);
assert(d->state() == 3);
test_deleter<A>* d = std::get_deleter<test_deleter<A> >(p);
assert(d);
assert(d->state() == 3);
#endif
assert(alloc_stats.count == 1);
assert(alloc_stats.alloc_count == 1);
assert(alloc_stats.count == 1);
assert(alloc_stats.alloc_count == 1);
}
assert(A::count == 0);
assert(test_deleter<A>::count == 0);
@@ -52,39 +52,37 @@ int main(int, char**)
assert(alloc_stats.count == 0);
assert(alloc_stats.alloc_count == 0);
test_deleter<A>::dealloc_count = 0;
// Test an allocator with a minimal interface
{
std::shared_ptr<A> p(nullptr, test_deleter<A>(1), bare_allocator<void>());
assert(A::count == 0);
assert(p.use_count() == 1);
assert(p.get() == 0);
assert(test_deleter<A>::count ==1);
assert(test_deleter<A>::dealloc_count == 0);
std::shared_ptr<A> p(nullptr, test_deleter<A>(1), bare_allocator<void>());
assert(A::count == 0);
assert(p.use_count() == 1);
assert(p.get() == 0);
assert(test_deleter<A>::count ==1);
assert(test_deleter<A>::dealloc_count == 0);
#ifndef TEST_HAS_NO_RTTI
test_deleter<A>* d = std::get_deleter<test_deleter<A> >(p);
assert(d);
assert(d->state() == 1);
test_deleter<A>* d = std::get_deleter<test_deleter<A> >(p);
assert(d);
assert(d->state() == 1);
#endif
}
assert(A::count == 0);
assert(test_deleter<A>::count == 0);
assert(test_deleter<A>::dealloc_count == 1);
test_deleter<A>::dealloc_count = 0;
#if TEST_STD_VER >= 11
// Test an allocator that returns class-type pointers
{
std::shared_ptr<A> p(nullptr, test_deleter<A>(1), min_allocator<void>());
assert(A::count == 0);
assert(p.use_count() == 1);
assert(p.get() == 0);
assert(test_deleter<A>::count ==1);
assert(test_deleter<A>::dealloc_count == 0);
std::shared_ptr<A> p(nullptr, test_deleter<A>(1), min_allocator<void>());
assert(A::count == 0);
assert(p.use_count() == 1);
assert(p.get() == 0);
assert(test_deleter<A>::count ==1);
assert(test_deleter<A>::dealloc_count == 0);
#ifndef TEST_HAS_NO_RTTI
test_deleter<A>* d = std::get_deleter<test_deleter<A> >(p);
assert(d);
assert(d->state() == 1);
test_deleter<A>* d = std::get_deleter<test_deleter<A> >(p);
assert(d);
assert(d->state() == 1);
#endif
}
assert(A::count == 0);
@@ -92,11 +90,5 @@ int main(int, char**)
assert(test_deleter<A>::dealloc_count == 1);
#endif
// Make sure we can use this constructor with a pointer-to-const
{
std::shared_ptr<A const> p(nullptr, test_deleter<A const>(3), test_allocator<A>(5, &alloc_stats));
(void)p;
}
return 0;
}

58
libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer.pass.cpp
View File

@@ -29,53 +29,43 @@ int A::count = 0;
int main(int, char**)
{
{
assert(A::count == 0);
A* ptr = new A;
std::shared_ptr<A> p(ptr);
assert(A::count == 1);
assert(p.use_count() == 1);
assert(p.get() == ptr);
A* ptr = new A;
std::shared_ptr<A> p(ptr);
assert(A::count == 1);
assert(p.use_count() == 1);
assert(p.get() == ptr);
}
assert(A::count == 0);
{
assert(A::count == 0);
A const* ptr = new A;
std::shared_ptr<A const> p(ptr);
assert(A::count == 1);
assert(p.use_count() == 1);
assert(p.get() == ptr);
}
{
assert(A::count == 0);
A* ptr = new A;
std::shared_ptr<void> p(ptr);
assert(A::count == 1);
assert(p.use_count() == 1);
assert(p.get() == ptr);
A* ptr = new A;
std::shared_ptr<void> p(ptr);
assert(A::count == 1);
assert(p.use_count() == 1);
assert(p.get() == ptr);
}
assert(A::count == 0);
#if TEST_STD_VER > 14
{
assert(A::count == 0);
std::shared_ptr<A[8]> pA(new A[8]);
assert(pA.use_count() == 1);
assert(A::count == 8);
std::shared_ptr<A[8]> pA(new A[8]);
assert(pA.use_count() == 1);
assert(A::count == 8);
}
assert(A::count == 0);
{
assert(A::count == 0);
std::shared_ptr<A[]> pA(new A[8]);
assert(pA.use_count() == 1);
assert(A::count == 8);
std::shared_ptr<A[]> pA(new A[8]);
assert(pA.use_count() == 1);
assert(A::count == 8);
}
assert(A::count == 0);
{
assert(A::count == 0);
std::shared_ptr<const A[]> pA(new A[8]);
assert(pA.use_count() == 1);
assert(A::count == 8);
std::shared_ptr<const A[]> pA(new A[8]);
assert(pA.use_count() == 1);
assert(A::count == 8);
}
assert(A::count == 0);
#endif
return 0;

26
libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter.pass.cpp
View File

@@ -63,29 +63,23 @@ public:
int main(int, char**)
{
{
A* ptr = new A;
std::shared_ptr<A> p(ptr, test_deleter<A>(3));
assert(A::count == 1);
assert(p.use_count() == 1);
assert(p.get() == ptr);
assert(test_deleter<A>::count == 1);
assert(test_deleter<A>::dealloc_count == 0);
A* ptr = new A;
std::shared_ptr<A> p(ptr, test_deleter<A>(3));
assert(A::count == 1);
assert(p.use_count() == 1);
assert(p.get() == ptr);
assert(test_deleter<A>::count == 1);
assert(test_deleter<A>::dealloc_count == 0);
#ifndef TEST_HAS_NO_RTTI
test_deleter<A>* d = std::get_deleter<test_deleter<A> >(p);
assert(d);
assert(d->state() == 3);
test_deleter<A>* d = std::get_deleter<test_deleter<A> >(p);
assert(d);
assert(d->state() == 3);
#endif
}
assert(A::count == 0);
assert(test_deleter<A>::count == 0);
assert(test_deleter<A>::dealloc_count == 1);
{
A const* ptr = new A;
std::shared_ptr<A const> p(ptr, test_deleter<A const>(3));
assert(p.get() == ptr);
}
{
// Make sure we can't construct with:
// a) a deleter that doesn't have an operator ()(int*)

108
libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator.pass.cpp
View File

@@ -62,92 +62,62 @@ public:
int main(int, char**)
{
test_allocator_statistics alloc_stats;
{
test_allocator_statistics alloc_stats;
{
A* ptr = new A;
std::shared_ptr<A> p(ptr, test_deleter<A>(3), test_allocator<A>(5, &alloc_stats));
assert(A::count == 1);
assert(p.use_count() == 1);
assert(p.get() == ptr);
assert(test_deleter<A>::count == 1);
assert(test_deleter<A>::dealloc_count == 0);
A* ptr = new A;
std::shared_ptr<A> p(ptr, test_deleter<A>(3), test_allocator<A>(5, &alloc_stats));
assert(A::count == 1);
assert(p.use_count() == 1);
assert(p.get() == ptr);
assert(test_deleter<A>::count == 1);
assert(test_deleter<A>::dealloc_count == 0);
#ifndef TEST_HAS_NO_RTTI
test_deleter<A>* d = std::get_deleter<test_deleter<A> >(p);
assert(d);
assert(d->state() == 3);
test_deleter<A>* d = std::get_deleter<test_deleter<A> >(p);
assert(d);
assert(d->state() == 3);
#endif
assert(alloc_stats.count == 1);
assert(alloc_stats.alloc_count == 1);
}
assert(A::count == 0);
assert(test_deleter<A>::count == 0);
assert(test_deleter<A>::dealloc_count == 1);
assert(alloc_stats.count == 0);
assert(alloc_stats.alloc_count == 0);
test_deleter<A>::dealloc_count = 0;
assert(alloc_stats.count == 1);
assert(alloc_stats.alloc_count == 1);
}
{
test_allocator_statistics alloc_stats;
{
A const* ptr = new A;
std::shared_ptr<A const> p(ptr, test_deleter<A const>(3), test_allocator<A>(5, &alloc_stats));
assert(A::count == 1);
assert(p.use_count() == 1);
assert(p.get() == ptr);
assert(test_deleter<A const>::count == 1);
assert(test_deleter<A const>::dealloc_count == 0);
#ifndef TEST_HAS_NO_RTTI
test_deleter<A const>* d = std::get_deleter<test_deleter<A const> >(p);
assert(d);
assert(d->state() == 3);
#endif
assert(alloc_stats.count == 1);
assert(alloc_stats.alloc_count == 1);
}
assert(A::count == 0);
assert(test_deleter<A const>::count == 0);
assert(test_deleter<A const>::dealloc_count == 1);
assert(alloc_stats.count == 0);
assert(alloc_stats.alloc_count == 0);
test_deleter<A const>::dealloc_count = 0;
}
assert(A::count == 0);
assert(test_deleter<A>::count == 0);
assert(test_deleter<A>::dealloc_count == 1);
assert(alloc_stats.count == 0);
assert(alloc_stats.alloc_count == 0);
test_deleter<A>::dealloc_count = 0;
// Test an allocator with a minimal interface
{
A* ptr = new A;
std::shared_ptr<A> p(ptr, test_deleter<A>(3), bare_allocator<void>());
assert(A::count == 1);
assert(p.use_count() == 1);
assert(p.get() == ptr);
assert(test_deleter<A>::count == 1);
assert(test_deleter<A>::dealloc_count == 0);
A* ptr = new A;
std::shared_ptr<A> p(ptr, test_deleter<A>(3), bare_allocator<void>());
assert(A::count == 1);
assert(p.use_count() == 1);
assert(p.get() == ptr);
assert(test_deleter<A>::count == 1);
assert(test_deleter<A>::dealloc_count == 0);
#ifndef TEST_HAS_NO_RTTI
test_deleter<A>* d = std::get_deleter<test_deleter<A> >(p);
assert(d);
assert(d->state() == 3);
test_deleter<A>* d = std::get_deleter<test_deleter<A> >(p);
assert(d);
assert(d->state() == 3);
#endif
}
assert(A::count == 0);
assert(test_deleter<A>::count == 0);
assert(test_deleter<A>::dealloc_count == 1);
test_deleter<A>::dealloc_count = 0;
#if TEST_STD_VER >= 11
// Test an allocator that returns class-type pointers
{
A* ptr = new A;
std::shared_ptr<A> p(ptr, test_deleter<A>(3), min_allocator<void>());
assert(A::count == 1);
assert(p.use_count() == 1);
assert(p.get() == ptr);
assert(test_deleter<A>::count == 1);
assert(test_deleter<A>::dealloc_count == 0);
A* ptr = new A;
std::shared_ptr<A> p(ptr, test_deleter<A>(3), min_allocator<void>());
assert(A::count == 1);
assert(p.use_count() == 1);
assert(p.get() == ptr);
assert(test_deleter<A>::count == 1);
assert(test_deleter<A>::dealloc_count == 0);
#ifndef TEST_HAS_NO_RTTI
test_deleter<A>* d = std::get_deleter<test_deleter<A> >(p);
assert(d);
assert(d->state() == 3);
test_deleter<A>* d = std::get_deleter<test_deleter<A> >(p);
assert(d);
assert(d->state() == 3);
#endif
}
assert(A::count == 0);

6
libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr.pass.cpp
View File

@@ -61,11 +61,5 @@ int main(int, char**)
}
assert(A::count == 0);
{
std::shared_ptr<A const> pA(new A);
std::shared_ptr<A const> pA2(pA);
assert(pA.get() == pA2.get());
}
return 0;
}

6
libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_Y.pass.cpp
View File

@@ -152,11 +152,5 @@ int main(int, char**)
assert(A::count == 0);
#endif
{
std::shared_ptr<A const> pA(new A);
std::shared_ptr<B const> pB(pA);
assert(pB.get() == pA.get());
}
return 0;
}

7
libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_Y_rv.pass.cpp
View File

@@ -129,12 +129,5 @@ int main(int, char**)
assert(A::count == 0);
#endif
{
std::shared_ptr<A const> pA(new A);
B const* p = pA.get();
std::shared_ptr<B const> pB(std::move(pA));
assert(pB.get() == p);
}
return 0;
}

20
libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_pointer.pass.cpp
View File

@@ -61,26 +61,6 @@ int main(int, char**)
assert(A::count == 0);
assert(B::count == 0);
{
std::shared_ptr<A const> pA(new A);
assert(pA.use_count() == 1);
{
B const b;
std::shared_ptr<B const> pB(pA, &b);
assert(A::count == 1);
assert(B::count == 1);
assert(pA.use_count() == 2);
assert(pB.use_count() == 2);
assert(pB.get() == &b);
}
assert(pA.use_count() == 1);
assert(A::count == 1);
assert(B::count == 0);
}
assert(A::count == 0);
assert(B::count == 0);
int *pi = new int;
{
std::shared_ptr<int> p1(nullptr);

8
libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_rv.pass.cpp
View File

@@ -57,7 +57,6 @@ int main(int, char**)
assert(A::count == 1);
#endif
}
assert(A::count == 0);
{
std::shared_ptr<A> pA;
@@ -75,12 +74,5 @@ int main(int, char**)
}
assert(A::count == 0);
{
std::shared_ptr<A const> pA(new A);
A const* p = pA.get();
std::shared_ptr<A const> pA2(std::move(pA));
assert(pA2.get() == p);
}
return 0;
}

12
libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/unique_ptr.pass.cpp
View File

@@ -94,18 +94,6 @@ int main(int, char**)
assert(p.get() == raw_ptr);
assert(ptr.get() == 0);
}
{
std::unique_ptr<A const> ptr(new A);
A const* raw_ptr = ptr.get();
std::shared_ptr<B const> p(std::move(ptr));
assert(A::count == 1);
assert(B::count == 1);
assert(p.use_count() == 1);
assert(p.get() == raw_ptr);
assert(ptr.get() == 0);
}
#ifndef TEST_HAS_NO_EXCEPTIONS
assert(A::count == 0);
{

9
libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/weak_ptr.pass.cpp
View File

@@ -65,15 +65,6 @@ int main(int, char**)
assert(A::count == 1);
}
assert(A::count == 0);
{
std::shared_ptr<A const> sp0(new A);
std::weak_ptr<A const> wp(sp0);
std::shared_ptr<A const> sp(wp);
assert(sp.use_count() == 2);
assert(sp.get() == sp0.get());
assert(A::count == 1);
}
assert(A::count == 0);
#ifndef TEST_HAS_NO_EXCEPTIONS
{
std::shared_ptr<A> sp0(new A);