From: "François Dumont" <frs.dumont@gmail.com>
To: libstdc++@gcc.gnu.org, gcc-patches <gcc-patches@gcc.gnu.org>
Subject: Re: Results for 8.0.1 20180316 (experimental) [trunk revision 258610] (GCC) libstdc++ testsuite on x86_64-pc-linux-gnu
Date: Tue, 20 Mar 2018 21:03:00 -0000 [thread overview]
Message-ID: <075b9c05-fc02-5d89-45ce-cde812bbca3f@gmail.com> (raw)
In-Reply-To: <CAH6eHdQZr1uB5ADsuj+A688mWbAObBmhuWQ_PQNpsOuA75gjFw@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1396 bytes --]
On 20/03/2018 19:20, Jonathan Wakely wrote:
> On 17 March 2018 at 09:01, Jonathan Wakely wrote:
>> Native configuration is x86_64-pc-linux-gnu
>>
>> === libstdc++ tests ===
>>
>>
>> Running target unix/-std=gnu++11/-D_GLIBCXX_ASSERTIONS
>>
>> === libstdc++ Summary for unix/-std=gnu++11/-D_GLIBCXX_ASSERTIONS ===
>>
>> # of expected passes 12330
>> # of expected failures 71
>> # of unsupported tests 579
>>
>> Running target unix/-std=gnu++11/-D_GLIBCXX_DEBUG
>> XPASS: 21_strings/basic_string_view/element_access/char/2.cc execution test
>> XPASS: 21_strings/basic_string_view/element_access/wchar_t/2.cc execution test
>> FAIL: 23_containers/bitset/hash/1.cc (test for excess errors)
>> UNRESOLVED: 23_containers/bitset/hash/1.cc compilation failed to produce executable
> These debug mode failures are regressions, reported as
> https://gcc.gnu.org/PR84998
>
> I think they all have the same root cause (Nathan fixed a bug in G++).
>
I had already prepared this patch. Thanks for explaining why we have
this problem now.
Note that I chose to use full specialization with std::hash<> for std::bitset and std::vector<bool>.
It also fix a versioned namespace issue when partially specializing std::hash for debug vector<bool>.
Tested under Linux x86_64 normal, debug and versioned namespace modes.
Ok to commit ?
François
[-- Attachment #2: friend_declaration_debug.patch --]
[-- Type: text/x-patch, Size: 5925 bytes --]
diff --git a/libstdc++-v3/include/bits/stl_bvector.h b/libstdc++-v3/include/bits/stl_bvector.h
index fbf982f..05e9ff2 100644
--- a/libstdc++-v3/include/bits/stl_bvector.h
+++ b/libstdc++-v3/include/bits/stl_bvector.h
@@ -58,6 +58,7 @@
#if __cplusplus >= 201103L
#include <initializer_list>
+#include <bits/functional_hash.h>
#endif
namespace std _GLIBCXX_VISIBILITY(default)
@@ -593,7 +594,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
typedef typename _Base::_Bit_alloc_traits _Bit_alloc_traits;
#if __cplusplus >= 201103L
- template<typename> friend struct hash;
+ friend struct std::hash<vector>;
#endif
public:
@@ -1321,8 +1322,6 @@ _GLIBCXX_END_NAMESPACE_VERSION
#if __cplusplus >= 201103L
-#include <bits/functional_hash.h>
-
namespace std _GLIBCXX_VISIBILITY(default)
{
_GLIBCXX_BEGIN_NAMESPACE_VERSION
diff --git a/libstdc++-v3/include/bits/stl_map.h b/libstdc++-v3/include/bits/stl_map.h
index 2632775..78ac087 100644
--- a/libstdc++-v3/include/bits/stl_map.h
+++ b/libstdc++-v3/include/bits/stl_map.h
@@ -633,7 +633,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
{ return _M_t._M_reinsert_node_hint_unique(__hint, std::move(__nh)); }
template<typename, typename>
- friend class _Rb_tree_merge_helper;
+ friend class std::_Rb_tree_merge_helper;
template<typename _C2>
void
diff --git a/libstdc++-v3/include/bits/stl_multimap.h b/libstdc++-v3/include/bits/stl_multimap.h
index 31beb84..371cd43 100644
--- a/libstdc++-v3/include/bits/stl_multimap.h
+++ b/libstdc++-v3/include/bits/stl_multimap.h
@@ -651,7 +651,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
{ return _M_t._M_reinsert_node_hint_equal(__hint, std::move(__nh)); }
template<typename, typename>
- friend class _Rb_tree_merge_helper;
+ friend class std::_Rb_tree_merge_helper;
template<typename _C2>
void
diff --git a/libstdc++-v3/include/bits/stl_multiset.h b/libstdc++-v3/include/bits/stl_multiset.h
index 1bba400..7286df6 100644
--- a/libstdc++-v3/include/bits/stl_multiset.h
+++ b/libstdc++-v3/include/bits/stl_multiset.h
@@ -589,7 +589,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
{ return _M_t._M_reinsert_node_hint_equal(__hint, std::move(__nh)); }
template<typename, typename>
- friend class _Rb_tree_merge_helper;
+ friend class std::_Rb_tree_merge_helper;
template<typename _Compare1>
void
diff --git a/libstdc++-v3/include/bits/stl_set.h b/libstdc++-v3/include/bits/stl_set.h
index f79ab1c..b6b2fc4f 100644
--- a/libstdc++-v3/include/bits/stl_set.h
+++ b/libstdc++-v3/include/bits/stl_set.h
@@ -604,7 +604,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
{ return _M_t._M_reinsert_node_hint_unique(__hint, std::move(__nh)); }
template<typename, typename>
- friend class _Rb_tree_merge_helper;
+ friend class std::_Rb_tree_merge_helper;
template<typename _Compare1>
void
diff --git a/libstdc++-v3/include/bits/unordered_map.h b/libstdc++-v3/include/bits/unordered_map.h
index b757ff2..07aad9e 100644
--- a/libstdc++-v3/include/bits/unordered_map.h
+++ b/libstdc++-v3/include/bits/unordered_map.h
@@ -862,7 +862,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
#if __cplusplus > 201402L
template<typename, typename, typename>
- friend class _Hash_merge_helper;
+ friend class std::_Hash_merge_helper;
template<typename _H2, typename _P2>
void
@@ -1742,7 +1742,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
#if __cplusplus > 201402L
template<typename, typename, typename>
- friend class _Hash_merge_helper;
+ friend class std::_Hash_merge_helper;
template<typename _H2, typename _P2>
void
diff --git a/libstdc++-v3/include/bits/unordered_set.h b/libstdc++-v3/include/bits/unordered_set.h
index 77942a3..c9ac4ad 100644
--- a/libstdc++-v3/include/bits/unordered_set.h
+++ b/libstdc++-v3/include/bits/unordered_set.h
@@ -588,7 +588,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
#if __cplusplus > 201402L
template<typename, typename, typename>
- friend class _Hash_merge_helper;
+ friend class std::_Hash_merge_helper;
template<typename _H2, typename _P2>
void
@@ -1368,7 +1368,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
#if __cplusplus > 201402L
template<typename, typename, typename>
- friend class _Hash_merge_helper;
+ friend class std::_Hash_merge_helper;
template<typename _H2, typename _P2>
void
diff --git a/libstdc++-v3/include/debug/vector b/libstdc++-v3/include/debug/vector
index fa79379..5289265 100644
--- a/libstdc++-v3/include/debug/vector
+++ b/libstdc++-v3/include/debug/vector
@@ -770,6 +770,8 @@ namespace __debug
} // namespace __debug
#if __cplusplus >= 201103L
+_GLIBCXX_BEGIN_NAMESPACE_VERSION
+
// DR 1182.
/// std::hash specialization for vector<bool>.
template<typename _Alloc>
@@ -780,6 +782,8 @@ namespace __debug
operator()(const __debug::vector<bool, _Alloc>& __b) const noexcept
{ return std::hash<_GLIBCXX_STD_C::vector<bool, _Alloc>>()(__b); }
};
+
+_GLIBCXX_END_NAMESPACE_VERSION
#endif
} // namespace std
diff --git a/libstdc++-v3/include/std/bitset b/libstdc++-v3/include/std/bitset
index 630602d..e598ea3 100644
--- a/libstdc++-v3/include/std/bitset
+++ b/libstdc++-v3/include/std/bitset
@@ -50,6 +50,10 @@
#include <iosfwd>
#include <bits/cxxabi_forced.h>
+#if __cplusplus >= 201103L
+# include <bits/functional_hash.h>
+#endif
+
#define _GLIBCXX_BITSET_BITS_PER_WORD (__CHAR_BIT__ * __SIZEOF_LONG__)
#define _GLIBCXX_BITSET_WORDS(__n) \
((__n) / _GLIBCXX_BITSET_BITS_PER_WORD + \
@@ -779,7 +783,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
}
#if __cplusplus >= 201103L
- template<typename> friend struct hash;
+ friend struct std::hash<bitset>;
#endif
public:
@@ -1549,8 +1553,6 @@ _GLIBCXX_END_NAMESPACE_CONTAINER
#if __cplusplus >= 201103L
-#include <bits/functional_hash.h>
-
namespace std _GLIBCXX_VISIBILITY(default)
{
_GLIBCXX_BEGIN_NAMESPACE_VERSION
next parent reply other threads:[~2018-03-20 21:02 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <5aacd955.W97SAA9Qc1hoHlKB%jwakely.gcc@gmail.com>
[not found] ` <CAH6eHdQZr1uB5ADsuj+A688mWbAObBmhuWQ_PQNpsOuA75gjFw@mail.gmail.com>
2018-03-20 21:03 ` François Dumont [this message]
2018-03-20 21:44 ` Jonathan Wakely
2018-03-21 12:33 ` Jonathan Wakely
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=075b9c05-fc02-5d89-45ce-cde812bbca3f@gmail.com \
--to=frs.dumont@gmail.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=libstdc++@gcc.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).