generic-library/cxx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

noexcept for <memory>. I've added a few extension noexcept to: allocator_traits<A>::deallocate, allocaate<T>::deallocate, return_temporary_buffer, and default_delete<T>::operator()(T*) const. My rationale was: If a std-dicated noexcept function needs to call another std-defined function, that called function must be noexcept. We're all a little new to noexcept, so things like this are to be expected. Also included fix for broken __is_swappable trait pointed out by Marc Glisse, thanks Marc|. And fixed a test case for is_nothrow_destructible. Destructors are now noexcept by default|

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@132261 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Howard Hinnant 2011-05-28 14:41:13 +00:00
parent 10f25d2739
commit 1694d23e23
8 changed files with 456 additions and 320 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/__locale
View File

@ -103,7 +103,7 @@ protected:
// facet(const facet&) = delete; // effectively done in __shared_count // facet(const facet&) = delete; // effectively done in __shared_count
// void operator=(const facet&) = delete; // void operator=(const facet&) = delete;
private: private:
virtual void __on_zero_shared(); virtual void __on_zero_shared() _NOEXCEPT;
}; };
class _LIBCPP_VISIBLE locale::id class _LIBCPP_VISIBLE locale::id

30
include/future
View File

@ -463,7 +463,7 @@ protected:
mutable condition_variable __cv_; mutable condition_variable __cv_;
unsigned __state_; unsigned __state_;
virtual void __on_zero_shared(); virtual void __on_zero_shared() _NOEXCEPT;
void __sub_wait(unique_lock<mutex>& __lk); void __sub_wait(unique_lock<mutex>& __lk);
public: public:
enum enum
@ -543,7 +543,7 @@ class __assoc_state
protected: protected:
_U __value_; _U __value_;
virtual void __on_zero_shared(); virtual void __on_zero_shared() _NOEXCEPT;
public: public:
template <class _Arg> template <class _Arg>
@ -566,7 +566,7 @@ public:
template <class _R> template <class _R>
void void
__assoc_state<_R>::__on_zero_shared() __assoc_state<_R>::__on_zero_shared() _NOEXCEPT
{ {
if (this->__state_ & base::__constructed) if (this->__state_ & base::__constructed)
reinterpret_cast<_R*>(&__value_)->~_R(); reinterpret_cast<_R*>(&__value_)->~_R();
@ -640,7 +640,7 @@ class __assoc_state<_R&>
protected: protected:
_U __value_; _U __value_;
virtual void __on_zero_shared(); virtual void __on_zero_shared() _NOEXCEPT;
public: public:
void set_value(_R& __arg); void set_value(_R& __arg);
@ -651,7 +651,7 @@ public:
template <class _R> template <class _R>
void void
__assoc_state<_R&>::__on_zero_shared() __assoc_state<_R&>::__on_zero_shared() _NOEXCEPT
{ {
delete this; delete this;
} }
@ -700,7 +700,7 @@ class __assoc_state_alloc
typedef __assoc_state<_R> base; typedef __assoc_state<_R> base;
_Alloc __alloc_; _Alloc __alloc_;
virtual void __on_zero_shared(); virtual void __on_zero_shared() _NOEXCEPT;
public: public:
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
explicit __assoc_state_alloc(const _Alloc& __a) explicit __assoc_state_alloc(const _Alloc& __a)
@ -709,7 +709,7 @@ public:
template <class _R, class _Alloc> template <class _R, class _Alloc>
void void
__assoc_state_alloc<_R, _Alloc>::__on_zero_shared() __assoc_state_alloc<_R, _Alloc>::__on_zero_shared() _NOEXCEPT
{ {
if (this->__state_ & base::__constructed) if (this->__state_ & base::__constructed)
reinterpret_cast<_R*>(&this->__value_)->~_R(); reinterpret_cast<_R*>(&this->__value_)->~_R();
@ -725,7 +725,7 @@ class __assoc_state_alloc<_R&, _Alloc>
typedef __assoc_state<_R&> base; typedef __assoc_state<_R&> base;
_Alloc __alloc_; _Alloc __alloc_;
virtual void __on_zero_shared(); virtual void __on_zero_shared() _NOEXCEPT;
public: public:
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
explicit __assoc_state_alloc(const _Alloc& __a) explicit __assoc_state_alloc(const _Alloc& __a)
@ -734,7 +734,7 @@ public:
template <class _R, class _Alloc> template <class _R, class _Alloc>
void void
__assoc_state_alloc<_R&, _Alloc>::__on_zero_shared() __assoc_state_alloc<_R&, _Alloc>::__on_zero_shared() _NOEXCEPT
{ {
typename _Alloc::template rebind<__assoc_state_alloc>::other __a(__alloc_); typename _Alloc::template rebind<__assoc_state_alloc>::other __a(__alloc_);
this->~__assoc_state_alloc(); this->~__assoc_state_alloc();
@ -748,7 +748,7 @@ class __assoc_sub_state_alloc
typedef __assoc_sub_state base; typedef __assoc_sub_state base;
_Alloc __alloc_; _Alloc __alloc_;
virtual void __on_zero_shared(); virtual void __on_zero_shared() _NOEXCEPT;
public: public:
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
explicit __assoc_sub_state_alloc(const _Alloc& __a) explicit __assoc_sub_state_alloc(const _Alloc& __a)
@ -757,7 +757,7 @@ public:
template <class _Alloc> template <class _Alloc>
void void
__assoc_sub_state_alloc<_Alloc>::__on_zero_shared() __assoc_sub_state_alloc<_Alloc>::__on_zero_shared() _NOEXCEPT
{ {
this->~base(); this->~base();
typename _Alloc::template rebind<__assoc_sub_state_alloc>::other __a(__alloc_); typename _Alloc::template rebind<__assoc_sub_state_alloc>::other __a(__alloc_);
@ -866,7 +866,7 @@ class __async_assoc_state
_F __func_; _F __func_;
virtual void __on_zero_shared(); virtual void __on_zero_shared() _NOEXCEPT;
public: public:
#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
explicit __async_assoc_state(_F&& __f); explicit __async_assoc_state(_F&& __f);
@ -906,7 +906,7 @@ __async_assoc_state<_R, _F>::__execute()
template <class _R, class _F> template <class _R, class _F>
void void
__async_assoc_state<_R, _F>::__on_zero_shared() __async_assoc_state<_R, _F>::__on_zero_shared() _NOEXCEPT
{ {
this->wait(); this->wait();
base::__on_zero_shared(); base::__on_zero_shared();
@ -920,7 +920,7 @@ class __async_assoc_state<void, _F>
_F __func_; _F __func_;
virtual void __on_zero_shared(); virtual void __on_zero_shared() _NOEXCEPT;
public: public:
#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
explicit __async_assoc_state(_F&& __f); explicit __async_assoc_state(_F&& __f);
@ -961,7 +961,7 @@ __async_assoc_state<void, _F>::__execute()
template <class _F> template <class _F>
void void
__async_assoc_state<void, _F>::__on_zero_shared() __async_assoc_state<void, _F>::__on_zero_shared() _NOEXCEPT
{ {
this->wait(); this->wait();
base::__on_zero_shared(); base::__on_zero_shared();

698
include/memory
View File

File diff suppressed because it is too large Load Diff

14
include/type_traits
View File

@ -2999,7 +2999,11 @@ struct __invoke_of
template <class _Tp> template <class _Tp>
inline _LIBCPP_INLINE_VISIBILITY inline _LIBCPP_INLINE_VISIBILITY
void typename enable_if
<
is_move_constructible<_Tp>::value &&
is_move_assignable<_Tp>::value
>::type
swap(_Tp& __x, _Tp& __y) _NOEXCEPT_(is_nothrow_move_constructible<_Tp>::value && swap(_Tp& __x, _Tp& __y) _NOEXCEPT_(is_nothrow_move_constructible<_Tp>::value &&
is_nothrow_move_assignable<_Tp>::value) is_nothrow_move_assignable<_Tp>::value)
{ {
@ -3021,6 +3025,10 @@ iter_swap(_ForwardIterator1 __a, _ForwardIterator2 __b)
// __swappable // __swappable
namespace __detail
{
using _STD::swap;
__nat swap(__any, __any); __nat swap(__any, __any);
template <class _Tp> template <class _Tp>
@ -3030,9 +3038,11 @@ struct __swappable
static const bool value = !is_same<type, __nat>::value; static const bool value = !is_same<type, __nat>::value;
}; };
} // __detail
template <class _Tp> template <class _Tp>
struct __is_swappable struct __is_swappable
: public integral_constant<bool, __swappable<_Tp>::value> : public integral_constant<bool, __detail::__swappable<_Tp>::value>
{ {
}; };

2
src/future.cpp
View File

@ -60,7 +60,7 @@ future_error::future_error(error_code __ec)
} }
void void
__assoc_sub_state::__on_zero_shared() __assoc_sub_state::__on_zero_shared() _NOEXCEPT
{ {
delete this; delete this;
} }

2
src/locale.cpp
View File

@ -518,7 +518,7 @@ locale::facet::~facet()
} }
void void
locale::facet::__on_zero_shared() locale::facet::__on_zero_shared() _NOEXCEPT
{ {
delete this; delete this;
} }

26
src/memory.cpp
View File

@ -16,14 +16,14 @@ namespace
template <class T> template <class T>
inline T inline T
increment(T& t) increment(T& t) _NOEXCEPT
{ {
return __sync_add_and_fetch(&t, 1); return __sync_add_and_fetch(&t, 1);
} }
template <class T> template <class T>
inline T inline T
decrement(T& t) decrement(T& t) _NOEXCEPT
{ {
return __sync_add_and_fetch(&t, -1); return __sync_add_and_fetch(&t, -1);
} }
@ -32,10 +32,10 @@ decrement(T& t)
const allocator_arg_t allocator_arg = allocator_arg_t(); const allocator_arg_t allocator_arg = allocator_arg_t();
bad_weak_ptr::~bad_weak_ptr() throw() {} bad_weak_ptr::~bad_weak_ptr() _NOEXCEPT {}
const char* const char*
bad_weak_ptr::what() const throw() bad_weak_ptr::what() const _NOEXCEPT
{ {
return "bad_weak_ptr"; return "bad_weak_ptr";
} }
@ -45,13 +45,13 @@ __shared_count::~__shared_count()
} }
void void
__shared_count::__add_shared() __shared_count::__add_shared() _NOEXCEPT
{ {
increment(__shared_owners_); increment(__shared_owners_);
} }
bool bool
__shared_count::__release_shared() __shared_count::__release_shared() _NOEXCEPT
{ {
if (decrement(__shared_owners_) == -1) if (decrement(__shared_owners_) == -1)
{ {
@ -66,33 +66,33 @@ __shared_weak_count::~__shared_weak_count()
} }
void void
__shared_weak_count::__add_shared() __shared_weak_count::__add_shared() _NOEXCEPT
{ {
__shared_count::__add_shared(); __shared_count::__add_shared();
} }
void void
__shared_weak_count::__add_weak() __shared_weak_count::__add_weak() _NOEXCEPT
{ {
increment(__shared_weak_owners_); increment(__shared_weak_owners_);
} }
void void
__shared_weak_count::__release_shared() __shared_weak_count::__release_shared() _NOEXCEPT
{ {
if (__shared_count::__release_shared()) if (__shared_count::__release_shared())
__release_weak(); __release_weak();
} }
void void
__shared_weak_count::__release_weak() __shared_weak_count::__release_weak() _NOEXCEPT
{ {
if (decrement(__shared_weak_owners_) == -1) if (decrement(__shared_weak_owners_) == -1)
__on_zero_shared_weak(); __on_zero_shared_weak();
} }
__shared_weak_count* __shared_weak_count*
__shared_weak_count::lock() __shared_weak_count::lock() _NOEXCEPT
{ {
long object_owners = __shared_owners_; long object_owners = __shared_owners_;
while (object_owners != -1) while (object_owners != -1)
@ -112,7 +112,7 @@ __shared_weak_count::lock()
#ifndef _LIBCPP_NO_RTTI #ifndef _LIBCPP_NO_RTTI
const void* const void*
__shared_weak_count::__get_deleter(const type_info&) const __shared_weak_count::__get_deleter(const type_info&) const _NOEXCEPT
{ {
return 0; return 0;
} }
@ -135,7 +135,7 @@ undeclare_no_pointers(char*, size_t)
} }
pointer_safety pointer_safety
get_pointer_safety() get_pointer_safety() _NOEXCEPT
{ {
return pointer_safety::relaxed; return pointer_safety::relaxed;
} }

2
test/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_destructible.pass.cpp
View File

@ -60,10 +60,10 @@ struct A
int main() int main()
{ {
test_has_not_nothrow_destructor<void>(); test_has_not_nothrow_destructor<void>();
test_has_not_nothrow_destructor<A>();
test_has_not_nothrow_destructor<Abstract>(); test_has_not_nothrow_destructor<Abstract>();
test_has_not_nothrow_destructor<NotEmpty>(); test_has_not_nothrow_destructor<NotEmpty>();
test_is_nothrow_destructible<A>();
test_is_nothrow_destructible<int&>(); test_is_nothrow_destructible<int&>();
test_is_nothrow_destructible<Union>(); test_is_nothrow_destructible<Union>();
test_is_nothrow_destructible<Empty>(); test_is_nothrow_destructible<Empty>();