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

Fix PR22366. When move-constructing an associative container and explicitly passing an allocator that compares different, we were not calling the destructor of the elements in the moved-from container.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@227359 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Marshall Clow
2015-01-28 19:54:25 +00:00
parent a769d7ff49
commit 01c1c6fcc7
6 changed files with 244 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
test/std/containers/associative/map/map.cons/move_alloc.pass.cpp
View File

@@ -20,6 +20,7 @@
#include "../../../test_compare.h"
#include "test_allocator.h"
#include "min_allocator.h"
#include "Counter.h"
int main()
{
@@ -141,6 +142,53 @@ int main()
assert(m3.key_comp() == C(5));
assert(m1.empty());
}
{
typedef Counter<int> T;
typedef std::pair<int, T> V;
typedef std::pair<const int, T> VC;
typedef test_allocator<VC> A;
typedef std::less<int> C;
typedef std::map<const int, T, C, A> M;
typedef V* I;
Counter_base::gConstructed = 0;
{
V a1[] =
{
V(1, 1),
V(1, 2),
V(1, 3),
V(2, 1),
V(2, 2),
V(2, 3),
V(3, 1),
V(3, 2),
V(3, 3)
};
const size_t num = sizeof(a1)/sizeof(a1[0]);
assert(Counter_base::gConstructed == num);
M m1(I(a1), I(a1+num), C(), A());
assert(Counter_base::gConstructed == num+3);
M m2(m1);
assert(m2 == m1);
assert(Counter_base::gConstructed == num+6);
M m3(std::move(m1), A());
assert(m3 == m2);
assert(m1.empty());
assert(Counter_base::gConstructed == num+6);
{
M m4(std::move(m2), A(5));
assert(Counter_base::gConstructed == num+6);
assert(m4 == m3);
assert(m2.empty());
}
assert(Counter_base::gConstructed == num+3);
}
assert(Counter_base::gConstructed == 0);
}
#if __cplusplus >= 201103L
{
typedef std::pair<MoveOnly, MoveOnly> V;

48
test/std/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp
View File

@@ -20,6 +20,7 @@
#include "../../../test_compare.h"
#include "test_allocator.h"
#include "min_allocator.h"
#include "Counter.h"
int main()
{
@@ -141,6 +142,53 @@ int main()
assert(m3.key_comp() == C(5));
assert(m1.empty());
}
{
typedef Counter<int> T;
typedef std::pair<int, T> V;
typedef std::pair<const int, T> VC;
typedef test_allocator<VC> A;
typedef std::less<int> C;
typedef std::multimap<const int, T, C, A> M;
typedef V* I;
Counter_base::gConstructed = 0;
{
V a1[] =
{
V(1, 1),
V(1, 2),
V(1, 3),
V(2, 1),
V(2, 2),
V(2, 3),
V(3, 1),
V(3, 2),
V(3, 3)
};
const size_t num = sizeof(a1)/sizeof(a1[0]);
assert(Counter_base::gConstructed == num);
M m1(I(a1), I(a1+num), C(), A());
assert(Counter_base::gConstructed == 2*num);
M m2(m1);
assert(m2 == m1);
assert(Counter_base::gConstructed == 3*num);
M m3(std::move(m1), A());
assert(m3 == m2);
assert(m1.empty());
assert(Counter_base::gConstructed == 3*num);
{
M m4(std::move(m2), A(5));
assert(Counter_base::gConstructed == 3*num);
assert(m4 == m3);
assert(m2.empty());
}
assert(Counter_base::gConstructed == 2*num);
}
assert(Counter_base::gConstructed == 0);
}
#if __cplusplus >= 201103L
{
typedef std::pair<MoveOnly, MoveOnly> V;

46
test/std/containers/associative/multiset/multiset.cons/move_alloc.pass.cpp
View File

@@ -19,6 +19,7 @@
#include "../../../MoveOnly.h"
#include "../../../test_compare.h"
#include "test_allocator.h"
#include "Counter.h"
int main()
{
@@ -137,5 +138,50 @@ int main()
assert(m3.key_comp() == C(5));
assert(m1.empty());
}
{
typedef Counter<int> V;
typedef std::less<V> C;
typedef test_allocator<V> A;
typedef std::multiset<V, C, A> M;
typedef V* I;
Counter_base::gConstructed = 0;
{
V a1[] =
{
V(1),
V(1),
V(1),
V(2),
V(2),
V(2),
V(3),
V(3),
V(3)
};
const size_t num = sizeof(a1)/sizeof(a1[0]);
assert(Counter_base::gConstructed == num);
M m1(I(a1), I(a1+num), C(), A());
assert(Counter_base::gConstructed == 2*num);
M m2(m1);
assert(m2 == m1);
assert(Counter_base::gConstructed == 3*num);
M m3(std::move(m1), A());
assert(m3 == m2);
assert(m1.empty());
assert(Counter_base::gConstructed == 3*num);
{
M m4(std::move(m2), A(5));
assert(Counter_base::gConstructed == 3*num);
assert(m4 == m3);
assert(m2.empty());
}
assert(Counter_base::gConstructed == 2*num);
}
assert(Counter_base::gConstructed == 0);
}
#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
}

47
test/std/containers/associative/set/set.cons/move_alloc.pass.cpp
View File

@@ -19,6 +19,7 @@
#include "../../../MoveOnly.h"
#include "../../../test_compare.h"
#include "test_allocator.h"
#include "Counter.h"
int main()
{
@@ -137,5 +138,51 @@ int main()
assert(m3.key_comp() == C(5));
assert(m1.empty());
}
{
typedef Counter<int> V;
typedef std::less<V> C;
typedef test_allocator<V> A;
typedef std::set<V, C, A> M;
typedef V* I;
Counter_base::gConstructed = 0;
{
V a1[] =
{
V(1),
V(1),
V(1),
V(2),
V(2),
V(2),
V(3),
V(3),
V(3)
};
const size_t num = sizeof(a1)/sizeof(a1[0]);
assert(Counter_base::gConstructed == num);
M m1(I(a1), I(a1+num), C(), A());
assert(Counter_base::gConstructed == 3+num);
M m2(m1);
assert(m2 == m1);
assert(Counter_base::gConstructed == 6+num);
M m3(std::move(m1), A());
assert(m3 == m2);
assert(m1.empty());
assert(Counter_base::gConstructed == 6+num);
{
M m4(std::move(m2), A(5));
assert(Counter_base::gConstructed == 6+num);
assert(m4 == m3);
assert(m2.empty());
}
assert(Counter_base::gConstructed == 3+num);
}
assert(Counter_base::gConstructed == 0);
}
#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
}