maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fix for PR18735 - self-assignment for map/multimap gives incorrect results in C++03 

llvm-svn: 201021
This commit is contained in:
Marshall Clow 2014-02-08 04:03:14 +00:00
parent 57420b320c
commit 74cf6ff5e5
10 changed files with 171 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libcxx/include/map
View File

@ -884,10 +884,12 @@ public:
#if __cplusplus >= 201103L
__tree_ = __m.__tree_;
#else
__tree_.clear();
__tree_.value_comp() = __m.__tree_.value_comp();
__tree_.__copy_assign_alloc(__m.__tree_);
insert(__m.begin(), __m.end());
if (this != &__m) {
__tree_.clear();
__tree_.value_comp() = __m.__tree_.value_comp();
__tree_.__copy_assign_alloc(__m.__tree_);
insert(__m.begin(), __m.end());
}
#endif
return *this;
}
@ -1616,10 +1618,12 @@ public:
#if __cplusplus >= 201103L
__tree_ = __m.__tree_;
#else
__tree_.clear();
__tree_.value_comp() = __m.__tree_.value_comp();
__tree_.__copy_assign_alloc(__m.__tree_);
insert(__m.begin(), __m.end());
if (this != &__m) {
__tree_.clear();
__tree_.value_comp() = __m.__tree_.value_comp();
__tree_.__copy_assign_alloc(__m.__tree_);
insert(__m.begin(), __m.end());
}
#endif
return *this;
}

28
libcxx/include/unordered_map
View File

@ -831,12 +831,14 @@ public:
#if __cplusplus >= 201103L
__table_ = __u.__table_;
#else
__table_.clear();
__table_.hash_function() = __u.__table_.hash_function();
__table_.key_eq() = __u.__table_.key_eq();
__table_.max_load_factor() = __u.__table_.max_load_factor();
__table_.__copy_assign_alloc(__u.__table_);
insert(__u.begin(), __u.end());
if (this != &__u) {
__table_.clear();
__table_.hash_function() = __u.__table_.hash_function();
__table_.key_eq() = __u.__table_.key_eq();
__table_.max_load_factor() = __u.__table_.max_load_factor();
__table_.__copy_assign_alloc(__u.__table_);
insert(__u.begin(), __u.end());
}
#endif
return *this;
}
@ -1567,12 +1569,14 @@ public:
#if __cplusplus >= 201103L
__table_ = __u.__table_;
#else
__table_.clear();
__table_.hash_function() = __u.__table_.hash_function();
__table_.key_eq() = __u.__table_.key_eq();
__table_.max_load_factor() = __u.__table_.max_load_factor();
__table_.__copy_assign_alloc(__u.__table_);
insert(__u.begin(), __u.end());
if (this != &__u) {
__table_.clear();
__table_.hash_function() = __u.__table_.hash_function();
__table_.key_eq() = __u.__table_.key_eq();
__table_.max_load_factor() = __u.__table_.max_load_factor();
__table_.__copy_assign_alloc(__u.__table_);
insert(__u.begin(), __u.end());
}
#endif
return *this;
}

15
libcxx/test/containers/associative/map/map.cons/copy_assign.pass.cpp
View File

