aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrançois Dumont <fdumont@gcc.gnu.org>2019-05-08 13:03:32 +0000
committerFrançois Dumont <fdumont@gcc.gnu.org>2019-05-08 13:03:32 +0000
commit857c72026ed7d78a7bf92f3d9a3d773f1a5edbc3 (patch)
treeb8198fb596d2ec31eefe9bab721134473b85f0dd
parent8363a2f1f7c47d7b3d1760ce631a6824e91c0d80 (diff)
downloadgcc-857c72026ed7d78a7bf92f3d9a3d773f1a5edbc3.zip
gcc-857c72026ed7d78a7bf92f3d9a3d773f1a5edbc3.tar.gz
gcc-857c72026ed7d78a7bf92f3d9a3d773f1a5edbc3.tar.bz2
re PR libstdc++/90277 (Debug Mode test failures)
2019-05-08 François Dumont <fdumont@gcc.gnu.org> PR libstdc++/90277 * testsuite/23_containers/unordered_multiset/insert/24061-multiset.cc (test01): Reserve for number of insertions to avoid rehash during test. * testsuite/23_containers/unordered_multimap/insert/24061-multimap.cc (test01): Likewise. * testsuite/23_containers/unordered_multimap/insert/24061-multimap.cc (test01): Likewise. (test02): Likewise. (test03): Likewise. From-SVN: r271011
-rw-r--r--libstdc++-v3/ChangeLog13
-rw-r--r--libstdc++-v3/testsuite/23_containers/unordered_multimap/insert/24061-multimap.cc3
-rw-r--r--libstdc++-v3/testsuite/23_containers/unordered_multimap/insert/hint.cc3
-rw-r--r--libstdc++-v3/testsuite/23_containers/unordered_multiset/insert/24061-multiset.cc1
4 files changed, 18 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 230de3e..15ac9fb 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,15 @@
+2019-05-08 François Dumont <fdumont@gcc.gnu.org>
+
+ PR libstdc++/90277
+ * testsuite/23_containers/unordered_multiset/insert/24061-multiset.cc
+ (test01): Reserve for number of insertions to avoid rehash during test.
+ * testsuite/23_containers/unordered_multimap/insert/24061-multimap.cc
+ (test01): Likewise.
+ * testsuite/23_containers/unordered_multimap/insert/24061-multimap.cc
+ (test01): Likewise.
+ (test02): Likewise.
+ (test03): Likewise.
+
2019-05-08 Jonathan Wakely <jwakely@redhat.com>
* include/experimental/bits/fs_path.h: Improve docs.
@@ -127,7 +139,6 @@
2019-05-04 François Dumont <fdumont@gcc.gnu.org>
- PR libstdc++/90277
* include/bits/hashtable.h (_Hashtable<>::rehash): Review comment.
* include/bits/hashtable_policy.h
(_Prime_rehash_policy::_M_bkt_for_elements): Use __builtin_ceill.
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/insert/24061-multimap.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/insert/24061-multimap.cc
index 717e920..1f7a590 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/insert/24061-multimap.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/insert/24061-multimap.cc
@@ -32,7 +32,8 @@ void test01()
typedef Mmap::value_type value_type;
Mmap mm1;
-
+ mm1.reserve(3);
+
iterator it1 = mm1.insert(mm1.begin(),
value_type("all the love in the world", 1));
VERIFY( mm1.size() == 1 );
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/insert/hint.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/insert/hint.cc
index a71a6a9..c38afc5 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multimap/insert/hint.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multimap/insert/hint.cc
@@ -29,6 +29,7 @@ void test01()
typedef typename Map::value_type Pair;
Map m;
+ m.reserve(3);
auto it1 = m.insert(Pair(0, 0));
VERIFY( it1 != m.end() );
@@ -58,6 +59,7 @@ void test02()
typedef typename Map::value_type Pair;
Map m;
+ m.reserve(5);
auto it1 = m.insert(Pair(0, 0));
auto it2 = m.insert(it1, Pair(1, 0));
@@ -89,6 +91,7 @@ void test03()
typedef typename Map::value_type Pair;
Map m;
+ m.reserve(3);
auto it1 = m.insert(Pair(0, 0));
VERIFY( it1 != m.end() );
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/insert/24061-multiset.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/insert/24061-multiset.cc
index 04833a6..0c1029f 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_multiset/insert/24061-multiset.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_multiset/insert/24061-multiset.cc
@@ -31,6 +31,7 @@ void test01()
typedef Mset::const_iterator const_iterator;
Mset ms1;
+ ms1.reserve(3);
iterator it1 = ms1.insert(ms1.begin(), "all the love in the world");
VERIFY( ms1.size() == 1 );