From eb04ee1d0f23b14c251a850f2a26429d324b1f6f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fran=C3=A7ois=20Dumont?= Date: Wed, 13 Jun 2018 20:27:26 +0000 Subject: [PATCH] =?utf8?q?2018-06-13=20=20Fran=C3=A7ois=20Dumont=20=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit * include/debug/helper_functions.h (__gnu_debug::_Safe_iterator<>): Add declaration. (__can_advance(_Ite, _Size)): New. (__can_advance(const _Safe_iterator<>&, _Size)): Overload declaration. * include/debug/functions.h (__gnu_debug::_Safe_iterator<>): Remove declaration. * include/debug/stl_iterator.h (__can_advance(const _Safe_iterator<>&)): New definition. * include/debug/stl_iterator.h (__can_advance(const std::reverse_iterator<>&, _Size)): New. (__can_advance(const std::move_iterator<>&, _Size)): New. * include/debug/macros.h (__glibcxx_check_can_increment): New. * include/debug/debug.h (__glibcxx_requires_can_increment): New. * include/bits/stl_algobase.h (fill_n): Use latter. * testsuite/25_algorithms/fill_n/2.cc: New. * testsuite/25_algorithms/fill_n/debug/1_neg.cc: New. * testsuite/25_algorithms/fill_n/debug/2_neg.cc: New. * testsuite/25_algorithms/fill_n/debug/3_neg.cc: New. * testsuite/25_algorithms/fill_n/debug/4_neg.cc: New. From-SVN: r261566 --- libstdc++-v3/ChangeLog | 20 ++++++++ libstdc++-v3/include/bits/stl_algobase.h | 1 + libstdc++-v3/include/debug/debug.h | 3 ++ libstdc++-v3/include/debug/functions.h | 3 -- libstdc++-v3/include/debug/helper_functions.h | 13 ++++++ libstdc++-v3/include/debug/macros.h | 7 +++ libstdc++-v3/include/debug/safe_iterator.h | 5 ++ libstdc++-v3/include/debug/stl_iterator.h | 10 ++++ .../testsuite/25_algorithms/fill_n/2.cc | 46 +++++++++++++++++++ .../25_algorithms/fill_n/debug/1_neg.cc | 39 ++++++++++++++++ .../25_algorithms/fill_n/debug/2_neg.cc | 39 ++++++++++++++++ .../25_algorithms/fill_n/debug/3_neg.cc | 39 ++++++++++++++++ .../25_algorithms/fill_n/debug/4_neg.cc | 43 +++++++++++++++++ 13 files changed, 265 insertions(+), 3 deletions(-) create mode 100644 libstdc++-v3/testsuite/25_algorithms/fill_n/2.cc create mode 100644 libstdc++-v3/testsuite/25_algorithms/fill_n/debug/1_neg.cc create mode 100644 libstdc++-v3/testsuite/25_algorithms/fill_n/debug/2_neg.cc create mode 100644 libstdc++-v3/testsuite/25_algorithms/fill_n/debug/3_neg.cc create mode 100644 libstdc++-v3/testsuite/25_algorithms/fill_n/debug/4_neg.cc diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 9f33999563b..223b32732dd 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -13,6 +13,26 @@ 2018-06-13 François Dumont + * include/debug/helper_functions.h + (__gnu_debug::_Safe_iterator<>): Add declaration. + (__can_advance(_Ite, _Size)): New. + (__can_advance(const _Safe_iterator<>&, _Size)): Overload declaration. + * include/debug/functions.h + (__gnu_debug::_Safe_iterator<>): Remove declaration. + * include/debug/stl_iterator.h + (__can_advance(const _Safe_iterator<>&)): New definition. + * include/debug/stl_iterator.h + (__can_advance(const std::reverse_iterator<>&, _Size)): New. + (__can_advance(const std::move_iterator<>&, _Size)): New. + * include/debug/macros.h (__glibcxx_check_can_increment): New. + * include/debug/debug.h (__glibcxx_requires_can_increment): New. + * include/bits/stl_algobase.h (fill_n): Use latter. + * testsuite/25_algorithms/fill_n/2.cc: New. + * testsuite/25_algorithms/fill_n/debug/1_neg.cc: New. + * testsuite/25_algorithms/fill_n/debug/2_neg.cc: New. + * testsuite/25_algorithms/fill_n/debug/3_neg.cc: New. + * testsuite/25_algorithms/fill_n/debug/4_neg.cc: New. + * include/debug/debug.h (__glibcxx_requires_can_increment_range): New. (__glibcxx_requires_can_decrement_range): New. diff --git a/libstdc++-v3/include/bits/stl_algobase.h b/libstdc++-v3/include/bits/stl_algobase.h index 877f32b0053..022a3f1598b 100644 --- a/libstdc++-v3/include/bits/stl_algobase.h +++ b/libstdc++-v3/include/bits/stl_algobase.h @@ -783,6 +783,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { // concept requirements __glibcxx_function_requires(_OutputIteratorConcept<_OI, _Tp>) + __glibcxx_requires_can_increment(__first, __n); return _OI(std::__fill_n_a(std::__niter_base(__first), __n, __value)); } diff --git a/libstdc++-v3/include/debug/debug.h b/libstdc++-v3/include/debug/debug.h index d055dcb1d9a..f157a6df9b4 100644 --- a/libstdc++-v3/include/debug/debug.h +++ b/libstdc++-v3/include/debug/debug.h @@ -62,6 +62,7 @@ namespace __gnu_debug # define __glibcxx_requires_cond(_Cond,_Msg) # define __glibcxx_requires_valid_range(_First,_Last) +# define __glibcxx_requires_can_increment(_First,_Size) # define __glibcxx_requires_can_increment_range(_First1,_Last1,_First2) # define __glibcxx_requires_can_decrement_range(_First1,_Last1,_First2) # define __glibcxx_requires_sorted(_First,_Last) @@ -88,6 +89,8 @@ namespace __gnu_debug # define __glibcxx_requires_cond(_Cond,_Msg) _GLIBCXX_DEBUG_VERIFY(_Cond,_Msg) # define __glibcxx_requires_valid_range(_First,_Last) \ __glibcxx_check_valid_range(_First,_Last) +# define __glibcxx_requires_can_increment(_First,_Size) \ + __glibcxx_check_can_increment(_First,_Size) # define __glibcxx_requires_can_increment_range(_First1,_Last1,_First2) \ __glibcxx_check_can_increment_range(_First1,_Last1,_First2) # define __glibcxx_requires_can_decrement_range(_First1,_Last1,_First2) \ diff --git a/libstdc++-v3/include/debug/functions.h b/libstdc++-v3/include/debug/functions.h index 3a2ba74fbbe..41519b26a60 100644 --- a/libstdc++-v3/include/debug/functions.h +++ b/libstdc++-v3/include/debug/functions.h @@ -40,9 +40,6 @@ namespace __gnu_debug { - template - class _Safe_iterator; - template struct _Insert_range_from_self_is_safe { enum { __value = 0 }; }; diff --git a/libstdc++-v3/include/debug/helper_functions.h b/libstdc++-v3/include/debug/helper_functions.h index 94d50163a2e..2073df95191 100644 --- a/libstdc++-v3/include/debug/helper_functions.h +++ b/libstdc++-v3/include/debug/helper_functions.h @@ -37,6 +37,9 @@ namespace __gnu_debug { + template + class _Safe_iterator; + /** The precision to which we can calculate the distance between * two iterators. */ @@ -164,6 +167,16 @@ namespace __gnu_debug return __valid_range(__first, __last, __dist); } + // Fallback method, always ok. + template + inline bool + __can_advance(_InputIterator, _Size) + { return true; } + + template + bool + __can_advance(const _Safe_iterator<_Iterator, _Sequence>&, _Size); + #if __cplusplus < 201103L // Helper struct to detect random access safe iterators. template diff --git a/libstdc++-v3/include/debug/macros.h b/libstdc++-v3/include/debug/macros.h index a88faf96e65..44f48b04b18 100644 --- a/libstdc++-v3/include/debug/macros.h +++ b/libstdc++-v3/include/debug/macros.h @@ -87,6 +87,13 @@ _GLIBCXX_DEBUG_VERIFY(_First != _Last, \ ._M_iterator(_First, #_First) \ ._M_iterator(_Last, #_Last)) +// Verify that [_First, _First + _Size) forms a valid range. +#define __glibcxx_check_can_increment(_First,_Size) \ +_GLIBCXX_DEBUG_VERIFY(__gnu_debug::__can_advance(_First, _Size), \ + _M_message(__gnu_debug::__msg_iter_subscript_oob) \ + ._M_iterator(_First, #_First) \ + ._M_integer(_Size, #_Size)) + #define __glibcxx_check_can_increment_range(_First1,_Last1,_First2) \ do \ { \ diff --git a/libstdc++-v3/include/debug/safe_iterator.h b/libstdc++-v3/include/debug/safe_iterator.h index 3a53ab723cd..7ed2b93b407 100644 --- a/libstdc++-v3/include/debug/safe_iterator.h +++ b/libstdc++-v3/include/debug/safe_iterator.h @@ -862,6 +862,11 @@ namespace __gnu_debug return __res; } + template + inline bool + __can_advance(const _Safe_iterator<_Iterator, _Sequence>& __it, _Size __n) + { return __it._M_can_advance(__n); } + #if __cplusplus < 201103L template struct __is_safe_random_iterator<_Safe_iterator<_Iterator, _Sequence> > diff --git a/libstdc++-v3/include/debug/stl_iterator.h b/libstdc++-v3/include/debug/stl_iterator.h index 21eac76d60a..a6a2a762766 100644 --- a/libstdc++-v3/include/debug/stl_iterator.h +++ b/libstdc++-v3/include/debug/stl_iterator.h @@ -47,6 +47,11 @@ namespace __gnu_debug const std::reverse_iterator<_Iterator>& __last) { return __get_distance(__last.base(), __first.base()); } + template + inline bool + __can_advance(const std::reverse_iterator<_Iterator>& __it, _Size __n) + { return __can_advance(__it.base(), -__n); } + #if __cplusplus < 201103L template struct __is_safe_random_iterator > @@ -96,6 +101,11 @@ namespace __gnu_debug const std::move_iterator<_Iterator>& __last) { return __get_distance(__first.base(), __last.base()); } + template + inline bool + __can_advance(const std::move_iterator<_Iterator>& __it, _Size __n) + { return __can_advance(__it.base(), __n); } + template inline auto __unsafe(const std::move_iterator<_Iterator>& __it) diff --git a/libstdc++-v3/testsuite/25_algorithms/fill_n/2.cc b/libstdc++-v3/testsuite/25_algorithms/fill_n/2.cc new file mode 100644 index 00000000000..6e18032e1e6 --- /dev/null +++ b/libstdc++-v3/testsuite/25_algorithms/fill_n/2.cc @@ -0,0 +1,46 @@ +// Copyright (C) 2018 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 +// . + +// 25.2.5 [lib.alg.fill] Fill_n. + +// { dg-require-debug-mode "" } + +#include +#include + +#include + +void +test01() +{ + std::vector ref; + ref.push_back(1); + ref.push_back(2); + + std::vector> vvect; + vvect.push_back(std::vector()); + vvect.push_back(std::vector()); + + VERIFY( std::fill_n(vvect.begin(), 2, ref) == vvect.end() ); +} + +int +main() +{ + test01(); + return 0; +} diff --git a/libstdc++-v3/testsuite/25_algorithms/fill_n/debug/1_neg.cc b/libstdc++-v3/testsuite/25_algorithms/fill_n/debug/1_neg.cc new file mode 100644 index 00000000000..45a88fe4ff9 --- /dev/null +++ b/libstdc++-v3/testsuite/25_algorithms/fill_n/debug/1_neg.cc @@ -0,0 +1,39 @@ +// Copyright (C) 2018 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 +// . + +// 25.2.5 [lib.alg.fill] Fill_n. + +// { dg-do run { xfail *-*-* } } +// { dg-require-debug-mode "" } + +#include +#include + +void +test01() +{ + std::vector vect; + vect.push_back(1); + std::fill_n(vect.begin(), 2, 0); +} + +int +main() +{ + test01(); + return 0; +} diff --git a/libstdc++-v3/testsuite/25_algorithms/fill_n/debug/2_neg.cc b/libstdc++-v3/testsuite/25_algorithms/fill_n/debug/2_neg.cc new file mode 100644 index 00000000000..3738ae6c08a --- /dev/null +++ b/libstdc++-v3/testsuite/25_algorithms/fill_n/debug/2_neg.cc @@ -0,0 +1,39 @@ +// Copyright (C) 2018 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 +// . + +// 25.2.5 [lib.alg.fill] Fill_n. + +// { dg-do run { xfail *-*-* } } +// { dg-require-debug-mode "" } + +#include +#include + +void +test01() +{ + std::vector vect; + vect.push_back(1); + std::fill_n(vect.rbegin(), 2, 0); +} + +int +main() +{ + test01(); + return 0; +} diff --git a/libstdc++-v3/testsuite/25_algorithms/fill_n/debug/3_neg.cc b/libstdc++-v3/testsuite/25_algorithms/fill_n/debug/3_neg.cc new file mode 100644 index 00000000000..1497dbb3942 --- /dev/null +++ b/libstdc++-v3/testsuite/25_algorithms/fill_n/debug/3_neg.cc @@ -0,0 +1,39 @@ +// Copyright (C) 2018 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 +// . + +// 25.2.5 [lib.alg.fill] Fill_n. + +// { dg-do run { xfail *-*-* } } +// { dg-require-debug-mode "" } + +#include +#include + +void +test01() +{ + std::list l; + l.push_back(1); + std::fill_n(l.begin(), 2, 0); +} + +int +main() +{ + test01(); + return 0; +} diff --git a/libstdc++-v3/testsuite/25_algorithms/fill_n/debug/4_neg.cc b/libstdc++-v3/testsuite/25_algorithms/fill_n/debug/4_neg.cc new file mode 100644 index 00000000000..70c4a2972a9 --- /dev/null +++ b/libstdc++-v3/testsuite/25_algorithms/fill_n/debug/4_neg.cc @@ -0,0 +1,43 @@ +// Copyright (C) 2018 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 +// . + +// 25.2.5 [lib.alg.fill] Fill_n. + +// { dg-do run { xfail *-*-* } } +// { dg-require-debug-mode "" } + +#include +#include + +void +test01() +{ + std::list l; + l.push_back(1); + l.push_back(2); + + std::list::iterator it = l.begin(); + ++it; + std::fill_n(it, 2, 0); +} + +int +main() +{ + test01(); + return 0; +} -- 2.30.2