77e0bf4e07
2011-07-19 François Dumont <francois.cppdevs@free.fr>
* include/debug/safe_unordered_base.h, safe_unordered_sequence.h,
safe_unordered_sequence.tcc, safe_local_iterator.h,
safe_local_iterator.tcc: New, support for unordered sequence safe
local iterators.
* include/Makefile.am: Add previous files.
* include/Makefile.in: Regenerate.
* include/debug/unordered_map, unordered_set: Implement
_Safe_unordered_sequence and expose _Safe_local_iterator.
* include/debug/safe_iterator.h, safe_iterator.tcc: Refactor
_Safe_iterator::_M_get_distance static method to expose it as
__get_distance function and use it in _Safe_local_iterator type.
* include/debug/formatter.h: Add __msg_local_iter_compare_bad
_Debug_msg_id enum entry to notify invalid comparison between local
iterators from different buckets. Add _Parameter constructor from
_Safe_local_iterator.
* include/debug/functions.h: Add __valid_range overload for
_Safe_local_iterator.
* src/debug.cc: Add _Safe_unordered_sequence_base and
_Safe_local_iterator_base methods implementations.
* config/abi/pre/gnu.ver: Add export of some
_Safe_unordered_sequence_base and _Safe_local_iterator_base methods.
* testsuite/util/debug/checks.h: Add use_invalid_iterator function to
simulate use of a singular iterator.
* testsuite/util/debug/unordered_checks.h: New, several functions
to simulate classic invalid usage of unordered sequence local
iterators.
* testsuite/23_containers/unordered_map/debug/
use_erased_local_iterator_neg.cc, invalid_local_iterator_range_neg.cc,
use_invalid_local_iterator_neg.cc, use_invalid_iterator_neg.cc,
invalid_local_iterator_compare_neg.cc: New.
* testsuite/23_containers/unordered_multimap/debug/
use_erased_local_iterator_neg.cc, invalid_local_iterator_range_neg.cc,
use_invalid_local_iterator_neg.cc, use_invalid_iterator_neg.cc,
invalid_local_iterator_compare_neg.cc: New.
* testsuite/23_containers/unordered_set/debug/
use_erased_local_iterator_neg.cc, invalid_local_iterator_range_neg.cc,
use_invalid_local_iterator_neg.cc, use_invalid_iterator_neg.cc,
invalid_local_iterator_compare_neg.cc: New.
* testsuite/23_containers/unordered_multiset/debug/
use_erased_local_iterator_neg.cc, invalid_local_iterator_range_neg.cc,
use_invalid_local_iterator_neg.cc, use_invalid_iterator_neg.cc,
invalid_local_iterator_compare_neg.cc: New.
From-SVN: r176487
76 lines
2.4 KiB
C++
76 lines
2.4 KiB
C++
// Debugging iterator implementation (out of line) -*- C++ -*-
|
|
|
|
// Copyright (C) 2011 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.
|
|
|
|
// Under Section 7 of GPL version 3, you are granted additional
|
|
// permissions described in the GCC Runtime Library Exception, version
|
|
// 3.1, as published by the Free Software Foundation.
|
|
|
|
// You should have received a copy of the GNU General Public License and
|
|
// a copy of the GCC Runtime Library Exception along with this program;
|
|
// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
|
// <http://www.gnu.org/licenses/>.
|
|
|
|
/** @file debug/safe_locale_iterator.tcc
|
|
* This file is a GNU debug extension to the Standard C++ Library.
|
|
*/
|
|
|
|
#ifndef _GLIBCXX_DEBUG_SAFE_LOCAL_ITERATOR_TCC
|
|
#define _GLIBCXX_DEBUG_SAFE_LOCAL_ITERATOR_TCC 1
|
|
|
|
namespace __gnu_debug
|
|
{
|
|
template<typename _Iterator, typename _Sequence>
|
|
template<typename _Other>
|
|
bool
|
|
_Safe_local_iterator<_Iterator, _Sequence>::
|
|
_M_valid_range(const _Safe_local_iterator<_Other, _Sequence>& __rhs) const
|
|
{
|
|
if (!_M_can_compare(__rhs))
|
|
return false;
|
|
if (_M_bucket != __rhs._M_bucket)
|
|
return false;
|
|
|
|
/* Determine if we can order the iterators without the help of
|
|
the container */
|
|
std::pair<difference_type, _Distance_precision> __dist =
|
|
__get_distance(base(), __rhs.base());
|
|
switch (__dist.second)
|
|
{
|
|
case __dp_equality:
|
|
if (__dist.first == 0)
|
|
return true;
|
|
break;
|
|
|
|
case __dp_sign:
|
|
case __dp_exact:
|
|
return __dist.first >= 0;
|
|
}
|
|
|
|
/* We can only test for equality, but check if one of the
|
|
iterators is at an extreme. */
|
|
/* Optim for classic [begin, it) or [it, end) ranges, limit checks
|
|
* when code is valid. */
|
|
if (_M_is_begin() || __rhs._M_is_end())
|
|
return true;
|
|
if (_M_is_end() || __rhs._M_is_begin())
|
|
return false;
|
|
|
|
// Assume that this is a valid range; we can't check anything else
|
|
return true;
|
|
}
|
|
} // namespace __gnu_debug
|
|
|
|
#endif
|