generic-library/cxx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix bug in __libcpp_db::__iterator_copy. Add debug test for swaping lists.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@178892 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Howard Hinnant 2013-04-05 17:58:52 +00:00
parent e1e96cb840
commit 6dcaf3ee1a
3 changed files with 45 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/list
View File

@ -394,7 +394,7 @@ public:
#endif #endif
} }
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
__list_const_iterator(__list_iterator<_Tp, _VoidPtr> __p) _NOEXCEPT __list_const_iterator(const __list_iterator<_Tp, _VoidPtr>& __p) _NOEXCEPT
: __ptr_(__p.__ptr_) : __ptr_(__p.__ptr_)
{ {
#if _LIBCPP_DEBUG_LEVEL >= 2 #if _LIBCPP_DEBUG_LEVEL >= 2

5
src/debug.cpp
View File

@ -110,8 +110,7 @@ __libcpp_db::__find_c_from_i(void* __i) const
{ {
RLock _(mut()); RLock _(mut());
__i_node* i = __find_iterator(__i); __i_node* i = __find_iterator(__i);
_LIBCPP_ASSERT(i != nullptr, "iterator constructed in translation unit with debug mode not enabled." _LIBCPP_ASSERT(i != nullptr, "iterator not found in debug database.");
" #define _LIBCPP_DEBUG2 1 for that translation unit.");
return i->__c_ != nullptr ? i->__c_->__c_ : nullptr; return i->__c_ != nullptr ? i->__c_->__c_ : nullptr;
} }
@ -302,7 +301,7 @@ __libcpp_db::__iterator_copy(void* __i, const void* __i0)
__i_node* i = __find_iterator(__i); __i_node* i = __find_iterator(__i);
__i_node* i0 = __find_iterator(__i0); __i_node* i0 = __find_iterator(__i0);
__c_node* c0 = i0 != nullptr ? i0->__c_ : nullptr; __c_node* c0 = i0 != nullptr ? i0->__c_ : nullptr;
if (i == nullptr && c0 != nullptr) if (i == nullptr && i0 != nullptr)
i = __insert_iterator(__i); i = __insert_iterator(__i);
__c_node* c = i != nullptr ? i->__c_ : nullptr; __c_node* c = i != nullptr ? i->__c_ : nullptr;
if (c != c0) if (c != c0)

42
test/containers/sequences/list/list.special/db_swap_1.pass.cpp Normal file
View File

@ -0,0 +1,42 @@
//===----------------------------------------------------------------------===//
//
// The LLVM Compiler Infrastructure
//
// This file is dual licensed under the MIT and the University of Illinois Open
// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
// <list>
// template <class T, class Alloc>
// void swap(list<T,Alloc>& x, list<T,Alloc>& y);
#if _LIBCPP_DEBUG2 >= 1
#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
#endif
#include <list>
#include <cassert>
#include <__debug>
int main()
{
#if _LIBCPP_DEBUG2 >= 1
{
int a1[] = {1, 3, 7, 9, 10};
int a2[] = {0, 2, 4, 5, 6, 8, 11};
std::list<int> c1(a1, a1+sizeof(a1)/sizeof(a1[0]));
std::list<int> c2(a2, a2+sizeof(a2)/sizeof(a2[0]));
std::list<int>::iterator i1 = c1.begin();
std::list<int>::iterator i2 = c2.begin();
swap(c1, c2);
c1.erase(i2);
c2.erase(i1);
std::list<int>::iterator j = i1;
c1.erase(i1);
assert(false);
}
#endif
}