maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Some fixes to <atomic> operations to explicitly use atomic types and operations. 

The integral types now work with clang trunk (if you remove the guard), although we're still missing an intrinsic for initialising atomics (needed for C1x too).

Howard: Please review.
llvm-svn: 146865
This commit is contained in:
David Chisnall 2011-12-19 11:44:20 +00:00
parent 7582bbc67c
commit 18e33935f3
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libcxx/include/atomic
View File

@ -555,7 +555,7 @@ kill_dependency(_Tp __y)
template <class _Tp, bool = is_integral<_Tp>::value && !is_same<_Tp, bool>::value> template <class _Tp, bool = is_integral<_Tp>::value && !is_same<_Tp, bool>::value>
struct __atomic_base // false struct __atomic_base // false
{ {
_Tp __a_; _Atomic(_Tp) __a_;
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
bool is_lock_free() const volatile bool is_lock_free() const volatile
@ -621,7 +621,7 @@ struct __atomic_base // false
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
__atomic_base() {} // = default; __atomic_base() {} // = default;
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
/*constexpr*/ __atomic_base(_Tp __d) : __a_(__d) {} /*constexpr*/ __atomic_base(_Tp __d) { __atomic_store(&__a_, __d, memory_order_seq_cst); }
#ifndef _LIBCPP_HAS_NO_DELETED_FUNCTIONS #ifndef _LIBCPP_HAS_NO_DELETED_FUNCTIONS
__atomic_base(const __atomic_base&) = delete; __atomic_base(const __atomic_base&) = delete;
__atomic_base& operator=(const __atomic_base&) = delete; __atomic_base& operator=(const __atomic_base&) = delete;
@ -820,7 +820,7 @@ inline _LIBCPP_INLINE_VISIBILITY
void void
atomic_init(volatile atomic<_Tp>* __o, _Tp __d) atomic_init(volatile atomic<_Tp>* __o, _Tp __d)
{ {
__o->__a_ = __d; __atomic_store(&__o->__a_, __d, memory_order_seq_cst);
} }
template <class _Tp> template <class _Tp>
@ -828,7 +828,7 @@ inline _LIBCPP_INLINE_VISIBILITY
void void
atomic_init(atomic<_Tp>* __o, _Tp __d) atomic_init(atomic<_Tp>* __o, _Tp __d)
{ {
__o->__a_ = __d; __atomic_store(&__o->__a_, __d, memory_order_seq_cst);
} }
// atomic_store // atomic_store
@ -1348,7 +1348,7 @@ atomic_fetch_xor_explicit(atomic<_Tp>* __o, _Tp __op, memory_order __m)
typedef struct atomic_flag typedef struct atomic_flag
{ {
bool __a_; _Atomic(bool) __a_;
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
bool test_and_set(memory_order __m = memory_order_seq_cst) volatile bool test_and_set(memory_order __m = memory_order_seq_cst) volatile
@ -1366,7 +1366,7 @@ typedef struct atomic_flag
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
atomic_flag() {} // = default; atomic_flag() {} // = default;
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
atomic_flag(bool __b) : __a_(__b) {} atomic_flag(bool __b) { __atomic_store(&__a_, __b, memory_order_seq_cst); }
#ifndef _LIBCPP_HAS_NO_DELETED_FUNCTIONS #ifndef _LIBCPP_HAS_NO_DELETED_FUNCTIONS
atomic_flag(const atomic_flag&) = delete; atomic_flag(const atomic_flag&) = delete;