From 7a66745357510da6a18759839e4d8fc4715166a0 Mon Sep 17 00:00:00 2001 From: Ville Voutilainen Date: Sun, 5 Jun 2016 20:39:10 +0300 Subject: [PATCH] Protect allocator-overloads of tuple-from-tuple constructors from cases that would create dangling references. Protect allocator-overloads of tuple-from-tuple constructors from cases that would create dangling references. * include/std/tuple (tuple(allocator_arg_t, const _Alloc&, const tuple<_UElements...>&), tuple(allocator_arg_t, const _Alloc&, tuple<_UElements...>&&)): Add a check for _NonNestedTuple. * testsuite/20_util/tuple/cons/nested_tuple_construct.cc: Adjust. From-SVN: r237106 --- libstdc++-v3/ChangeLog | 9 +++++ libstdc++-v3/include/std/tuple | 28 ++++++++++----- .../tuple/cons/nested_tuple_construct.cc | 35 +++++++++++++++++++ 3 files changed, 64 insertions(+), 8 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 488af9f7da8..8ff4d16d0e3 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,12 @@ +2016-06-05 Ville Voutilainen + + Protect allocator-overloads of tuple-from-tuple constructors + from cases that would create dangling references. + * include/std/tuple (tuple(allocator_arg_t, const _Alloc&, + const tuple<_UElements...>&), tuple(allocator_arg_t, const _Alloc&, + tuple<_UElements...>&&)): Add a check for _NonNestedTuple. + * testsuite/20_util/tuple/cons/nested_tuple_construct.cc: Adjust. + 2016-05-29 Gerald Pfeifer * doc/xml/manual/backwards_compatibility.xml: Adjust diff --git a/libstdc++-v3/include/std/tuple b/libstdc++-v3/include/std/tuple index ea887932072..17c82049030 100644 --- a/libstdc++-v3/include/std/tuple +++ b/libstdc++-v3/include/std/tuple @@ -769,11 +769,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION tuple(allocator_arg_t __tag, const _Alloc& __a, tuple&& __in) : _Inherited(__tag, __a, static_cast<_Inherited&&>(__in)) { } - template::template _ConstructibleTuple<_UElements...>() && _TMCT<_UElements...>::template - _ImplicitlyConvertibleTuple<_UElements...>(), + _ImplicitlyConvertibleTuple<_UElements...>() + && _TNTC<_Dummy>::template + _NonNestedTuple&&>(), bool>::type=true> tuple(allocator_arg_t __tag, const _Alloc& __a, const tuple<_UElements...>& __in) @@ -781,11 +784,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION static_cast&>(__in)) { } - template::template _ConstructibleTuple<_UElements...>() && !_TMCT<_UElements...>::template - _ImplicitlyConvertibleTuple<_UElements...>(), + _ImplicitlyConvertibleTuple<_UElements...>() + && _TNTC<_Dummy>::template + _NonNestedTuple&&>(), bool>::type=false> explicit tuple(allocator_arg_t __tag, const _Alloc& __a, const tuple<_UElements...>& __in) @@ -793,11 +799,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION static_cast&>(__in)) { } - template::template _MoveConstructibleTuple<_UElements...>() && _TMCT<_UElements...>::template - _ImplicitlyMoveConvertibleTuple<_UElements...>(), + _ImplicitlyMoveConvertibleTuple<_UElements...>() + && _TNTC<_Dummy>::template + _NonNestedTuple&&>(), bool>::type=true> tuple(allocator_arg_t __tag, const _Alloc& __a, tuple<_UElements...>&& __in) @@ -805,11 +814,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION static_cast<_Tuple_impl<0, _UElements...>&&>(__in)) { } - template::template _MoveConstructibleTuple<_UElements...>() && !_TMCT<_UElements...>::template - _ImplicitlyMoveConvertibleTuple<_UElements...>(), + _ImplicitlyMoveConvertibleTuple<_UElements...>() + && _TNTC<_Dummy>::template + _NonNestedTuple&&>(), bool>::type=false> explicit tuple(allocator_arg_t __tag, const _Alloc& __a, tuple<_UElements...>&& __in) diff --git a/libstdc++-v3/testsuite/20_util/tuple/cons/nested_tuple_construct.cc b/libstdc++-v3/testsuite/20_util/tuple/cons/nested_tuple_construct.cc index 39a4f73c1d4..7f6423913d8 100644 --- a/libstdc++-v3/testsuite/20_util/tuple/cons/nested_tuple_construct.cc +++ b/libstdc++-v3/testsuite/20_util/tuple/cons/nested_tuple_construct.cc @@ -63,6 +63,32 @@ void f3() std::tuple> t3{std::move(t2)}; } +void f4() +{ + std::allocator a; + X v; + std::tuple t1{std::allocator_arg, a, v}; + std::tuple&&> t2{std::allocator_arg, a, std::move(t1)}; + std::tuple> t3{std::allocator_arg, a, std::move(t2)}; +} + +void f5() +{ + std::allocator a; + X v; + std::tuple t1{std::allocator_arg, a, std::move(v)}; + std::tuple&&> t2{std::allocator_arg, a, std::move(t1)}; + std::tuple> t3{std::allocator_arg, a, std::move(t2)}; +} + +void f6() +{ + std::allocator a; + std::tuple t1{std::allocator_arg, a, X{}}; + std::tuple&&> t2{std::allocator_arg, a, std::move(t1)}; + std::tuple> t3{std::allocator_arg, a, std::move(t2)}; +} + int main() { f(); @@ -74,4 +100,13 @@ int main() f3(); VERIFY(result == "DefMoveDtorMoveDtorDtor"); result = ""; + f4(); + VERIFY(result == "DefCopyMoveDtorDtorDtor"); + result = ""; + f5(); + VERIFY(result == "DefMoveMoveDtorDtorDtor"); + result = ""; + f6(); + VERIFY(result == "DefMoveDtorMoveDtorDtor"); + result = ""; }