@ -57,6 +57,21 @@ int main()
assert(*next(mo.begin()) == V(2, 1));
assert(*next(mo.begin(), 2) == V(3, 1));
}
{
typedef std::pair<const int, double> V;
const V ar[] =
{
V(1, 1),
V(2, 1),
V(3, 1),
};
std::map<int, double> m(ar, ar+sizeof(ar)/sizeof(ar[0]));
std::map<int, double> *p = &m;
m = *p;
assert(m.size() == 3);
assert(std::equal(m.begin(), m.end(), ar));
}
{
typedef std::pair<const int, double> V;
V ar[] =

20
libcxx/test/containers/associative/multimap/multimap.cons/copy_assign.pass.cpp
View File

@ -48,6 +48,26 @@ int main()
assert(mo.get_allocator() == A(2));
assert(mo.key_comp() == C(5));
}
{
typedef std::pair<const int, double> V;
const V ar[] =
{
V(1, 1),
V(1, 1.5),
V(1, 2),
V(2, 1),
V(2, 1.5),
V(2, 2),
V(3, 1),
V(3, 1.5),
V(3, 2),
};
std::multimap<int, double> m(ar, ar+sizeof(ar)/sizeof(ar[0]));
std::multimap<int, double> *p = &m;
m = *p;
assert(m.size() == sizeof(ar)/sizeof(ar[0]));
assert(std::equal(m.begin(), m.end(), ar));
}
{
typedef std::pair<const int, double> V;
V ar[] =

20
libcxx/test/containers/associative/multiset/multiset.cons/copy_assign.pass.cpp
View File

@ -68,6 +68,26 @@ int main()
assert(*next(mo.begin(), 7) == 3);
assert(*next(mo.begin(), 8) == 3);
}
{
typedef int V;
const V ar[] =
{
1,
1,
1,
2,
2,
2,
3,
3,
3
};
std::multiset<int> m(ar, ar+sizeof(ar)/sizeof(ar[0]));
std::multiset<int> *p = &m;
m = *p;
assert(m.size() == 9);
assert(std::equal(m.begin(), m.end(), ar));
}
{
typedef int V;
V ar[] =

15
libcxx/test/containers/associative/set/set.cons/copy_assign.pass.cpp
View File

@ -56,6 +56,21 @@ int main()
assert(*next(mo.begin()) == 2);
assert(*next(mo.begin(), 2) == 3);
}
{
typedef int V;
const V ar[] =
{
1,
2,
3
};
std::set<int> m(ar, ar+sizeof(ar)/sizeof(ar[0]));
std::set<int> *p = &m;
m = *p;
assert(m.size() == 3);
assert(std::equal(m.begin(), m.end(), ar));
}
{
typedef int V;
V ar[] =

18
libcxx/test/containers/unord/unord.map/unord.map.cnstr/assign_copy.pass.cpp
View File

@ -72,6 +72,24 @@ int main()
assert(fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON);
assert(c.max_load_factor() == 1);
}
{
typedef std::unordered_map<int, std::string> C;
typedef std::pair<const int, std::string> P;
const P a[] =
{
P(1, "one"),
P(2, "two"),
P(3, "three"),
P(4, "four"),
P(1, "four"),
P(2, "four"),
};
C c(a, a + sizeof(a)/sizeof(a[0]));
C *p = &c;
c = *p;
assert(c.size() == 4);
assert(std::is_permutation(c.begin(), c.end(), a));
}
{
typedef other_allocator<std::pair<const int, std::string> > A;
typedef std::unordered_map<int, std::string,

18
libcxx/test/containers/unord/unord.multimap/unord.multimap.cnstr/assign_copy.pass.cpp
View File

@ -86,6 +86,24 @@ int main()
assert(fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON);
assert(c.max_load_factor() == 1);
}
{
typedef std::unordered_multimap<int, std::string> C;
typedef std::pair<const int, std::string> P;
const P a[] =
{
P(1, "one"),
P(2, "two"),
P(3, "three"),
P(4, "four"),
P(1, "four"),
P(2, "four"),
};
C c(a, a+sizeof(a)/sizeof(a[0]));
C *p = &c;
c = *p;
assert(c.size() == 6);
assert(std::is_permutation(c.begin(), c.end(), a));
}
{
typedef other_allocator<std::pair<const int, std::string> > A;
typedef std::unordered_multimap<int, std::string,

19
libcxx/test/containers/unord/unord.multiset/unord.multiset.cnstr/assign_copy.pass.cpp
View File

@ -79,6 +79,25 @@ int main()
assert(fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON);
assert(c.max_load_factor() == 1);
}
{
typedef std::unordered_multiset<int> C;
typedef int P;
P a[] =
{
P(1),
P(2),
P(3),
P(4),
P(1),
P(2)
};
C c(a, a + sizeof(a)/sizeof(a[0]));
C *p = &c;
c = *p;
assert(c.size() == 6);
assert(std::is_permutation(c.begin(), c.end(), a));
}
{
typedef other_allocator<int> A;
typedef std::unordered_multiset<int,

18
libcxx/test/containers/unord/unord.set/unord.set.cnstr/assign_copy.pass.cpp
View File

@ -71,6 +71,24 @@ int main()
assert(fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON);
assert(c.max_load_factor() == 1);
}
{
typedef std::unordered_set<int> C;
typedef int P;
P a[] =
{
P(1),
P(2),
P(3),
P(4),
P(1),
P(2)
};
C c(a, a + sizeof(a)/sizeof(a[0]));
C *p = &c;
c = *p;
assert(c.size() == 4);
assert(std::is_permutation(c.begin(), c.end(), a));
}
{
typedef other_allocator<int> A;
typedef std::unordered_set<int,