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

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

[Jonathan Wakely]

[-- Attachment #1: Type: text/plain, Size: 823 bytes --]

The _Tuple_impl constructor for allocator-extended construction from a
different tuple type uses the _Tuple_impl's own _Head type in the
__use_alloc test. That is incorrect, because the argument tuple could
have a different type. Using the wrong type might select the
leading-allocator convention when it should use the trailing-allocator
convention, or vice versa.

libstdc++-v3/ChangeLog:

	PR libstdc++/96803
	* include/std/tuple
	(_Tuple_impl(allocator_arg_t, Alloc, const _Tuple_impl<U...>&)):
	Replace parameter pack with a type parameter and a pack and pass
	the first type to __use_alloc.
	* testsuite/20_util/tuple/cons/96803.cc: New test.

Tested powerpc64le-linux. Committed to trunk.

This isn't a regression, but would be safe to backport and fixes a
conformance bug, albeit one that nobody has ever noticed.


[-- Attachment #2: patch.txt --]
[-- Type: text/plain, Size: 3615 bytes --]

commit 5494edae83ad33c769bd1ebc98f0c492453a6417
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Wed Aug 26 19:32:30 2020

    libstdc++: Use correct argument type for __use_alloc [PR 96803]
    
    The _Tuple_impl constructor for allocator-extended construction from a
    different tuple type uses the _Tuple_impl's own _Head type in the
    __use_alloc test. That is incorrect, because the argument tuple could
    have a different type. Using the wrong type might select the
    leading-allocator convention when it should use the trailing-allocator
    convention, or vice versa.
    
    libstdc++-v3/ChangeLog:
    
            PR libstdc++/96803
            * include/std/tuple
            (_Tuple_impl(allocator_arg_t, Alloc, const _Tuple_impl<U...>&)):
            Replace parameter pack with a type parameter and a pack and pass
            the first type to __use_alloc.
            * testsuite/20_util/tuple/cons/96803.cc: New test.

diff --git a/libstdc++-v3/include/std/tuple b/libstdc++-v3/include/std/tuple
index d4a35f0fe7f..7be9943e34a 100644
--- a/libstdc++-v3/include/std/tuple
+++ b/libstdc++-v3/include/std/tuple
@@ -338,14 +338,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 	  _Base(__use_alloc<_Head, _Alloc, _Head>(__a),
 	        std::forward<_Head>(_M_head(__in))) { }
 
-      template<typename _Alloc, typename... _UElements>
+      template<typename _Alloc, typename _UHead, typename... _UTails>
 	_GLIBCXX20_CONSTEXPR
 	_Tuple_impl(allocator_arg_t __tag, const _Alloc& __a,
-	            const _Tuple_impl<_Idx, _UElements...>& __in)
+		    const _Tuple_impl<_Idx, _UHead, _UTails...>& __in)
 	: _Inherited(__tag, __a,
-		     _Tuple_impl<_Idx, _UElements...>::_M_tail(__in)),
-	  _Base(__use_alloc<_Head, _Alloc, _Head>(__a),
-		_Tuple_impl<_Idx, _UElements...>::_M_head(__in)) { }
+		     _Tuple_impl<_Idx, _UHead, _UTails...>::_M_tail(__in)),
+	  _Base(__use_alloc<_Head, _Alloc, _UHead>(__a),
+		_Tuple_impl<_Idx, _UHead, _UTails...>::_M_head(__in)) { }
 
       template<typename _Alloc, typename _UHead, typename... _UTails>
 	_GLIBCXX20_CONSTEXPR
diff --git a/libstdc++-v3/testsuite/20_util/tuple/cons/96803.cc b/libstdc++-v3/testsuite/20_util/tuple/cons/96803.cc
new file mode 100644
index 00000000000..9d3c07d55b2
--- /dev/null
+++ b/libstdc++-v3/testsuite/20_util/tuple/cons/96803.cc
@@ -0,0 +1,41 @@
+// Copyright (C) 2020 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/>.
+
+// { dg-do compile { target c++11 } }
+
+#include <tuple>
+#include <memory>
+
+struct X
+{
+  using allocator_type = std::allocator<int>;
+
+  X(X&&) { }
+  X(std::allocator_arg_t, const allocator_type&, X&&) { }
+
+  explicit X(int) { }
+  explicit X(int, allocator_type) { }
+};
+
+void
+test01()
+{
+  // PR libstdc++/96803
+  // std::tuple chooses wrong constructor for uses-allocator construction
+  std::tuple<int> o;
+  std::tuple<X> nok(std::allocator_arg, std::allocator<int>(), o);
+}

Re: [committed] libstdc++: Use correct argument type for __use_alloc [PR 96803]

[Jonathan Wakely]

[-- Attachment #1: Type: text/plain, Size: 1410 bytes --]

On 26/08/20 19:34 +0100, Jonathan Wakely wrote:
>The _Tuple_impl constructor for allocator-extended construction from a
>different tuple type uses the _Tuple_impl's own _Head type in the
>__use_alloc test. That is incorrect, because the argument tuple could
>have a different type. Using the wrong type might select the
>leading-allocator convention when it should use the trailing-allocator
>convention, or vice versa.
>
>libstdc++-v3/ChangeLog:
>
>	PR libstdc++/96803
>	* include/std/tuple
>	(_Tuple_impl(allocator_arg_t, Alloc, const _Tuple_impl<U...>&)):
>	Replace parameter pack with a type parameter and a pack and pass
>	the first type to __use_alloc.
>	* testsuite/20_util/tuple/cons/96803.cc: New test.

While backporting 5494edae83ad33c769bd1ebc98f0c492453a6417 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.


Tested powerpc64le-linux. Committed to trunk.




[-- Attachment #2: patch.txt --]
[-- Type: text/x-patch, Size: 2365 bytes --]

commit 7825399092d572ce8ea82c4aa8dfeb65076b0e52
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Tue Sep 22 08:42:18 2020

    libstdc++: Use correct argument type for __use_alloc, again [PR 96803]
    
    While backporting 5494edae83ad33c769bd1ebc98f0c492453a6417 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.

diff --git a/libstdc++-v3/include/std/tuple b/libstdc++-v3/include/std/tuple
index 06f56337ce4..11ad1991108 100644
--- a/libstdc++-v3/include/std/tuple
+++ b/libstdc++-v3/include/std/tuple
@@ -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))
 	{ }
 
diff --git a/libstdc++-v3/testsuite/20_util/tuple/cons/96803.cc b/libstdc++-v3/testsuite/20_util/tuple/cons/96803.cc
index 9d3c07d55b2..867a42150e0 100644
--- a/libstdc++-v3/testsuite/20_util/tuple/cons/96803.cc
+++ b/libstdc++-v3/testsuite/20_util/tuple/cons/96803.cc
@@ -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);
 }