Fix a race in the construction of future. This fixes http://llvm.org/bugs/show_bug.cgi?id=14934.
llvm-svn: 172456
This commit is contained in:
parent
49e022df8f
commit
2153d69672
|
@ -470,7 +470,11 @@ public:
|
|||
{return (__state_ & __constructed) || (__exception_ != nullptr);}
|
||||
|
||||
_LIBCPP_INLINE_VISIBILITY
|
||||
void __set_future_attached() {__state_ |= __future_attached;}
|
||||
void __set_future_attached()
|
||||
{
|
||||
lock_guard<mutex> __lk(__mut_);
|
||||
__state_ |= __future_attached;
|
||||
}
|
||||
_LIBCPP_INLINE_VISIBILITY
|
||||
bool __has_future_attached() const {return __state_ & __future_attached;}
|
||||
|
||||
|
|
|
@ -78,8 +78,8 @@ __assoc_sub_state::set_value()
|
|||
throw future_error(make_error_code(future_errc::promise_already_satisfied));
|
||||
#endif
|
||||
__state_ |= __constructed | ready;
|
||||
__lk.unlock();
|
||||
__cv_.notify_all();
|
||||
__lk.unlock();
|
||||
}
|
||||
|
||||
void
|
||||
|
|
Loading…
Reference in New Issue