diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index b19ae1bdfe7..4f8367eaff0 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,16 @@ +2009-10-15 Benjamin Kosnik + + PR libstdc++/40654 + PR libstdc++/40826 + * src/atomic.cc (atomic_flag_test_and_set_explicit): Add + static_cast from base to derived. + (atomic_flag_clear_explicit): Same. + * include/bits/atomic_2.h (__atomic2::atomic_flag): Public derivation. + Remove value type constructor. + * include/bits/atomic_0.h (__atomic0::atomic_flag): Same. + * include/std/future (_Future_state): Use ATOMIC_FLAG_INIT to + initialized the atomic_flag member. + 2009-10-14 Benjamin Kosnik * doc/xml/authors.xml: Update. diff --git a/libstdc++-v3/include/bits/atomic_0.h b/libstdc++-v3/include/bits/atomic_0.h index a493ea66af9..0caffaf1e9f 100644 --- a/libstdc++-v3/include/bits/atomic_0.h +++ b/libstdc++-v3/include/bits/atomic_0.h @@ -82,14 +82,15 @@ namespace __atomic0 __r; }) /// atomic_flag - struct atomic_flag : private __atomic_flag_base + struct atomic_flag : public __atomic_flag_base { atomic_flag() = default; ~atomic_flag() = default; atomic_flag(const atomic_flag&) = delete; atomic_flag& operator=(const atomic_flag&) = delete; - atomic_flag(bool __i) { _M_i = __i; } // XXX deleted copy ctor != agg + // Conversion to ATOMIC_FLAG_INIT. + atomic_flag(bool __i): __atomic_flag_base({ __i }) { } bool test_and_set(memory_order __m = memory_order_seq_cst) volatile; diff --git a/libstdc++-v3/include/bits/atomic_2.h b/libstdc++-v3/include/bits/atomic_2.h index 8e8e7ff16f8..d39adb920a2 100644 --- a/libstdc++-v3/include/bits/atomic_2.h +++ b/libstdc++-v3/include/bits/atomic_2.h @@ -44,14 +44,15 @@ namespace __atomic2 { /// atomic_flag - struct atomic_flag : private __atomic_flag_base + struct atomic_flag : public __atomic_flag_base { atomic_flag() = default; ~atomic_flag() = default; atomic_flag(const atomic_flag&) = delete; atomic_flag& operator=(const atomic_flag&) = delete; - atomic_flag(bool __i) { _M_i = __i; } // XXX deleted copy ctor != agg + // Conversion to ATOMIC_FLAG_INIT. + atomic_flag(bool __i): __atomic_flag_base({ __i }) { } bool test_and_set(memory_order __m = memory_order_seq_cst) volatile diff --git a/libstdc++-v3/include/std/future b/libstdc++-v3/include/std/future index badb6e07e5a..f922dcd74d5 100644 --- a/libstdc++-v3/include/std/future +++ b/libstdc++-v3/include/std/future @@ -150,7 +150,7 @@ namespace std typedef _Future_ptr<_Future_result_base>::type _Future_ptr_type; public: - _Future_state() : _M_result(), _M_retrieved(false) { } + _Future_state() : _M_result(), _M_retrieved(ATOMIC_FLAG_INIT) { } _Future_state(const _Future_state&) = delete; _Future_state& operator=(const _Future_state&) = delete; diff --git a/libstdc++-v3/src/atomic.cc b/libstdc++-v3/src/atomic.cc index 3a2ff3d52e9..775bb7601c1 100644 --- a/libstdc++-v3/src/atomic.cc +++ b/libstdc++-v3/src/atomic.cc @@ -80,16 +80,16 @@ namespace std atomic_flag_test_and_set_explicit(volatile __atomic_flag_base* __a, memory_order __m) throw () { - volatile atomic_flag d(__a->_M_i); - return d.test_and_set(__m); + volatile atomic_flag* d = static_cast(__a); + return d->test_and_set(__m); } void atomic_flag_clear_explicit(volatile __atomic_flag_base* __a, memory_order __m) throw () { - volatile atomic_flag d(__a->_M_i); - return d.clear(__m); + volatile atomic_flag* d = static_cast(__a); + return d->clear(__m); } void diff --git a/libstdc++-v3/testsuite/29_atomics/atomic_flag/clear/1.c b/libstdc++-v3/testsuite/29_atomics/atomic_flag/clear/1.c new file mode 100644 index 00000000000..3fd2f2c799d --- /dev/null +++ b/libstdc++-v3/testsuite/29_atomics/atomic_flag/clear/1.c @@ -0,0 +1,34 @@ +// { dg-options "-x c -shared-libgcc -lstdc++" } + +// Copyright (C) 2009 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +#include +#include + +// libstdc++/40826 +// libstdc++/40654 +int main() +{ + atomic_flag f = ATOMIC_FLAG_INIT; + + atomic_flag_clear(&f); // set to false + assert( false == atomic_flag_test_and_set(&f) ); // return previous false, set to true + assert( true == atomic_flag_test_and_set(&f) ); // return true + + return 0; +} diff --git a/libstdc++-v3/testsuite/29_atomics/atomic_flag/clear/1.cc b/libstdc++-v3/testsuite/29_atomics/atomic_flag/clear/1.cc new file mode 100644 index 00000000000..6cb09f34b7a --- /dev/null +++ b/libstdc++-v3/testsuite/29_atomics/atomic_flag/clear/1.cc @@ -0,0 +1,33 @@ +// { dg-options "-std=gnu++0x" } + +// Copyright (C) 2009 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +#include +#include + +int main() +{ + bool test __attribute__((unused)) = true; + std::atomic_flag f = ATOMIC_FLAG_INIT; + + f.clear(); // set to false + VERIFY( false == f.test_and_set() ); // return previous false, set to true + VERIFY( true == f.test_and_set() ); // return true + + return 0; +}