TeamHeptaMirrors/gcc
1
0
Fork 1
mirror of https://github.com/gcc-mirror/gcc.git synced 2026-05-06 23:25:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

libstdc++: Use correct argument type for __use_alloc, again [PR 96803]

Browse Source 
While backporting 5494edae83 I noticed
that it's still not correct. I made the allocator-extended constructor
use the right type for the uses-allocator construction detection, but I
used an rvalue when it should be a const lvalue.

This should fix it properly this time.

libstdc++-v3/ChangeLog:

	PR libstdc++/96803
	* include/std/tuple
	(_Tuple_impl(allocator_arg_t, Alloc, const _Tuple_impl<U...>&)):
	Use correct value category in __use_alloc call.
	* testsuite/20_util/tuple/cons/96803.cc: Check with constructors
	that require correct value category to be used.
This commit is contained in:
Jonathan Wakely
2020-09-22 08:42:18 +01:00
parent d149962d6a
commit 7825399092
2 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libstdc++-v3/include/std/tuple
View File

@@ -355,7 +355,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
const _Tuple_impl<_Idx, _UHead, _UTails...>& __in)
: _Inherited(__tag, __a,
_Tuple_impl<_Idx, _UHead, _UTails...>::_M_tail(__in)),
_Base(__use_alloc<_Head, _Alloc, _UHead>(__a),
_Base(__use_alloc<_Head, _Alloc, const _UHead&>(__a),
_Tuple_impl<_Idx, _UHead, _UTails...>::_M_head(__in))
{ }

21
libstdc++-v3/testsuite/20_util/tuple/cons/96803.cc
View File

@@ -38,4 +38,25 @@ test01()
// std::tuple chooses wrong constructor for uses-allocator construction
std::tuple<int> o;
std::tuple<X> nok(std::allocator_arg, std::allocator<int>(), o);
std::tuple<int, int> oo;
std::tuple<X, X> nn(std::allocator_arg, std::allocator<int>(), oo);
}
struct Y
{
using allocator_type = std::allocator<int>;
Y(const X&) { }
Y(const X&, const allocator_type&) { }
Y(X&&) { }
Y(std::allocator_arg_t, const allocator_type&, X&&) { }
};
void
test02()
{
std::tuple<X, X> o{1, 1};
std::tuple<Y, Y> oo(std::allocator_arg, std::allocator<int>(), o);
}