This is an archive of the discontinued LLVM Phabricator instance.

Differential D13337

[libcxx] Attempt to fix __throw_future_error in C++03
ClosedPublic

Authored by EricWF on Oct 1 2015, 4:02 AM.

Details

Reviewers
mclow.lists
Commits
rG2d6c0e79f727: [libcxx] Attempt to fix __throw_future_error in C++03
rCXX249192: [libcxx] Attempt to fix __throw_future_error in C++03
rL249192: [libcxx] Attempt to fix __throw_future_error in C++03
Summary

Hi Marshall,

Could you please test this patch and see if you run into the same linker errors we talked about?
I can't reproduce on linux or OS X.

Hopefully you can't find any problems and we can fix the C++03 bot.

Diff Detail

Event Timeline

EricWF updated this revision to Diff 36216.Oct 1 2015, 4:02 AM
EricWF retitled this revision from to [libcxx] Attempt to fix __throw_future_error in C++03 .
EricWF updated this object.
EricWF added a reviewer: mclow.lists.
EricWF added a subscriber: cfe-commits.
mclow.lists accepted this revision.Oct 2 2015, 2:17 PM
mclow.lists edited edge metadata.

LGTM.
I can't reproduce the error that I was getting.

This revision is now accepted and ready to land.Oct 2 2015, 2:17 PM
EricWF closed this revision.Oct 2 2015, 2:26 PM

Revision Contents

PathSize
include/
61 lines

Diff 36216

include/future

