On 01/06/21 19:10 +0100, Jonathan Wakely wrote:
On 01/06/21 18:47 +0100, Jonathan Wakely wrote:
On 01/06/21 18:45 +0100, Jonathan Wakely wrote:
On 22/05/21 18:35 +0200, François Dumont wrote:
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/96088.cc
b/libstdc++-v3/testsuite/23_containers/unordered_set/96088.cc
new file mode 100644
index 00000000000..53bb754dab6
--- /dev/null
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/96088.cc
@@ -0,0 +1,271 @@
+// { dg-do run { target c++11 } }
+
+// Copyright (C) 2021 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.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3. If not see
+// <http://www.gnu.org/licenses/>.
+
+// libstdc++/96088
+
+#include <string_view>
This is a c++11 test, but it uses <string_view>.
The test fails for make check RUNTESTFLAGS=--target_board=unix/-std=gnu++11
I assume it should use { target c++17 } instead?
Same for 23_containers/unordered_map/96088.cc
I've pushed this fix.
And this one too.
Tested x86_64-linux.
commit 81eab204a56dcd8acb1ca5d7df277437ca07b51a
Author: Jonathan Wakely <jwak...@redhat.com>
Date: Wed Jun 2 12:33:38 2021
libstdc++: Fix tests for COW std::string [PR 96088]
The expected number of allocations is different when copying COW
strings.
Signed-off-by: Jonathan Wakely <jwak...@redhat.com>
libstdc++-v3/ChangeLog:
PR libstdc++/96088
* testsuite/23_containers/unordered_map/96088.cc: Adjust
expected number of allocations.
* testsuite/23_containers/unordered_set/96088.cc: Likewise.
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/96088.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/96088.cc
index e552b04f8c8..83ca1c0afd6 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_map/96088.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/96088.cc
@@ -222,7 +222,8 @@ test03()
std::vector<std::pair<std::string, int>> v;
v.insert(v.end(), lst.begin(), lst.end());
- auto __offset = __gnu_test::counter::count();
+ const auto origin = __gnu_test::counter::count();
+
{
__gnu_test::counter::reset();
std::unordered_map<std::string, int,
@@ -231,15 +232,19 @@ test03()
um.insert(v.begin(), v.end());
VERIFY( um.size() == 1 );
- VERIFY( __gnu_test::counter::count() - __offset == 3 );
- VERIFY( __gnu_test::counter::get()._M_increments == 3 );
+ // Allocate array of buckets, a node, and the std::string (unless COW).
+ constexpr std::size_t increments = _GLIBCXX_USE_CXX11_ABI ? 3 : 2;
+
+ VERIFY( __gnu_test::counter::count() == origin + increments );
+ VERIFY( __gnu_test::counter::get()._M_increments == increments );
um.insert(v.begin(), v.end());
VERIFY( um.size() == 1 );
- VERIFY( __gnu_test::counter::count() - __offset == 3 );
- VERIFY( __gnu_test::counter::get()._M_increments == 3 );
+ VERIFY( __gnu_test::counter::count() == origin + increments );
+ VERIFY( __gnu_test::counter::get()._M_increments == increments );
}
+ VERIFY( __gnu_test::counter::count() == origin );
{
__gnu_test::counter::reset();
@@ -250,8 +255,11 @@ test03()
std::make_move_iterator(v.end()));
VERIFY( um.size() == 1 );
- VERIFY( __gnu_test::counter::count() - __offset == 2 );
- VERIFY( __gnu_test::counter::get()._M_increments == 2 );
+ // Allocate array of buckets and a node. String is moved.
+ constexpr std::size_t increments = 2;
+
+ VERIFY( __gnu_test::counter::count() == origin + increments );
+ VERIFY( __gnu_test::counter::get()._M_increments == increments );
}
}
diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/96088.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/96088.cc
index efb2f9eb6b1..83d5475c677 100644
--- a/libstdc++-v3/testsuite/23_containers/unordered_set/96088.cc
+++ b/libstdc++-v3/testsuite/23_containers/unordered_set/96088.cc
@@ -223,7 +223,8 @@ test03()
std::vector<std::string> v;
v.insert(v.end(), lst.begin(), lst.end());
- auto __offset = __gnu_test::counter::count();
+ const auto origin = __gnu_test::counter::count();
+
{
__gnu_test::counter::reset();
std::unordered_set<std::string,
@@ -232,15 +233,19 @@ test03()
us.insert(v.begin(), v.end());
VERIFY( us.size() == 1 );
- VERIFY( __gnu_test::counter::count() - __offset == 3 );
- VERIFY( __gnu_test::counter::get()._M_increments == 3 );
+ // Allocate array of buckets, a node, and the std::string (unless COW).
+ constexpr std::size_t increments = _GLIBCXX_USE_CXX11_ABI ? 3 : 2;
+
+ VERIFY( __gnu_test::counter::count() == origin + increments );
+ VERIFY( __gnu_test::counter::get()._M_increments == increments );
us.insert(v.begin(), v.end());
VERIFY( us.size() == 1 );
- VERIFY( __gnu_test::counter::count() - __offset == 3 );
- VERIFY( __gnu_test::counter::get()._M_increments == 3 );
+ VERIFY( __gnu_test::counter::count() == origin + increments );
+ VERIFY( __gnu_test::counter::get()._M_increments == increments );
}
+ VERIFY( __gnu_test::counter::count() == origin );
{
__gnu_test::counter::reset();
@@ -251,8 +256,11 @@ test03()
std::make_move_iterator(v.end()));
VERIFY( us.size() == 1 );
- VERIFY( __gnu_test::counter::count() - __offset == 2 );
- VERIFY( __gnu_test::counter::get()._M_increments == 2 );
+ // Allocate array of buckets and a node. String is moved.
+ constexpr std::size_t increments = 2;
+
+ VERIFY( __gnu_test::counter::count() == origin + increments );
+ VERIFY( __gnu_test::counter::get()._M_increments == increments );
}
}
