diff options
author | Eric Fiselier <eric@efcs.ca> | 2016-05-03 02:12:26 +0000 |
---|---|---|
committer | Eric Fiselier <eric@efcs.ca> | 2016-05-03 02:12:26 +0000 |
commit | 15a297212fd42fddfca93b58dacbde1705f12d53 (patch) | |
tree | 2f623cbbb8ca9996d30ac459ae31467470a48b19 /libcxx | |
parent | 43a10eb637b2da24cc8d5ee1c52a7ff3a485cf9c (diff) | |
download | bcm5719-llvm-15a297212fd42fddfca93b58dacbde1705f12d53.tar.gz bcm5719-llvm-15a297212fd42fddfca93b58dacbde1705f12d53.zip |
[libcxx] [test] Replace non-Standard "atomic_flag f(false);" with Standard "atomic_flag f;"
Summary:
Replace non-Standard "atomic_flag f(false);" with Standard "atomic_flag f;" in clear tests.
Although the value of 'f' is unspecified it shouldn't matter because these tests always call `f.test_and_set()` without checking the result, so the initial state shouldn't matter.
The test init03.pass.cpp is explicitly testing this non-Standard extension; It has been moved into the `test/libcxx` directory.
Reviewers: mclow.lists, STL_MSFT
Subscribers: cfe-commits
Differential Revision: http://reviews.llvm.org/D19758
llvm-svn: 268355
Diffstat (limited to 'libcxx')
-rw-r--r-- | libcxx/include/atomic | 2 | ||||
-rw-r--r-- | libcxx/test/libcxx/atomics/atomics.flag/init_bool.pass.cpp (renamed from libcxx/test/std/atomics/atomics.flag/init03.pass.cpp) | 10 | ||||
-rw-r--r-- | libcxx/test/std/atomics/atomics.flag/atomic_flag_clear.pass.cpp | 4 | ||||
-rw-r--r-- | libcxx/test/std/atomics/atomics.flag/atomic_flag_clear_explicit.pass.cpp | 12 | ||||
-rw-r--r-- | libcxx/test/std/atomics/atomics.flag/clear.pass.cpp | 16 |
5 files changed, 25 insertions, 19 deletions
diff --git a/libcxx/include/atomic b/libcxx/include/atomic index dc117e93a29..a0245eb6ac4 100644 --- a/libcxx/include/atomic +++ b/libcxx/include/atomic @@ -1689,7 +1689,7 @@ typedef struct atomic_flag #endif // _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS _LIBCPP_INLINE_VISIBILITY - atomic_flag(bool __b) _NOEXCEPT : __a_(__b) {} + atomic_flag(bool __b) _NOEXCEPT : __a_(__b) {} // EXTENSION #ifndef _LIBCPP_HAS_NO_DELETED_FUNCTIONS atomic_flag(const atomic_flag&) = delete; diff --git a/libcxx/test/std/atomics/atomics.flag/init03.pass.cpp b/libcxx/test/libcxx/atomics/atomics.flag/init_bool.pass.cpp index 0910bc5cecc..d7b172cd121 100644 --- a/libcxx/test/std/atomics/atomics.flag/init03.pass.cpp +++ b/libcxx/test/libcxx/atomics/atomics.flag/init_bool.pass.cpp @@ -20,6 +20,12 @@ int main() { - std::atomic_flag f(false); - assert(f.test_and_set() == 0); + { + std::atomic_flag f(false); + assert(f.test_and_set() == 0); + } + { + std::atomic_flag f(true); + assert(f.test_and_set() == 1); + } } diff --git a/libcxx/test/std/atomics/atomics.flag/atomic_flag_clear.pass.cpp b/libcxx/test/std/atomics/atomics.flag/atomic_flag_clear.pass.cpp index 3a74e13faf1..64093d639e4 100644 --- a/libcxx/test/std/atomics/atomics.flag/atomic_flag_clear.pass.cpp +++ b/libcxx/test/std/atomics/atomics.flag/atomic_flag_clear.pass.cpp @@ -22,13 +22,13 @@ int main() { { - std::atomic_flag f(false); + std::atomic_flag f; f.test_and_set(); atomic_flag_clear(&f); assert(f.test_and_set() == 0); } { - volatile std::atomic_flag f(false); + volatile std::atomic_flag f; f.test_and_set(); atomic_flag_clear(&f); assert(f.test_and_set() == 0); diff --git a/libcxx/test/std/atomics/atomics.flag/atomic_flag_clear_explicit.pass.cpp b/libcxx/test/std/atomics/atomics.flag/atomic_flag_clear_explicit.pass.cpp index 0467384455c..e1a9349c939 100644 --- a/libcxx/test/std/atomics/atomics.flag/atomic_flag_clear_explicit.pass.cpp +++ b/libcxx/test/std/atomics/atomics.flag/atomic_flag_clear_explicit.pass.cpp @@ -22,37 +22,37 @@ int main() { { - std::atomic_flag f(false); + std::atomic_flag f; f.test_and_set(); atomic_flag_clear_explicit(&f, std::memory_order_relaxed); assert(f.test_and_set() == 0); } { - std::atomic_flag f(false); + std::atomic_flag f; f.test_and_set(); atomic_flag_clear_explicit(&f, std::memory_order_release); assert(f.test_and_set() == 0); } { - std::atomic_flag f(false); + std::atomic_flag f; f.test_and_set(); atomic_flag_clear_explicit(&f, std::memory_order_seq_cst); assert(f.test_and_set() == 0); } { - volatile std::atomic_flag f(false); + volatile std::atomic_flag f; f.test_and_set(); atomic_flag_clear_explicit(&f, std::memory_order_relaxed); assert(f.test_and_set() == 0); } { - volatile std::atomic_flag f(false); + volatile std::atomic_flag f; f.test_and_set(); atomic_flag_clear_explicit(&f, std::memory_order_release); assert(f.test_and_set() == 0); } { - volatile std::atomic_flag f(false); + volatile std::atomic_flag f; f.test_and_set(); atomic_flag_clear_explicit(&f, std::memory_order_seq_cst); assert(f.test_and_set() == 0); diff --git a/libcxx/test/std/atomics/atomics.flag/clear.pass.cpp b/libcxx/test/std/atomics/atomics.flag/clear.pass.cpp index ea5ae45ae99..65051af790d 100644 --- a/libcxx/test/std/atomics/atomics.flag/clear.pass.cpp +++ b/libcxx/test/std/atomics/atomics.flag/clear.pass.cpp @@ -22,49 +22,49 @@ int main() { { - std::atomic_flag f(false); + std::atomic_flag f; f.test_and_set(); f.clear(); assert(f.test_and_set() == 0); } { - std::atomic_flag f(false); + std::atomic_flag f; f.test_and_set(); f.clear(std::memory_order_relaxed); assert(f.test_and_set() == 0); } { - std::atomic_flag f(false); + std::atomic_flag f; f.test_and_set(); f.clear(std::memory_order_release); assert(f.test_and_set() == 0); } { - std::atomic_flag f(false); + std::atomic_flag f; f.test_and_set(); f.clear(std::memory_order_seq_cst); assert(f.test_and_set() == 0); } { - volatile std::atomic_flag f(false); + volatile std::atomic_flag f; f.test_and_set(); f.clear(); assert(f.test_and_set() == 0); } { - volatile std::atomic_flag f(false); + volatile std::atomic_flag f; f.test_and_set(); f.clear(std::memory_order_relaxed); assert(f.test_and_set() == 0); } { - volatile std::atomic_flag f(false); + volatile std::atomic_flag f; f.test_and_set(); f.clear(std::memory_order_release); assert(f.test_and_set() == 0); } { - volatile std::atomic_flag f(false); + volatile std::atomic_flag f; f.test_and_set(); f.clear(std::memory_order_seq_cst); assert(f.test_and_set() == 0); |