aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrançois Dumont <fdumont@gcc.gnu.org>2019-10-06 10:29:35 +0000
committerFrançois Dumont <fdumont@gcc.gnu.org>2019-10-06 10:29:35 +0000
commit2c6374228bc0aef10b89e5dd9131dbf99477f753 (patch)
tree76a7f261c398898ff59555a4ae872644d2b8f019
parentb1ca639a8692ac245753b10cb528e0db0f56dd57 (diff)
downloadgcc-2c6374228bc0aef10b89e5dd9131dbf99477f753.zip
gcc-2c6374228bc0aef10b89e5dd9131dbf99477f753.tar.gz
gcc-2c6374228bc0aef10b89e5dd9131dbf99477f753.tar.bz2
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
-rw-r--r--libstdc++-v3/ChangeLog7
-rw-r--r--libstdc++-v3/include/bits/stl_algo.h2
-rw-r--r--libstdc++-v3/testsuite/25_algorithms/copy_n/debug/1_neg.cc38
-rw-r--r--libstdc++-v3/testsuite/25_algorithms/copy_n/debug/2_neg.cc38
4 files changed, 85 insertions, 0 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 26d37d7..5cb2e29 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2019-10-06 François Dumont <fdumont@gcc.gnu.org>
+
+ * 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 <fdumont@gcc.gnu.org>
* include/debug/forward_list
diff --git a/libstdc++-v3/include/bits/stl_algo.h b/libstdc++-v3/include/bits/stl_algo.h
index b326c63..6dd01e1 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 0000000..3e0e029
--- /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
+// <http://www.gnu.org/licenses/>.
+
+// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
+
+#include <algorithm>
+#include <vector>
+
+void
+test01()
+{
+ std::vector<int> v1(3, 1);
+ std::vector<int> 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 0000000..ebc7cb5
--- /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
+// <http://www.gnu.org/licenses/>.
+
+// { dg-do run { target c++11 xfail *-*-* } }
+// { dg-require-debug-mode "" }
+
+#include <algorithm>
+#include <vector>
+
+void
+test01()
+{
+ std::vector<int> v1(5, 1);
+ std::vector<int> v2(3, 0);
+
+ std::copy_n(v1.begin(), 5, v2.begin());
+}
+
+int
+main()
+{
+ test01();
+ return 0;
+}