From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id AE940385741C; Mon, 1 Nov 2021 20:18:36 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AE940385741C MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r10-10246] libstdc++: Fix range access for empty std::valarray [PR103022] X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/releases/gcc-10 X-Git-Oldrev: 55ec4f81e6c8a484d5f237b2186b1506e9dc9bd3 X-Git-Newrev: 2374dfc907a9eb6ae2940c0d49de37bcf96bd5e5 Message-Id: <20211101201836.AE940385741C@sourceware.org> Date: Mon, 1 Nov 2021 20:18:36 +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: Mon, 01 Nov 2021 20:18:36 -0000 https://gcc.gnu.org/g:2374dfc907a9eb6ae2940c0d49de37bcf96bd5e5 commit r10-10246-g2374dfc907a9eb6ae2940c0d49de37bcf96bd5e5 Author: Jonathan Wakely Date: Mon Nov 1 11:06:51 2021 +0000 libstdc++: Fix range access for empty std::valarray [PR103022] The std::begin and std::end overloads for std::valarray are defined in terms of std::addressof(v[0]) which is undefined for an empty valarray. libstdc++-v3/ChangeLog: PR libstdc++/103022 * include/std/valarray (begin, end): Do not dereference an empty valarray. Add noexcept and [[nodiscard]]. * testsuite/26_numerics/valarray/range_access.cc: Check empty valarray. Check iterator properties. Run as well as compiling. * testsuite/26_numerics/valarray/range_access2.cc: Likewise. * testsuite/26_numerics/valarray/103022.cc: New test. (cherry picked from commit 91bac9fed5d082f0b180834110ebc0f46f97599a) Diff: --- libstdc++-v3/include/std/valarray | 30 +++++++++---- .../testsuite/26_numerics/valarray/103022.cc | 15 +++++++ .../testsuite/26_numerics/valarray/range_access.cc | 49 +++++++++++++++++++--- .../26_numerics/valarray/range_access2.cc | 22 +++++++++- 4 files changed, 100 insertions(+), 16 deletions(-) diff --git a/libstdc++-v3/include/std/valarray b/libstdc++-v3/include/std/valarray index f5d08973765..96e2bcb290f 100644 --- a/libstdc++-v3/include/std/valarray +++ b/libstdc++-v3/include/std/valarray @@ -1210,9 +1210,10 @@ _DEFINE_BINARY_OPERATOR(>=, __greater_equal) * @param __va valarray. */ template + [[__nodiscard__]] inline _Tp* - begin(valarray<_Tp>& __va) - { return std::__addressof(__va[0]); } + begin(valarray<_Tp>& __va) noexcept + { return __va.size() ? std::__addressof(__va[0]) : nullptr; } /** * @brief Return an iterator pointing to the first element of @@ -1220,9 +1221,10 @@ _DEFINE_BINARY_OPERATOR(>=, __greater_equal) * @param __va valarray. */ template + [[__nodiscard__]] inline const _Tp* - begin(const valarray<_Tp>& __va) - { return std::__addressof(__va[0]); } + begin(const valarray<_Tp>& __va) noexcept + { return __va.size() ? std::__addressof(__va[0]) : nullptr; } /** * @brief Return an iterator pointing to one past the last element of @@ -1230,9 +1232,15 @@ _DEFINE_BINARY_OPERATOR(>=, __greater_equal) * @param __va valarray. */ template + [[__nodiscard__]] inline _Tp* - end(valarray<_Tp>& __va) - { return std::__addressof(__va[0]) + __va.size(); } + end(valarray<_Tp>& __va) noexcept + { + if (auto __n = __va.size()) + return std::__addressof(__va[0]) + __n; + else + return nullptr; + } /** * @brief Return an iterator pointing to one past the last element of @@ -1240,9 +1248,15 @@ _DEFINE_BINARY_OPERATOR(>=, __greater_equal) * @param __va valarray. */ template + [[__nodiscard__]] inline const _Tp* - end(const valarray<_Tp>& __va) - { return std::__addressof(__va[0]) + __va.size(); } + end(const valarray<_Tp>& __va) noexcept + { + if (auto __n = __va.size()) + return std::__addressof(__va[0]) + __n; + else + return nullptr; + } #endif // C++11 /// @} group numeric_arrays diff --git a/libstdc++-v3/testsuite/26_numerics/valarray/103022.cc b/libstdc++-v3/testsuite/26_numerics/valarray/103022.cc new file mode 100644 index 00000000000..d2e346760dd --- /dev/null +++ b/libstdc++-v3/testsuite/26_numerics/valarray/103022.cc @@ -0,0 +1,15 @@ +// { dg-options "-D_GLIBCXX_DEBUG" } +// { dg-do compile { target c++11 } } + +#include + +int main() +{ + // PR libstdc++/103022 + std::valarray va; + (void) std::begin(va); + (void) std::end(va); + const auto& cva = va; + (void) std::begin(cva); + (void) std::end(cva); +} diff --git a/libstdc++-v3/testsuite/26_numerics/valarray/range_access.cc b/libstdc++-v3/testsuite/26_numerics/valarray/range_access.cc index 709755dc678..2928fee0a21 100644 --- a/libstdc++-v3/testsuite/26_numerics/valarray/range_access.cc +++ b/libstdc++-v3/testsuite/26_numerics/valarray/range_access.cc @@ -1,4 +1,4 @@ -// { dg-do compile { target c++11 } } +// { dg-do run { target c++11 } } // Copyright (C) 2010-2020 Free Software Foundation, Inc. // @@ -17,7 +17,7 @@ // with this library; see the file COPYING3. If not see // . -// 26.6.10 valarray range access: [valarray.range] +// C++11 26.6.10 valarray range access: [valarray.range] #include @@ -25,9 +25,46 @@ void test01() { std::valarray va{1.0, 2.0, 3.0}; - std::begin(va); - std::end(va); + (void) std::begin(va); + (void) std::end(va); const auto& cva = va; - std::begin(cva); - std::end(cva); + (void) std::begin(cva); + (void) std::end(cva); + + using Iter = decltype(std::begin(va)); + using IterTraits = std::iterator_traits; + static_assert( std::is_same::value, "" ); + static_assert( std::is_same::value, "" ); + static_assert( std::is_same::value, "" ); + static_assert( std::is_same::value, "" ); + using CIter = decltype(std::begin(cva)); + using CIterTraits = std::iterator_traits; + static_assert( std::is_same::value, "" ); + static_assert( std::is_same::value, "" ); + static_assert( std::is_same::value, "" ); + static_assert( std::is_same::value, "" ); +#if __cplusplus >= 202002L + static_assert( std::contiguous_iterator ); + static_assert( std::contiguous_iterator ); +#endif +} + +// PR libstdc++/103022 +void +test02() +{ + std::valarray va; + (void) std::begin(va); + (void) std::end(va); + const auto& cva = va; + (void) std::begin(cva); + (void) std::end(cva); +} + +int main() +{ + test01(); + test02(); } diff --git a/libstdc++-v3/testsuite/26_numerics/valarray/range_access2.cc b/libstdc++-v3/testsuite/26_numerics/valarray/range_access2.cc index e4395a57e74..48f8019161b 100644 --- a/libstdc++-v3/testsuite/26_numerics/valarray/range_access2.cc +++ b/libstdc++-v3/testsuite/26_numerics/valarray/range_access2.cc @@ -1,4 +1,4 @@ -// { dg-do compile { target c++14 } } +// { dg-do run { target c++14 } } // Copyright (C) 2015-2020 Free Software Foundation, Inc. // @@ -17,7 +17,7 @@ // with this library; see the file COPYING3. If not see // . -// 26.6.10 valarray range access: [valarray.range] +// C++11 26.6.10 valarray range access: [valarray.range] #include #include @@ -33,3 +33,21 @@ test01() std::cbegin(cva); std::cend(cva); } + +// PR libstdc++/103022 +void +test02() +{ + std::valarray va; + (void) std::cbegin(va); + (void) std::cend(va); + const auto& cva = va; + (void) std::cbegin(cva); + (void) std::cend(cva); +} + +int main() +{ + test01(); + test02(); +}