From 2c6374228bc0aef10b89e5dd9131dbf99477f753 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fran=C3=A7ois=20Dumont?= Date: Sun, 6 Oct 2019 10:29:35 +0000 Subject: [PATCH] Add std::copy_n __glibcxx_requires_can_increment checks. * include/bits/stl_algo.h (copy_n): Add __glibcxx_requires_can_increment debug checks. * testsuite/25_algorithms/copy_n/debug/1_neg.cc: New. * testsuite/25_algorithms/copy_n/debug/2_neg.cc: New. From-SVN: r276636 --- libstdc++-v3/ChangeLog | 7 ++++ libstdc++-v3/include/bits/stl_algo.h | 2 + .../25_algorithms/copy_n/debug/1_neg.cc | 38 +++++++++++++++++++ .../25_algorithms/copy_n/debug/2_neg.cc | 38 +++++++++++++++++++ 4 files changed, 85 insertions(+) create mode 100644 libstdc++-v3/testsuite/25_algorithms/copy_n/debug/1_neg.cc create mode 100644 libstdc++-v3/testsuite/25_algorithms/copy_n/debug/2_neg.cc diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 26d37d7effb..5cb2e2924ee 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2019-10-06 François Dumont + + * include/bits/stl_algo.h (copy_n): Add __glibcxx_requires_can_increment + debug checks. + * testsuite/25_algorithms/copy_n/debug/1_neg.cc: New. + * testsuite/25_algorithms/copy_n/debug/2_neg.cc: New. + 2019-10-04 François Dumont * include/debug/forward_list diff --git a/libstdc++-v3/include/bits/stl_algo.h b/libstdc++-v3/include/bits/stl_algo.h index b326c6305d8..6dd01e1943c 100644 --- a/libstdc++-v3/include/bits/stl_algo.h +++ b/libstdc++-v3/include/bits/stl_algo.h @@ -826,6 +826,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>) __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator, typename iterator_traits<_InputIterator>::value_type>) + __glibcxx_requires_can_increment(__first, __n); + __glibcxx_requires_can_increment(__result, __n); return std::__copy_n(__first, __n, __result, std::__iterator_category(__first)); diff --git a/libstdc++-v3/testsuite/25_algorithms/copy_n/debug/1_neg.cc b/libstdc++-v3/testsuite/25_algorithms/copy_n/debug/1_neg.cc new file mode 100644 index 00000000000..3e0e0299e1d --- /dev/null +++ b/libstdc++-v3/testsuite/25_algorithms/copy_n/debug/1_neg.cc @@ -0,0 +1,38 @@ +// Copyright (C) 2019 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-do run { target c++11 xfail *-*-* } } +// { dg-require-debug-mode "" } + +#include +#include + +void +test01() +{ + std::vector v1(3, 1); + std::vector v2(5, 0); + + std::copy_n(v1.begin(), 5, v2.begin()); +} + +int +main() +{ + test01(); + return 0; +} diff --git a/libstdc++-v3/testsuite/25_algorithms/copy_n/debug/2_neg.cc b/libstdc++-v3/testsuite/25_algorithms/copy_n/debug/2_neg.cc new file mode 100644 index 00000000000..ebc7cb5ea4c --- /dev/null +++ b/libstdc++-v3/testsuite/25_algorithms/copy_n/debug/2_neg.cc @@ -0,0 +1,38 @@ +// Copyright (C) 2019 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-do run { target c++11 xfail *-*-* } } +// { dg-require-debug-mode "" } + +#include +#include + +void +test01() +{ + std::vector v1(5, 1); + std::vector v2(3, 0); + + std::copy_n(v1.begin(), 5, v2.begin()); +} + +int +main() +{ + test01(); + return 0; +} -- 2.30.2