public inbox for libstdc++-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r11-9115] libstdc++: Fix CTAD for debug sequence containers
@ 2021-10-12 10:59 Jonathan Wakely
0 siblings, 0 replies; only message in thread
From: Jonathan Wakely @ 2021-10-12 10:59 UTC (permalink / raw)
To: gcc-cvs, libstdc++-cvs
https://gcc.gnu.org/g:822bd7f6a2fad3821f501d5a814a771a0c3a09fa
commit r11-9115-g822bd7f6a2fad3821f501d5a814a771a0c3a09fa
Author: Jonathan Wakely <jwakely@redhat.com>
Date: Tue Aug 17 18:19:27 2021 +0100
libstdc++: Fix CTAD for debug sequence containers
This fixes some 23_containers/*/cons/deduction.cc failures seen with
-std=c++17/-D_GLIBCXX_DEBUG, caused by non-immediate errors when
substituting template arguments into an incorrect specialization of the
std::__cxx1998 base class. This happens because the size_type member of
the debug container is _Base_type::size_type, so is non-deducible, and
the deduced types get substituted into _Base_type, triggering the
static_assert that checks the allocator's value_type matches the
container's.
The solution is to make the C(size_type, const T&, const Alloc&)
constructors of the debug sequence containers non-deducible. In order to
make CTAD work again deduction guides that use std::size_t for the first
argument are added.
Signed-off-by: Jonathan Wakely <jwakely@redhat.com>
libstdc++-v3/ChangeLog:
* include/debug/deque (deque(size_type, const T&, const A&)):
Prevent class template argument deduction and replace with a
deduction guide.
* include/debug/forward_list (forward_list(size_type, const T&, const A&)):
Likewise.
* include/debug/list (list(size_type, const T&, const A&)):
Likewise.
* include/debug/vector (vector(size_type, const T&, const A&)):
Likewise.
(cherry picked from commit 085c2f8f0e13d7c1515ce86755a52a31faf0cf47)
Diff:
---
libstdc++-v3/include/debug/deque | 7 ++++++-
libstdc++-v3/include/debug/forward_list | 7 ++++++-
libstdc++-v3/include/debug/list | 7 ++++++-
libstdc++-v3/include/debug/vector | 7 ++++++-
4 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/libstdc++-v3/include/debug/deque b/libstdc++-v3/include/debug/deque
index 227d083da04..4d19ec8f5fb 100644
--- a/libstdc++-v3/include/debug/deque
+++ b/libstdc++-v3/include/debug/deque
@@ -130,7 +130,7 @@ namespace __debug
deque(size_type __n, const _Allocator& __a = _Allocator())
: _Base(__n, __a) { }
- deque(size_type __n, const _Tp& __value,
+ deque(size_type __n, const __type_identity_t<_Tp>& __value,
const _Allocator& __a = _Allocator())
: _Base(__n, __value, __a) { }
#else
@@ -650,6 +650,11 @@ namespace __debug
typename = _RequireAllocator<_Allocator>>
deque(_InputIterator, _InputIterator, _Allocator = _Allocator())
-> deque<_ValT, _Allocator>;
+
+ template<typename _Tp, typename _Allocator = allocator<_Tp>,
+ typename = _RequireAllocator<_Allocator>>
+ deque(size_t, _Tp, _Allocator = _Allocator())
+ -> deque<_Tp, _Allocator>;
#endif
template<typename _Tp, typename _Alloc>
diff --git a/libstdc++-v3/include/debug/forward_list b/libstdc++-v3/include/debug/forward_list
index 16f0531dce7..46e8eb90916 100644
--- a/libstdc++-v3/include/debug/forward_list
+++ b/libstdc++-v3/include/debug/forward_list
@@ -251,7 +251,7 @@ namespace __debug
: _Base(__n, __al)
{ }
- forward_list(size_type __n, const _Tp& __value,
+ forward_list(size_type __n, const __type_identity_t<_Tp>& __value,
const allocator_type& __al = allocator_type())
: _Base(__n, __value, __al)
{ }
@@ -843,6 +843,11 @@ namespace __debug
typename = _RequireAllocator<_Allocator>>
forward_list(_InputIterator, _InputIterator, _Allocator = _Allocator())
-> forward_list<_ValT, _Allocator>;
+
+ template<typename _Tp, typename _Allocator = allocator<_Tp>,
+ typename = _RequireAllocator<_Allocator>>
+ forward_list(size_t, _Tp, _Allocator = _Allocator())
+ -> forward_list<_Tp, _Allocator>;
#endif
template<typename _Tp, typename _Alloc>
diff --git a/libstdc++-v3/include/debug/list b/libstdc++-v3/include/debug/list
index 01fe43fc7df..5e0adad3aea 100644
--- a/libstdc++-v3/include/debug/list
+++ b/libstdc++-v3/include/debug/list
@@ -135,7 +135,7 @@ namespace __debug
list(size_type __n, const allocator_type& __a = allocator_type())
: _Base(__n, __a) { }
- list(size_type __n, const _Tp& __value,
+ list(size_type __n, const __type_identity_t<_Tp>& __value,
const _Allocator& __a = _Allocator())
: _Base(__n, __value, __a) { }
#else
@@ -905,6 +905,11 @@ namespace __debug
typename = _RequireAllocator<_Allocator>>
list(_InputIterator, _InputIterator, _Allocator = _Allocator())
-> list<_ValT, _Allocator>;
+
+ template<typename _Tp, typename _Allocator = allocator<_Tp>,
+ typename = _RequireAllocator<_Allocator>>
+ list(size_t, _Tp, _Allocator = _Allocator())
+ -> list<_Tp, _Allocator>;
#endif
template<typename _Tp, typename _Alloc>
diff --git a/libstdc++-v3/include/debug/vector b/libstdc++-v3/include/debug/vector
index 987bba17c2b..c6bdc3458eb 100644
--- a/libstdc++-v3/include/debug/vector
+++ b/libstdc++-v3/include/debug/vector
@@ -182,7 +182,7 @@ namespace __debug
vector(size_type __n, const _Allocator& __a = _Allocator())
: _Base(__n, __a), _Safe_vector(__n) { }
- vector(size_type __n, const _Tp& __value,
+ vector(size_type __n, const __type_identity_t<_Tp>& __value,
const _Allocator& __a = _Allocator())
: _Base(__n, __value, __a) { }
#else
@@ -793,6 +793,11 @@ namespace __debug
typename = _RequireAllocator<_Allocator>>
vector(_InputIterator, _InputIterator, _Allocator = _Allocator())
-> vector<_ValT, _Allocator>;
+
+ template<typename _Tp, typename _Allocator = allocator<_Tp>,
+ typename = _RequireAllocator<_Allocator>>
+ vector(size_t, _Tp, _Allocator = _Allocator())
+ -> vector<_Tp, _Allocator>;
#endif
} // namespace __debug
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-10-12 10:59 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-12 10:59 [gcc r11-9115] libstdc++: Fix CTAD for debug sequence containers Jonathan Wakely
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).