Commit 2ae27b70 by Jonathan Wakely Committed by Jonathan Wakely

PR69301 don't assume atomic<T> can default construct T

	PR libstdc++/69301
	* include/std/atomic (atomic<T>::load, atomic<T>::exchange): Use
	aligned buffer instead of default-initialized variable.
	* testsuite/29_atomics/atomic/69301.cc: New test.
	* include/experimental/memory (observer_ptr::release): Use reserved
	name.
	* include/ext/pointer.h (_Pointer_adapter::operator++(int))
	(_Pointer_adapter::operator--(int)): Likewise.

From-SVN: r244588
parent 3083fc56
2017-01-18 Jonathan Wakely <jwakely@redhat.com> 2017-01-18 Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/69301
* include/std/atomic (atomic<T>::load, atomic<T>::exchange): Use
aligned buffer instead of default-initialized variable.
* testsuite/29_atomics/atomic/69301.cc: New test.
* include/experimental/memory (observer_ptr::release): Use reserved
name.
* include/ext/pointer.h (_Pointer_adapter::operator++(int))
(_Pointer_adapter::operator--(int)): Likewise.
PR libstdc++/68925 PR libstdc++/68925
* include/experimental/random (randint): Use temporary instead of * include/experimental/random (randint): Use temporary instead of
thread_local static. thread_local static.
......
...@@ -124,9 +124,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -124,9 +124,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
constexpr __pointer constexpr __pointer
release() noexcept release() noexcept
{ {
__pointer tmp = get(); __pointer __tmp = get();
reset(); reset();
return tmp; return __tmp;
} }
constexpr void constexpr void
......
...@@ -449,9 +449,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -449,9 +449,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
inline _Pointer_adapter inline _Pointer_adapter
operator++(int) operator++(int)
{ {
_Pointer_adapter tmp(*this); _Pointer_adapter __tmp(*this);
_Storage_policy::set(_Storage_policy::get() + 1); _Storage_policy::set(_Storage_policy::get() + 1);
return tmp; return __tmp;
} }
inline _Pointer_adapter& inline _Pointer_adapter&
...@@ -464,9 +464,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -464,9 +464,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
inline _Pointer_adapter inline _Pointer_adapter
operator--(int) operator--(int)
{ {
_Pointer_adapter tmp(*this); _Pointer_adapter __tmp(*this);
_Storage_policy::set(_Storage_policy::get() - 1); _Storage_policy::set(_Storage_policy::get() - 1);
return tmp; return __tmp;
} }
}; // class _Pointer_adapter }; // class _Pointer_adapter
......
...@@ -245,36 +245,40 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -245,36 +245,40 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_Tp _Tp
load(memory_order __m = memory_order_seq_cst) const noexcept load(memory_order __m = memory_order_seq_cst) const noexcept
{ {
_Tp tmp; alignas(_Tp) unsigned char __buf[sizeof(_Tp)];
__atomic_load(std::__addressof(_M_i), std::__addressof(tmp), __m); _Tp* __ptr = reinterpret_cast<_Tp*>(__buf);
return tmp; __atomic_load(std::__addressof(_M_i), __ptr, __m);
return *__ptr;
} }
_Tp _Tp
load(memory_order __m = memory_order_seq_cst) const volatile noexcept load(memory_order __m = memory_order_seq_cst) const volatile noexcept
{ {
_Tp tmp; alignas(_Tp) unsigned char __buf[sizeof(_Tp)];
__atomic_load(std::__addressof(_M_i), std::__addressof(tmp), __m); _Tp* __ptr = reinterpret_cast<_Tp*>(__buf);
return tmp; __atomic_load(std::__addressof(_M_i), __ptr, __m);
return *__ptr;
} }
_Tp _Tp
exchange(_Tp __i, memory_order __m = memory_order_seq_cst) noexcept exchange(_Tp __i, memory_order __m = memory_order_seq_cst) noexcept
{ {
_Tp tmp; alignas(_Tp) unsigned char __buf[sizeof(_Tp)];
_Tp* __ptr = reinterpret_cast<_Tp*>(__buf);
__atomic_exchange(std::__addressof(_M_i), std::__addressof(__i), __atomic_exchange(std::__addressof(_M_i), std::__addressof(__i),
std::__addressof(tmp), __m); __ptr, __m);
return tmp; return *__ptr;
} }
_Tp _Tp
exchange(_Tp __i, exchange(_Tp __i,
memory_order __m = memory_order_seq_cst) volatile noexcept memory_order __m = memory_order_seq_cst) volatile noexcept
{ {
_Tp tmp; alignas(_Tp) unsigned char __buf[sizeof(_Tp)];
_Tp* __ptr = reinterpret_cast<_Tp*>(__buf);
__atomic_exchange(std::__addressof(_M_i), std::__addressof(__i), __atomic_exchange(std::__addressof(_M_i), std::__addressof(__i),
std::__addressof(tmp), __m); __ptr, __m);
return tmp; return *__ptr;
} }
bool bool
......
// Copyright (C) 2017 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/>.
// { dg-do run { target c++11 } }
#include <atomic>
#include <testsuite_hooks.h>
struct NonDefaultConstructible
{
NonDefaultConstructible(int i) : val(i) { }
int val;
};
template class std::atomic<NonDefaultConstructible>;
void
test01()
{
std::atomic<NonDefaultConstructible> a(1);
const auto n1 = a.exchange(2);
VERIFY( n1.val == 1 );
const auto n2 = a.load();
VERIFY( n2.val == 2 );
}
void
test02()
{
volatile std::atomic<NonDefaultConstructible> a(1);
const auto n1 = a.exchange(2);
VERIFY( n1.val == 1 );
const auto n2 = a.load();
VERIFY( n2.val == 2 );
}
int
main()
{
test01();
test02();
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment