diff options
author | Jonathan Wakely <jwakely@redhat.com> | 2020-05-27 22:55:21 +0100 |
---|---|---|
committer | Giuliano Belinassi <giuliano.belinassi@usp.br> | 2020-08-17 13:09:10 -0300 |
commit | b9a260e8e95b2fbba128bd7b2e2c25563fb7f6ff (patch) | |
tree | 62433a13d492a1207beb4369f6d97367feb697cc | |
parent | 9e2940721bf99fb52d01f9459cf32ddd0ca17e47 (diff) | |
download | gcc-b9a260e8e95b2fbba128bd7b2e2c25563fb7f6ff.tar.gz |
libstdc++: Fix atomic<FP>::load (PR 95282)
PR libstdc++/95282
* include/bits/atomic_base.h (__atomic_impl::load): Add
cv-qualifiers to parameter so that _Tp is deduced as the
unqualified type.
* testsuite/29_atomics/atomic_float/95282.cc: New test.
-rw-r--r-- | libstdc++-v3/include/bits/atomic_base.h | 2 | ||||
-rw-r--r-- | libstdc++-v3/testsuite/29_atomics/atomic_float/95282.cc | 35 |
2 files changed, 36 insertions, 1 deletions
diff --git a/libstdc++-v3/include/bits/atomic_base.h b/libstdc++-v3/include/bits/atomic_base.h index 3b66b040976..01f77a0f372 100644 --- a/libstdc++-v3/include/bits/atomic_base.h +++ b/libstdc++-v3/include/bits/atomic_base.h @@ -871,7 +871,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template<typename _Tp> _GLIBCXX_ALWAYS_INLINE _Tp - load(_Tp* __ptr, memory_order __m) noexcept + load(const volatile _Tp* __ptr, memory_order __m) noexcept { alignas(_Tp) unsigned char __buf[sizeof(_Tp)]; _Tp* __dest = reinterpret_cast<_Tp*>(__buf); diff --git a/libstdc++-v3/testsuite/29_atomics/atomic_float/95282.cc b/libstdc++-v3/testsuite/29_atomics/atomic_float/95282.cc new file mode 100644 index 00000000000..2de751c6ad4 --- /dev/null +++ b/libstdc++-v3/testsuite/29_atomics/atomic_float/95282.cc @@ -0,0 +1,35 @@ +// Copyright (C) 2020 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-options "-std=gnu++2a" } +// { dg-do compile { target c++2a } } + +#include <atomic> + +float +test01() +{ + std::atomic<float> a; + return a.load(); +} + +float +test02() +{ + volatile std::atomic<float> a; + return a.load(); +} |