Context not available.
virtual ~future_error() _NOEXCEPT; virtual ~future_error() _NOEXCEPT;
}; };
template <future_errc _Ev> inline _LIBCPP_ALWAYS_INLINE
_LIBCPP_ALWAYS_INLINE void __throw_future_error(future_errc _Ev)
void __throw_future_error()
{ {
#ifndef _LIBCPP_NO_EXCEPTIONS #ifndef _LIBCPP_NO_EXCEPTIONS
throw future_error(make_error_code(_Ev)); throw future_error(make_error_code(_Ev));
Context not available.
{ {
unique_lock<mutex> __lk(this->__mut_); unique_lock<mutex> __lk(this->__mut_);
if (this->__has_value()) if (this->__has_value())
__throw_future_error<future_errc::promise_already_satisfied>(); __throw_future_error(future_errc::promise_already_satisfied);
::new(&__value_) _Rp(_VSTD::forward<_Arg>(__arg)); ::new(&__value_) _Rp(_VSTD::forward<_Arg>(__arg));
this->__state_ |= base::__constructed | base::ready; this->__state_ |= base::__constructed | base::ready;
__cv_.notify_all(); __cv_.notify_all();
Context not available.
{ {
unique_lock<mutex> __lk(this->__mut_); unique_lock<mutex> __lk(this->__mut_);
if (this->__has_value()) if (this->__has_value())
__throw_future_error<future_errc::promise_already_satisfied>(); __throw_future_error(future_errc::promise_already_satisfied);
::new(&__value_) _Rp(_VSTD::forward<_Arg>(__arg)); ::new(&__value_) _Rp(_VSTD::forward<_Arg>(__arg));
this->__state_ |= base::__constructed; this->__state_ |= base::__constructed;
__thread_local_data()->__make_ready_at_thread_exit(this); __thread_local_data()->__make_ready_at_thread_exit(this);
Context not available.
{ {
unique_lock<mutex> __lk(this->__mut_); unique_lock<mutex> __lk(this->__mut_);
if (this->__has_value()) if (this->__has_value())
__throw_future_error<future_errc::promise_already_satisfied>(); __throw_future_error(future_errc::promise_already_satisfied);
__value_ = _VSTD::addressof(__arg); __value_ = _VSTD::addressof(__arg);
this->__state_ |= base::__constructed | base::ready; this->__state_ |= base::__constructed | base::ready;
__cv_.notify_all(); __cv_.notify_all();
Context not available.
{ {
unique_lock<mutex> __lk(this->__mut_); unique_lock<mutex> __lk(this->__mut_);
if (this->__has_value()) if (this->__has_value())
__throw_future_error<future_errc::promise_already_satisfied>(); __throw_future_error(future_errc::promise_already_satisfied);
__value_ = _VSTD::addressof(__arg); __value_ = _VSTD::addressof(__arg);
this->__state_ |= base::__constructed; this->__state_ |= base::__constructed;
__thread_local_data()->__make_ready_at_thread_exit(this); __thread_local_data()->__make_ready_at_thread_exit(this);
Context not available.
: __state_(__state) : __state_(__state)
{ {
if (__state_->__has_future_attached()) if (__state_->__has_future_attached())
__throw_future_error<future_errc::future_already_retrieved>(); __throw_future_error(future_errc::future_already_retrieved);
__state_->__add_shared(); __state_->__add_shared();
__state_->__set_future_attached(); __state_->__set_future_attached();
} }
Context not available.
: __state_(__state) : __state_(__state)
{ {
if (__state_->__has_future_attached()) if (__state_->__has_future_attached())
__throw_future_error<future_errc::future_already_retrieved>(); __throw_future_error(future_errc::future_already_retrieved);
__state_->__add_shared(); __state_->__add_shared();
__state_->__set_future_attached(); __state_->__set_future_attached();
} }
Context not available.
promise<_Rp>::get_future() promise<_Rp>::get_future()
{ {
if (__state_ == nullptr) if (__state_ == nullptr)
__throw_future_error<future_errc::no_state>(); __throw_future_error(future_errc::no_state);
return future<_Rp>(__state_); return future<_Rp>(__state_);
} }
Context not available.
promise<_Rp>::set_value(const _Rp& __r) promise<_Rp>::set_value(const _Rp& __r)
{ {
if (__state_ == nullptr) if (__state_ == nullptr)
__throw_future_error<future_errc::no_state>(); __throw_future_error(future_errc::no_state);
__state_->set_value(__r); __state_->set_value(__r);
} }
Context not available.
promise<_Rp>::set_value(_Rp&& __r) promise<_Rp>::set_value(_Rp&& __r)
{ {
if (__state_ == nullptr) if (__state_ == nullptr)
__throw_future_error<future_errc::no_state>(); __throw_future_error(future_errc::no_state);
__state_->set_value(_VSTD::move(__r)); __state_->set_value(_VSTD::move(__r));
} }
Context not available.
promise<_Rp>::set_exception(exception_ptr __p) promise<_Rp>::set_exception(exception_ptr __p)
{ {
if (__state_ == nullptr) if (__state_ == nullptr)
__throw_future_error<future_errc::no_state>(); __throw_future_error(future_errc::no_state);
__state_->set_exception(__p); __state_->set_exception(__p);
} }
Context not available.
promise<_Rp>::set_value_at_thread_exit(const _Rp& __r) promise<_Rp>::set_value_at_thread_exit(const _Rp& __r)
{ {
if (__state_ == nullptr) if (__state_ == nullptr)
__throw_future_error<future_errc::no_state>(); __throw_future_error(future_errc::no_state);
__state_->set_value_at_thread_exit(__r); __state_->set_value_at_thread_exit(__r);
} }
Context not available.
promise<_Rp>::set_value_at_thread_exit(_Rp&& __r) promise<_Rp>::set_value_at_thread_exit(_Rp&& __r)
{ {
if (__state_ == nullptr) if (__state_ == nullptr)
__throw_future_error<future_errc::no_state>(); __throw_future_error(future_errc::no_state);
__state_->set_value_at_thread_exit(_VSTD::move(__r)); __state_->set_value_at_thread_exit(_VSTD::move(__r));
} }
Context not available.
promise<_Rp>::set_exception_at_thread_exit(exception_ptr __p) promise<_Rp>::set_exception_at_thread_exit(exception_ptr __p)
{ {
if (__state_ == nullptr) if (__state_ == nullptr)
__throw_future_error<future_errc::no_state>(); __throw_future_error(future_errc::no_state);
__state_->set_exception_at_thread_exit(__p); __state_->set_exception_at_thread_exit(__p);
} }
Context not available.
promise<_Rp&>::get_future() promise<_Rp&>::get_future()
{ {
if (__state_ == nullptr) if (__state_ == nullptr)
__throw_future_error<future_errc::no_state>(); __throw_future_error(future_errc::no_state);
return future<_Rp&>(__state_); return future<_Rp&>(__state_);
} }
Context not available.
promise<_Rp&>::set_value(_Rp& __r) promise<_Rp&>::set_value(_Rp& __r)
{ {
if (__state_ == nullptr) if (__state_ == nullptr)
__throw_future_error<future_errc::no_state>(); __throw_future_error(future_errc::no_state);
__state_->set_value(__r); __state_->set_value(__r);
} }
Context not available.
promise<_Rp&>::set_exception(exception_ptr __p) promise<_Rp&>::set_exception(exception_ptr __p)
{ {
if (__state_ == nullptr) if (__state_ == nullptr)
__throw_future_error<future_errc::no_state>(); __throw_future_error(future_errc::no_state);
__state_->set_exception(__p); __state_->set_exception(__p);
} }
Context not available.
promise<_Rp&>::set_value_at_thread_exit(_Rp& __r) promise<_Rp&>::set_value_at_thread_exit(_Rp& __r)
{ {
if (__state_ == nullptr) if (__state_ == nullptr)
__throw_future_error<future_errc::no_state>(); __throw_future_error(future_errc::no_state);
__state_->set_value_at_thread_exit(__r); __state_->set_value_at_thread_exit(__r);
} }
Context not available.
promise<_Rp&>::set_exception_at_thread_exit(exception_ptr __p) promise<_Rp&>::set_exception_at_thread_exit(exception_ptr __p)
{ {
if (__state_ == nullptr) if (__state_ == nullptr)
__throw_future_error<future_errc::no_state>(); __throw_future_error(future_errc::no_state);
__state_->set_exception_at_thread_exit(__p); __state_->set_exception_at_thread_exit(__p);
} }
Context not available.
packaged_task<_Rp(_ArgTypes...)>::operator()(_ArgTypes... __args) packaged_task<_Rp(_ArgTypes...)>::operator()(_ArgTypes... __args)
{ {
if (__p_.__state_ == nullptr) if (__p_.__state_ == nullptr)
__throw_future_error<future_errc::no_state>(); __throw_future_error(future_errc::no_state);
if (__p_.__state_->__has_value()) if (__p_.__state_->__has_value())
__throw_future_error<future_errc::promise_already_satisfied>(); __throw_future_error(future_errc::promise_already_satisfied);
#ifndef _LIBCPP_NO_EXCEPTIONS #ifndef _LIBCPP_NO_EXCEPTIONS
try try
{ {
Context not available.
packaged_task<_Rp(_ArgTypes...)>::make_ready_at_thread_exit(_ArgTypes... __args) packaged_task<_Rp(_ArgTypes...)>::make_ready_at_thread_exit(_ArgTypes... __args)
{ {
if (__p_.__state_ == nullptr) if (__p_.__state_ == nullptr)
__throw_future_error<future_errc::no_state>(); __throw_future_error(future_errc::no_state);
if (__p_.__state_->__has_value()) if (__p_.__state_->__has_value())
__throw_future_error<future_errc::promise_already_satisfied>(); __throw_future_error(future_errc::promise_already_satisfied);
#ifndef _LIBCPP_NO_EXCEPTIONS #ifndef _LIBCPP_NO_EXCEPTIONS
try try
{ {
Context not available.
packaged_task<_Rp(_ArgTypes...)>::reset() packaged_task<_Rp(_ArgTypes...)>::reset()
{ {
if (!valid()) if (!valid())
__throw_future_error<future_errc::no_state>(); __throw_future_error(future_errc::no_state);
__p_ = promise<result_type>(); __p_ = promise<result_type>();
} }
Context not available.
packaged_task<void(_ArgTypes...)>::operator()(_ArgTypes... __args) packaged_task<void(_ArgTypes...)>::operator()(_ArgTypes... __args)
{ {
if (__p_.__state_ == nullptr) if (__p_.__state_ == nullptr)
__throw_future_error<future_errc::no_state>(); __throw_future_error(future_errc::no_state);
if (__p_.__state_->__has_value()) if (__p_.__state_->__has_value())
__throw_future_error<future_errc::promise_already_satisfied>(); __throw_future_error(future_errc::promise_already_satisfied);
#ifndef _LIBCPP_NO_EXCEPTIONS #ifndef _LIBCPP_NO_EXCEPTIONS
try try
{ {
Context not available.
packaged_task<void(_ArgTypes...)>::make_ready_at_thread_exit(_ArgTypes... __args) packaged_task<void(_ArgTypes...)>::make_ready_at_thread_exit(_ArgTypes... __args)
{ {
if (__p_.__state_ == nullptr) if (__p_.__state_ == nullptr)
__throw_future_error<future_errc::no_state>(); __throw_future_error(future_errc::no_state);
if (__p_.__state_->__has_value()) if (__p_.__state_->__has_value())
__throw_future_error<future_errc::promise_already_satisfied>(); __throw_future_error(future_errc::promise_already_satisfied);
#ifndef _LIBCPP_NO_EXCEPTIONS #ifndef _LIBCPP_NO_EXCEPTIONS
try try
{ {
Context not available.
packaged_task<void(_ArgTypes...)>::reset() packaged_task<void(_ArgTypes...)>::reset()
{ {
if (!valid()) if (!valid())
__throw_future_error<future_errc::no_state>(); __throw_future_error(future_errc::no_state);
__p_ = promise<result_type>(); __p_ = promise<result_type>();
} }
Context not available.