This is an archive of the discontinued LLVM Phabricator instance.

Differential D47613

Mark __c11_atomic_load as const
ClosedPublic

Authored by jfb on May 31 2018, 4:39 PM.

Details

Reviewers
EricWF
mclow.lists
Commits
rG84d7a4a344f6: Mark __c11_atomic_load as const
rCXX333776: Mark __c11_atomic_load as const
rL333776: Mark __c11_atomic_load as const
Summary

C++11 onwards specs the non-member functions atomic_load and atomic_load_explicit as taking the atomic<T> by const (potentially volatile) pointer. C11, in its infinite wisdom, decided to drop the const, and C17 will fix this with DR459 (the current draft forgot to fix B.16, but that’s not the normative part).

This patch fixes the libc++ version of the __c11_atomic_load builtins defined for GCC's compatibility sake.

D47618 takes care of the clang side.

Discussion: http://lists.llvm.org/pipermail/cfe-dev/2018-May/058129.html

rdar://problem/27426936

Diff Detail

Repository
rL LLVM

Event Timeline

jfb created this revision.May 31 2018, 4:39 PM
Harbormaster completed remote builds in B18798: Diff 149381.May 31 2018, 4:39 PM
Herald added subscribers: cfe-commits, christof. · View Herald TranscriptMay 31 2018, 4:39 PM
EricWF accepted this revision.May 31 2018, 6:27 PM

LGTM.

This revision is now accepted and ready to land.May 31 2018, 6:27 PM
jfb mentioned this in D47618: __c11_atomic_load's _Atomic can be const.May 31 2018, 9:55 PM
jfb edited the summary of this revision. (Show Details)May 31 2018, 9:56 PM
Closed by commit rL333776: Mark __c11_atomic_load as const (authored by jfb). · Explain WhyJun 1 2018, 11:07 AM
This revision was automatically updated to reflect the committed changes.
Herald added a subscriber: llvm-commits. · View Herald TranscriptJun 1 2018, 11:07 AM
jfb mentioned this in rL338743: __c11_atomic_load's _Atomic can be const.Aug 2 2018, 10:36 AM
jfb mentioned this in rC338743: __c11_atomic_load's _Atomic can be const.

Revision Contents

PathSize
libcxx/
trunk/
include/
4 lines

Diff 149511

libcxx/trunk/include/atomic

Show First 20 Lines • Show All 692 Lines • ▼ Show 20 Lines
template <typename _Tp> template <typename _Tp>
static inline void __c11_atomic_store(_Atomic(_Tp)* __a, _Tp __val, static inline void __c11_atomic_store(_Atomic(_Tp)* __a, _Tp __val,
memory_order __order) { memory_order __order) {
__atomic_store(&__a->__a_value, &__val, __atomic_store(&__a->__a_value, &__val,
__gcc_atomic::__to_gcc_order(__order)); __gcc_atomic::__to_gcc_order(__order));
} }
template <typename _Tp> template <typename _Tp>
static inline _Tp __c11_atomic_load(volatile _Atomic(_Tp)* __a, static inline _Tp __c11_atomic_load(const volatile _Atomic(_Tp)* __a,
memory_order __order) { memory_order __order) {
_Tp __ret; _Tp __ret;
__atomic_load(&__a->__a_value, &__ret, __atomic_load(&__a->__a_value, &__ret,
__gcc_atomic::__to_gcc_order(__order)); __gcc_atomic::__to_gcc_order(__order));
return __ret; return __ret;
} }
template <typename _Tp> template <typename _Tp>
static inline _Tp __c11_atomic_load(_Atomic(_Tp)* __a, memory_order __order) { static inline _Tp __c11_atomic_load(const _Atomic(_Tp)* __a, memory_order __order) {
_Tp __ret; _Tp __ret;
__atomic_load(&__a->__a_value, &__ret, __atomic_load(&__a->__a_value, &__ret,
__gcc_atomic::__to_gcc_order(__order)); __gcc_atomic::__to_gcc_order(__order));
return __ret; return __ret;
} }
template <typename _Tp> template <typename _Tp>
static inline _Tp __c11_atomic_exchange(volatile _Atomic(_Tp)* __a, static inline _Tp __c11_atomic_exchange(volatile _Atomic(_Tp)* __a,
▲ Show 20 Lines • Show All 1,173 Lines • Show Last 20 Lines