From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id A5217386F45A; Tue, 22 Sep 2020 07:42:45 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A5217386F45A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1600760565; bh=fRsNYrFW6lIviFbv5rJ46cMcFTR/rdVf46nMv/jr2qc=; h=From:To:Subject:Date:From; b=bsS+OVFmoohw66VDgHKcxAK4+QSoX9vdRNH/L851i4DYYJ4reZXdslRCiLH1djkKq WL5HuvYoXu0KKDddfIARBiajC348jzN9vzmWtuUI/bh0BzxubTqI10ILHWFrMRFECd MMDpEy1OL2IFdkRD/21FPVvNlDmMrgwES3kR4FbA= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r11-3348] libstdc++: Use correct argument type for __use_alloc, again [PR 96803] X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: d149962d6ac3c940fee95707cb6bafdb055e9bea X-Git-Newrev: 7825399092d572ce8ea82c4aa8dfeb65076b0e52 Message-Id: <20200922074245.A5217386F45A@sourceware.org> Date: Tue, 22 Sep 2020 07:42:45 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Sep 2020 07:42:45 -0000 https://gcc.gnu.org/g:7825399092d572ce8ea82c4aa8dfeb65076b0e52 commit r11-3348-g7825399092d572ce8ea82c4aa8dfeb65076b0e52 Author: Jonathan Wakely Date: Tue Sep 22 08:42:18 2020 +0100 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&)): 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: --- libstdc++-v3/include/std/tuple | 2 +- libstdc++-v3/testsuite/20_util/tuple/cons/96803.cc | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) 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 o; std::tuple nok(std::allocator_arg, std::allocator(), o); + + std::tuple oo; + std::tuple nn(std::allocator_arg, std::allocator(), oo); +} + +struct Y +{ + using allocator_type = std::allocator; + + Y(const X&) { } + Y(const X&, const allocator_type&) { } + + Y(X&&) { } + Y(std::allocator_arg_t, const allocator_type&, X&&) { } +}; + +void +test02() +{ + std::tuple o{1, 1}; + std::tuple oo(std::allocator_arg, std::allocator(), o); }