From: Jonathan Wakely Date: Wed, 12 Nov 2014 19:41:36 +0000 (+0000) Subject: Implement resolutions of LWG 2399, 2400 and 2401. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d8af84e67b08377cf813eb4d4bbf8ae2e8226fa1;p=gcc.git Implement resolutions of LWG 2399, 2400 and 2401. * include/bits/shared_ptr.h (shared_ptr, weak_ptr): Define _Convertible alias template to simplify constraints. (shared_ptr(unique_ptr&&)): Constrain (LWG 2399). * include/bits/shared_ptr_base.h: Likewise. (_Sp_counted_deleter::_M_get_deleter()): Use addressof (LWG 2400). * include/std/functional (function::operator=(nullptr_t)): Add noexcept (LWG 2401). * testsuite/20_util/shared_ptr/cons/43820_neg.cc: Adjust dg-error. * testsuite/20_util/shared_ptr/cons/void_neg.cc: Adjust dg-error. From-SVN: r217442 --- diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 30a3ba6e5ae..8960ef744cc 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -7,6 +7,16 @@ * testsuite/20_util/shared_ptr/cons/43820_neg.cc: Adjust dg-error. * testsuite/20_util/shared_ptr/cons/void_neg.cc: Adjust dg-error. + * include/bits/shared_ptr.h (shared_ptr, weak_ptr): Define + _Convertible alias template to simplify constraints. + (shared_ptr(unique_ptr&&)): Constrain (LWG 2399). + * include/bits/shared_ptr_base.h: Likewise. + (_Sp_counted_deleter::_M_get_deleter()): Use addressof (LWG 2400). + * include/std/functional (function::operator=(nullptr_t)): Add + noexcept (LWG 2401). + * testsuite/20_util/shared_ptr/cons/43820_neg.cc: Adjust dg-error. + * testsuite/20_util/shared_ptr/cons/void_neg.cc: Adjust dg-error. + 2014-11-12 Jonathan Wakely PR c++/33911 diff --git a/libstdc++-v3/include/bits/shared_ptr.h b/libstdc++-v3/include/bits/shared_ptr.h index c2d56eb7170..22cb58a89fe 100644 --- a/libstdc++-v3/include/bits/shared_ptr.h +++ b/libstdc++-v3/include/bits/shared_ptr.h @@ -92,6 +92,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template class shared_ptr : public __shared_ptr<_Tp> { + template + using _Convertible + = typename enable_if::value>::type; + public: /** * @brief Construct an empty %shared_ptr. @@ -213,8 +217,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * @param __r A %shared_ptr. * @post get() == __r.get() && use_count() == __r.use_count() */ - template::value>::type> + template> shared_ptr(const shared_ptr<_Tp1>& __r) noexcept : __shared_ptr<_Tp>(__r) { } @@ -231,8 +234,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * @param __r A %shared_ptr rvalue. * @post *this contains the old value of @a __r, @a __r is empty. */ - template::value>::type> + template> shared_ptr(shared_ptr<_Tp1>&& __r) noexcept : __shared_ptr<_Tp>(std::move(__r)) { } @@ -253,7 +255,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION shared_ptr(std::auto_ptr<_Tp1>&& __r); #endif - template + // _GLIBCXX_RESOLVE_LIB_DEFECTS + // 2399. shared_ptr's constructor from unique_ptr should be constrained + template::pointer>> shared_ptr(std::unique_ptr<_Tp1, _Del>&& __r) : __shared_ptr<_Tp>(std::move(__r)) { } @@ -464,25 +469,26 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template class weak_ptr : public __weak_ptr<_Tp> { + template + using _Convertible + = typename enable_if::value>::type; + public: constexpr weak_ptr() noexcept = default; - template::value>::type> + template> weak_ptr(const shared_ptr<_Tp1>& __r) noexcept : __weak_ptr<_Tp>(__r) { } weak_ptr(const weak_ptr&) noexcept = default; - template::value>::type> + template> weak_ptr(const weak_ptr<_Tp1>& __r) noexcept : __weak_ptr<_Tp>(__r) { } weak_ptr(weak_ptr&&) noexcept = default; - template::value>::type> + template> weak_ptr(weak_ptr<_Tp1>&& __r) noexcept : __weak_ptr<_Tp>(std::move(__r)) { } diff --git a/libstdc++-v3/include/bits/shared_ptr_base.h b/libstdc++-v3/include/bits/shared_ptr_base.h index ea74000eb09..fe397d0e7e9 100644 --- a/libstdc++-v3/include/bits/shared_ptr_base.h +++ b/libstdc++-v3/include/bits/shared_ptr_base.h @@ -477,7 +477,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _M_get_deleter(const std::type_info& __ti) noexcept { #ifdef __GXX_RTTI - return __ti == typeid(_Deleter) ? &_M_impl._M_del() : nullptr; + // _GLIBCXX_RESOLVE_LIB_DEFECTS + // 2400. shared_ptr's get_deleter() should use addressof() + return __ti == typeid(_Deleter) + ? std::__addressof(_M_impl._M_del()) + : nullptr; #else return nullptr; #endif @@ -862,6 +866,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template class __shared_ptr { + template + using _Convertible + = typename enable_if::value>::type; + public: typedef _Tp element_type; @@ -916,8 +924,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __shared_ptr& operator=(const __shared_ptr&) noexcept = default; ~__shared_ptr() = default; - template::value>::type> + template> __shared_ptr(const __shared_ptr<_Tp1, _Lp>& __r) noexcept : _M_ptr(__r._M_ptr), _M_refcount(__r._M_refcount) { } @@ -929,8 +936,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __r._M_ptr = 0; } - template::value>::type> + template> __shared_ptr(__shared_ptr<_Tp1, _Lp>&& __r) noexcept : _M_ptr(__r._M_ptr), _M_refcount() { @@ -950,7 +956,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } // If an exception is thrown this constructor has no effect. - template + template::pointer>> __shared_ptr(std::unique_ptr<_Tp1, _Del>&& __r) : _M_ptr(__r.get()), _M_refcount() { @@ -1331,6 +1338,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template class __weak_ptr { + template + using _Convertible + = typename enable_if::value>::type; + public: typedef _Tp element_type; @@ -1356,14 +1367,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // // It is not possible to avoid spurious access violations since // in multithreaded programs __r._M_ptr may be invalidated at any point. - template::value>::type> + template> __weak_ptr(const __weak_ptr<_Tp1, _Lp>& __r) noexcept : _M_refcount(__r._M_refcount) { _M_ptr = __r.lock().get(); } - template::value>::type> + template> __weak_ptr(const __shared_ptr<_Tp1, _Lp>& __r) noexcept : _M_ptr(__r._M_ptr), _M_refcount(__r._M_refcount) { } @@ -1372,8 +1381,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION : _M_ptr(__r._M_ptr), _M_refcount(std::move(__r._M_refcount)) { __r._M_ptr = nullptr; } - template::value>::type> + template> __weak_ptr(__weak_ptr<_Tp1, _Lp>&& __r) noexcept : _M_ptr(__r.lock().get()), _M_refcount(std::move(__r._M_refcount)) { __r._M_ptr = nullptr; } diff --git a/libstdc++-v3/include/std/functional b/libstdc++-v3/include/std/functional index e711350a5df..71d97ad0399 100644 --- a/libstdc++-v3/include/std/functional +++ b/libstdc++-v3/include/std/functional @@ -2102,7 +2102,7 @@ _GLIBCXX_MEM_FN_TRAITS(&&, false_type, true_type) * The target of @c *this is deallocated, leaving it empty. */ function& - operator=(nullptr_t) + operator=(nullptr_t) noexcept { if (_M_manager) { diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/cons/43820_neg.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/cons/43820_neg.cc index be33279510a..d354d204976 100644 --- a/libstdc++-v3/testsuite/20_util/shared_ptr/cons/43820_neg.cc +++ b/libstdc++-v3/testsuite/20_util/shared_ptr/cons/43820_neg.cc @@ -32,7 +32,7 @@ void test01() { X* px = 0; std::shared_ptr p1(px); // { dg-error "here" } - // { dg-error "incomplete" "" { target *-*-* } 878 } + // { dg-error "incomplete" "" { target *-*-* } 886 } std::shared_ptr p9(ap()); // { dg-error "here" } // { dg-error "incomplete" "" { target *-*-* } 307 } diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/cons/void_neg.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/cons/void_neg.cc index 17e036f5f44..d833aea1786 100644 --- a/libstdc++-v3/testsuite/20_util/shared_ptr/cons/void_neg.cc +++ b/libstdc++-v3/testsuite/20_util/shared_ptr/cons/void_neg.cc @@ -25,5 +25,5 @@ void test01() { std::shared_ptr p((void*)nullptr); // { dg-error "here" } - // { dg-error "incomplete" "" { target *-*-* } 877 } + // { dg-error "incomplete" "" { target *-*-* } 885 } }