From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2100) id C9D4C3870895; Sat, 22 Aug 2020 22:30:36 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C9D4C3870895 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1598135436; bh=buSu2e4oOHOhbP5xxEKDDJpOgXI5Aict+21v2IROSdA=; h=From:To:Subject:Date:From; b=cdD/uOgSe2NVTJMRKfmawpErqLT4yC9qDvzqvfxFMy2AunPxAM86AR+p7xoPTTpt6 em7V/6+Dui+EC10v2nylRiMJqwGMZVbgJx1VMxBB7+3MQw8E4XM9/M75ZK35IjcPKm 0Z8dXnpqpYPFbbnHY/N5g0IHZ5lhgK0GQVoeZx5o= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Giuliano Belinassi To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc/devel/autopar_devel] libstdc++: Make std::atomic_flag::test members const X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/devel/autopar_devel X-Git-Oldrev: 256ebac308aa452142f6efe2870a2d2fe90e1160 X-Git-Newrev: 1115e1732174d50d38354163fef132d60bf04949 Message-Id: <20200822223036.C9D4C3870895@sourceware.org> Date: Sat, 22 Aug 2020 22:30:36 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 Aug 2020 22:30:36 -0000 https://gcc.gnu.org/g:1115e1732174d50d38354163fef132d60bf04949 commit 1115e1732174d50d38354163fef132d60bf04949 Author: Jonathan Wakely Date: Fri Jun 12 10:22:05 2020 +0100 libstdc++: Make std::atomic_flag::test members const Also fix the tests so they run without an explicit -std=gnu++2a in the RUNTESTFLAGS, and test the new function on const-qualified objects. * include/bits/atomic_base.h (atomic_flag::test): Add missing const qualifiers. * testsuite/29_atomics/atomic_flag/test/explicit.cc: Add dg-options and verify results of test function. * testsuite/29_atomics/atomic_flag/test/implicit.cc: Likewise. Diff: --- libstdc++-v3/include/bits/atomic_base.h | 4 ++-- .../testsuite/29_atomics/atomic_flag/test/explicit.cc | 16 ++++++++++++---- .../testsuite/29_atomics/atomic_flag/test/implicit.cc | 16 ++++++++++++---- 3 files changed, 26 insertions(+), 10 deletions(-) diff --git a/libstdc++-v3/include/bits/atomic_base.h b/libstdc++-v3/include/bits/atomic_base.h index 01f77a0f372..ebcfeb4d51a 100644 --- a/libstdc++-v3/include/bits/atomic_base.h +++ b/libstdc++-v3/include/bits/atomic_base.h @@ -212,7 +212,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION #define __cpp_lib_atomic_flag_test 201907L _GLIBCXX_ALWAYS_INLINE bool - test(memory_order __m = memory_order_seq_cst) noexcept + test(memory_order __m = memory_order_seq_cst) const noexcept { __atomic_flag_data_type __v; __atomic_load(&_M_i, &__v, int(__m)); @@ -220,7 +220,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } _GLIBCXX_ALWAYS_INLINE bool - test(memory_order __m = memory_order_seq_cst) volatile noexcept + test(memory_order __m = memory_order_seq_cst) const volatile noexcept { __atomic_flag_data_type __v; __atomic_load(&_M_i, &__v, int(__m)); diff --git a/libstdc++-v3/testsuite/29_atomics/atomic_flag/test/explicit.cc b/libstdc++-v3/testsuite/29_atomics/atomic_flag/test/explicit.cc index 539656ba583..4f2a10d6d40 100644 --- a/libstdc++-v3/testsuite/29_atomics/atomic_flag/test/explicit.cc +++ b/libstdc++-v3/testsuite/29_atomics/atomic_flag/test/explicit.cc @@ -1,3 +1,4 @@ +// { dg-options "-std=gnu++2a" } // { dg-do run { target c++2a } } // { dg-require-thread-fence "" } @@ -19,14 +20,21 @@ // . #include +#include int main() { using namespace std; - atomic_flag af = ATOMIC_FLAG_INIT; - if (af.test(memory_order_acquire)) - af.clear(memory_order_release); + atomic_flag af0 = ATOMIC_FLAG_INIT; + VERIFY( ! af0.test(memory_order_acquire) ); - return 0; + atomic_flag af{true}; + const atomic_flag& caf = af; + + VERIFY( af.test(memory_order_acquire) ); + VERIFY( caf.test(memory_order_acquire) ); + af.clear(memory_order_release); + VERIFY( ! af.test(memory_order_acquire) ); + VERIFY( ! caf.test(memory_order_acquire) ); } diff --git a/libstdc++-v3/testsuite/29_atomics/atomic_flag/test/implicit.cc b/libstdc++-v3/testsuite/29_atomics/atomic_flag/test/implicit.cc index 11d29ac0b9e..3889f32b98a 100644 --- a/libstdc++-v3/testsuite/29_atomics/atomic_flag/test/implicit.cc +++ b/libstdc++-v3/testsuite/29_atomics/atomic_flag/test/implicit.cc @@ -1,3 +1,4 @@ +// { dg-options "-std=gnu++2a" } // { dg-do run { target c++2a } } // { dg-require-thread-fence "" } @@ -19,14 +20,21 @@ // . #include +#include int main() { using namespace std; - atomic_flag af = ATOMIC_FLAG_INIT; - if (af.test()) - af.clear(); + atomic_flag af0 = ATOMIC_FLAG_INIT; + VERIFY( ! af0.test(memory_order_acquire) ); - return 0; + atomic_flag af{true}; + const atomic_flag& caf = af; + + VERIFY( af.test() ); + VERIFY( caf.test() ); + af.clear(); + VERIFY( ! af.test() ); + VERIFY( ! caf.test() ); }