From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1059) id 34B6E393C888; Thu, 11 Jun 2020 12:53:16 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 34B6E393C888 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1591879996; bh=65/ySULw2WBzTcni5dUUPGkvFIr15pyftKRB9R3Kwj8=; h=From:To:Subject:Date:From; b=wkitXW0EqhttlRVf+s0BFdgItF+sE+kh1bfOehLjYrlri4AVE/FYGj/8eDD+ZsWKA +5HsuOt2S9dX7x0aauHheimHGAtje5liRWMo6ovGYPa6Zwv30i95KV0i8DfUvEFRyQ /33sdV/6D9hL2S1vSWlHEoys658rvogHAoaj2ACg= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Nathan Sidwell To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc/devel/c++-modules] libstdc++: Fix atomic::load (PR 95282) X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/devel/c++-modules X-Git-Oldrev: 6c2582c0406250c66e2eb3651f8e8638796b7f53 X-Git-Newrev: bbaec68c86f8e89a3460cc022c75d4c4179bfb0a Message-Id: <20200611125316.34B6E393C888@sourceware.org> Date: Thu, 11 Jun 2020 12:53:16 +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: Thu, 11 Jun 2020 12:53:16 -0000 https://gcc.gnu.org/g:bbaec68c86f8e89a3460cc022c75d4c4179bfb0a commit bbaec68c86f8e89a3460cc022c75d4c4179bfb0a Author: Jonathan Wakely Date: Wed May 27 22:55:21 2020 +0100 libstdc++: Fix atomic::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. Diff: --- libstdc++-v3/include/bits/atomic_base.h | 2 +- .../testsuite/29_atomics/atomic_float/95282.cc | 35 ++++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) 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 _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 +// . + +// { dg-options "-std=gnu++2a" } +// { dg-do compile { target c++2a } } + +#include + +float +test01() +{ + std::atomic a; + return a.load(); +} + +float +test02() +{ + volatile std::atomic a; + return a.load(); +}