OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add assertion to _Rb_tree::erase to check for end iterators 

* include/bits/stl_tree.h (_Rb_tree::_M_erase_aux(const_iterator)):
	Add assertion for undefined argument.
	(_Rb_tree::_M_erase_aux(const_iterator, const_iterator)): Call
	_M_erase_aux directly instead of through erase.
	(_Rb_tree::_M_erase_aux(const Key&)): Likewise.
	* testsuite/23_containers/map/modifiers/erase/end_neg.cc: New test.

From-SVN: r243757
This commit is contained in:
Jonathan Wakely 2016-12-16 18:13:09 +00:00 committed by Jonathan Wakely
parent 680153bd1e
commit 36b8852641
3 changed files with 56 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,12 @@
2016-12-16 Jonathan Wakely <jwakely@redhat.com>
* include/bits/stl_tree.h (_Rb_tree::_M_erase_aux(const_iterator)):
Add assertion for undefined argument.
(_Rb_tree::_M_erase_aux(const_iterator, const_iterator)): Call
_M_erase_aux directly instead of through erase.
(_Rb_tree::_M_erase_aux(const Key&)): Likewise.
* testsuite/23_containers/map/modifiers/erase/end_neg.cc: New test.
2016-12-16 Ville Voutilainen <ville.voutilainen@gmail.com>
Implement LWG 2769, Redundant const in the return type of

16
libstdc++-v3/include/bits/stl_tree.h
View File

@ -1104,6 +1104,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
iterator
erase(const_iterator __position)
{
__glibcxx_assert(__position != end());
const_iterator __result = __position;
++__result;
_M_erase_aux(__position);
@ -1115,6 +1116,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
iterator
erase(iterator __position)
{
__glibcxx_assert(__position != end());
iterator __result = __position;
++__result;
_M_erase_aux(__position);
@ -1123,11 +1125,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#else
void
erase(iterator __position)
{ _M_erase_aux(__position); }
{
__glibcxx_assert(__position != end());
_M_erase_aux(__position);
}
void
erase(const_iterator __position)
{ _M_erase_aux(__position); }
{
__glibcxx_assert(__position != end());
_M_erase_aux(__position);
}
#endif
size_type
erase(const key_type& __x);
@ -2477,7 +2485,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
clear();
else
while (__first != __last)
erase(__first++);
_M_erase_aux(__first++);
}
template<typename _Key, typename _Val, typename _KeyOfValue,
@ -2488,7 +2496,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{
pair<iterator, iterator> __p = equal_range(__x);
const size_type __old_size = size();
erase(__p.first, __p.second);
_M_erase_aux(__p.first, __p.second);
return __old_size - size();
}

35
libstdc++-v3/testsuite/23_containers/map/modifiers/erase/end_neg.cc Normal file
View File

@ -0,0 +1,35 @@
// Copyright (C) 2016 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-options "-D_GLIBCXX_ASSERTIONS" }
// { dg-do run { xfail *-*-* } }
#include <map>
void
test01()
{
std::map<int, int> m;
m[0];
m.erase(m.end());
}
int
main()
{
test01();
}