re PR libstdc++/56012 ([C++11] Narrowing conversion in atomic_flag)
PR libstdc++/56012 * include/bits/atomic_base.h (atomic_flag): Fix narrowing conversion. * testsuite/29_atomics/atomic/operators/56012.cc: New. PR libstdc++/56011 * include/std/atomic (atomic<bool>::operator=(bool) volatile): Add missing overload. * testsuite/29_atomics/atomic/operators/56011.cc: New. From-SVN: r196296
This commit is contained in:
parent
d016367308
commit
a26f0501b4
|
@ -1,3 +1,14 @@
|
||||||
|
2013-02-26 Jonathan Wakely <jwakely.gcc@gmail.com>
|
||||||
|
|
||||||
|
PR libstdc++/56012
|
||||||
|
* include/bits/atomic_base.h (atomic_flag): Fix narrowing conversion.
|
||||||
|
* testsuite/29_atomics/atomic/operators/56012.cc: New.
|
||||||
|
|
||||||
|
PR libstdc++/56011
|
||||||
|
* include/std/atomic (atomic<bool>::operator=(bool) volatile): Add
|
||||||
|
missing overload.
|
||||||
|
* testsuite/29_atomics/atomic/operators/56011.cc: New.
|
||||||
|
|
||||||
2013-02-25 Jason Merrill <jason@redhat.com>
|
2013-02-25 Jason Merrill <jason@redhat.com>
|
||||||
|
|
||||||
* configure.ac: Check for __cxa_thread_atexit_impl.
|
* configure.ac: Check for __cxa_thread_atexit_impl.
|
||||||
|
|
|
@ -239,6 +239,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
|
||||||
template<typename _Tp>
|
template<typename _Tp>
|
||||||
struct atomic<_Tp*>;
|
struct atomic<_Tp*>;
|
||||||
|
|
||||||
|
/* The target's "set" value for test-and-set may not be exactly 1. */
|
||||||
|
#if __GCC_ATOMIC_TEST_AND_SET_TRUEVAL == 1
|
||||||
|
typedef bool __atomic_flag_data_type;
|
||||||
|
#else
|
||||||
|
typedef unsigned char __atomic_flag_data_type;
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Base type for atomic_flag.
|
* @brief Base type for atomic_flag.
|
||||||
|
@ -254,12 +260,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
|
||||||
|
|
||||||
struct __atomic_flag_base
|
struct __atomic_flag_base
|
||||||
{
|
{
|
||||||
/* The target's "set" value for test-and-set may not be exactly 1. */
|
__atomic_flag_data_type _M_i;
|
||||||
#if __GCC_ATOMIC_TEST_AND_SET_TRUEVAL == 1
|
|
||||||
bool _M_i;
|
|
||||||
#else
|
|
||||||
unsigned char _M_i;
|
|
||||||
#endif
|
|
||||||
};
|
};
|
||||||
|
|
||||||
_GLIBCXX_END_EXTERN_C
|
_GLIBCXX_END_EXTERN_C
|
||||||
|
@ -277,7 +278,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
|
||||||
|
|
||||||
// Conversion to ATOMIC_FLAG_INIT.
|
// Conversion to ATOMIC_FLAG_INIT.
|
||||||
constexpr atomic_flag(bool __i) noexcept
|
constexpr atomic_flag(bool __i) noexcept
|
||||||
: __atomic_flag_base({ __i ? __GCC_ATOMIC_TEST_AND_SET_TRUEVAL : 0 })
|
: __atomic_flag_base{ _S_init(__i) }
|
||||||
{ }
|
{ }
|
||||||
|
|
||||||
bool
|
bool
|
||||||
|
@ -313,6 +314,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
|
||||||
|
|
||||||
__atomic_clear (&_M_i, __m);
|
__atomic_clear (&_M_i, __m);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
static constexpr __atomic_flag_data_type
|
||||||
|
_S_init(bool __i)
|
||||||
|
{ return __i ? __GCC_ATOMIC_TEST_AND_SET_TRUEVAL : 0; }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -69,6 +69,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
|
||||||
operator=(bool __i) noexcept
|
operator=(bool __i) noexcept
|
||||||
{ return _M_base.operator=(__i); }
|
{ return _M_base.operator=(__i); }
|
||||||
|
|
||||||
|
bool
|
||||||
|
operator=(bool __i) volatile noexcept
|
||||||
|
{ return _M_base.operator=(__i); }
|
||||||
|
|
||||||
operator bool() const noexcept
|
operator bool() const noexcept
|
||||||
{ return _M_base.load(); }
|
{ return _M_base.load(); }
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,29 @@
|
||||||
|
// { dg-options "-std=gnu++0x" }
|
||||||
|
// { dg-do compile }
|
||||||
|
|
||||||
|
// Copyright (C) 2013 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
|
||||||
|
// <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
#include <atomic>
|
||||||
|
void test01()
|
||||||
|
{
|
||||||
|
using namespace std;
|
||||||
|
volatile atomic<bool> ab1 __attribute__((unused));
|
||||||
|
ab1 = true;
|
||||||
|
volatile atomic_bool ab2 __attribute__((unused));
|
||||||
|
ab2 = true;
|
||||||
|
}
|
|
@ -0,0 +1,26 @@
|
||||||
|
// { dg-options "-std=gnu++0x -Wsystem-headers -Wnarrowing" }
|
||||||
|
// { dg-do compile }
|
||||||
|
|
||||||
|
// Copyright (C) 2013 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
|
||||||
|
// <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
#include <atomic>
|
||||||
|
void test01()
|
||||||
|
{
|
||||||
|
using namespace std;
|
||||||
|
atomic_flag af __attribute__((unused)) = ATOMIC_FLAG_INIT;
|
||||||
|
}
|
Loading…
Reference in New Issue