From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 50F09385842D; Thu, 27 Apr 2023 22:01:01 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 50F09385842D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1682632861; bh=kyF3RP4SEUE5GKPVv+DsOEDucrFSsRMYnjuSd2ypcyQ=; h=From:To:Subject:Date:From; b=Hir61MNeGAac2Tgh5+QowqvJo3zdGT3Q7C5t+9PIuqWGlCu1PlAY5Iq5XSsSBwngY 5/RNanhLN8qRyCYV/2UNyrXRNYzMQC9GPQln3+MLX3gijJTYpp80Pq8wzyr8yeedrB o0y/ORLAvQAPUeCvtOW/ESZyHJTRfpsPcP1+nn2M= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r11-10656] libstdc++: Fix uses_allocator_construction_args for pair [PR108952] X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/releases/gcc-11 X-Git-Oldrev: 24f8b16748d76c1827f1c0af632bd679be3162e4 X-Git-Newrev: 6930165acd05c8eef88a99b9546742b108e0c84e Message-Id: <20230427220101.50F09385842D@sourceware.org> Date: Thu, 27 Apr 2023 22:01:01 +0000 (GMT) List-Id: https://gcc.gnu.org/g:6930165acd05c8eef88a99b9546742b108e0c84e commit r11-10656-g6930165acd05c8eef88a99b9546742b108e0c84e Author: Jonathan Wakely Date: Mon Feb 27 22:34:57 2023 +0000 libstdc++: Fix uses_allocator_construction_args for pair [PR108952] This implements LWG 3527 which fixes the handling of pair in std::uses_allocator_construction_args. libstdc++-v3/ChangeLog: PR libstdc++/108952 * include/bits/uses_allocator_args.h (uses_allocator_construction_args): Implement LWG 3527. * testsuite/20_util/pair/astuple/get-2.cc: New test. * testsuite/20_util/scoped_allocator/108952.cc: New test. * testsuite/20_util/uses_allocator/lwg3527.cc: New test. (cherry picked from commit 8e342c04550466ab088c33746091ce7f3498ee44) Diff: --- libstdc++-v3/include/bits/uses_allocator_args.h | 7 ++- .../testsuite/20_util/pair/astuple/get-2.cc | 68 ++++++++++++++++++++++ .../testsuite/20_util/scoped_allocator/108952.cc | 23 ++++++++ .../testsuite/20_util/uses_allocator/lwg3527.cc | 22 +++++++ 4 files changed, 118 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/include/bits/uses_allocator_args.h b/libstdc++-v3/include/bits/uses_allocator_args.h index 044494aab05..40ef6843945 100644 --- a/libstdc++-v3/include/bits/uses_allocator_args.h +++ b/libstdc++-v3/include/bits/uses_allocator_args.h @@ -180,11 +180,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION using _Tp1 = typename _Tp::first_type; using _Tp2 = typename _Tp::second_type; + // _GLIBCXX_RESOLVE_LIB_DEFECTS + // 3527. uses_allocator_construction_args handles rvalue pairs + // of rvalue references incorrectly return std::make_tuple(piecewise_construct, std::uses_allocator_construction_args<_Tp1>(__a, - std::move(__pr).first), + std::get<0>(std::move(__pr))), std::uses_allocator_construction_args<_Tp2>(__a, - std::move(__pr).second)); + std::get<1>(std::move(__pr)))); } template diff --git a/libstdc++-v3/testsuite/20_util/pair/astuple/get-2.cc b/libstdc++-v3/testsuite/20_util/pair/astuple/get-2.cc new file mode 100644 index 00000000000..573d239effa --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/pair/astuple/get-2.cc @@ -0,0 +1,68 @@ +// { dg-do compile { target c++11 } } + +#include + +template +constexpr bool +check() +{ + return std::is_same(std::declval())), T>::value; +} + +void +test_value_category() +{ + using P = std::pair; + static_assert( check<0, int&, P&>(), + "get<0>(pair&)" ); + static_assert( check<1, long&, P&>(), + "get<1>(pair&)" ); + static_assert( check<0, int&&, P&&>(), + "get<0>(pair&&)" ); + static_assert( check<1, long&&, P&&>(), + "get<1>(pair&&)" ); + static_assert( check<0, const int&, const P&>(), + "get<0>(const pair&)" ); + static_assert( check<1, const long&, const P&>(), + "get<1>(const pair&)" ); + static_assert( check<0, const int&&, const P&&>(), + "get<0>(const pair&&)" ); + static_assert( check<1, const long&&, const P&&>(), + "get<1>(const pair&&)" ); + + using PL = std::pair; + static_assert( check<0, int&, PL&>(), + "get<0>(pair&)" ); + static_assert( check<1, long&, PL&>(), + "get<1>(pair&)" ); + static_assert( check<0, int&, PL&&>(), + "get<0>(pair&&)" ); + static_assert( check<1, long&, PL&&>(), + "get<1>(pair&&)" ); + static_assert( check<0, int&, const PL&>(), + "get<0>(const pair&)" ); + static_assert( check<1, long&, const PL&>(), + "get<1>(const pair&)" ); + static_assert( check<0, int&, const PL&&>(), + "get<0>(const pair&&)" ); + static_assert( check<1, long&, const PL&&>(), + "get<1>(const pair&&)" ); + + using PR = std::pair; + static_assert( check<0, int&, P&>(), + "get<0>(pair&)" ); + static_assert( check<1, long&, P&>(), + "get<1>(pair&)" ); + static_assert( check<0, int&&, PR&&>(), + "get<0>(pair&&)" ); + static_assert( check<1, long&&, PR&&>(), + "get<1>(pair&&)" ); + static_assert( check<0, int&, const PR&>(), + "get<0>(const pair&)" ); + static_assert( check<1, long&, const PR&>(), + "get<1>(const pair&)" ); + static_assert( check<0, int&&, const PR&&>(), + "get<0>(const pair&&)" ); + static_assert( check<1, long&&, const PR&&>(), + "get<1>(const pair&&)" ); +} diff --git a/libstdc++-v3/testsuite/20_util/scoped_allocator/108952.cc b/libstdc++-v3/testsuite/20_util/scoped_allocator/108952.cc new file mode 100644 index 00000000000..a6b9c67498c --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/scoped_allocator/108952.cc @@ -0,0 +1,23 @@ +// { dg-do compile { target c++11 } } + +#include + +struct move_only +{ + move_only(move_only&&); +}; + +using P = std::pair; + +void +test_pr108952(std::pair rvals) +{ + // LWG 3527. uses_allocator_construction_args handles rvalue pairs of + // rvalue references incorrectly. + // PR libstdc++/108952 Regression in uses_allocator_construction_args + // for pair of rvalue references + std::scoped_allocator_adaptor> a; + auto p = a.allocate(1); + a.construct(p, std::move(rvals)); + a.deallocate(p, 1); +} diff --git a/libstdc++-v3/testsuite/20_util/uses_allocator/lwg3527.cc b/libstdc++-v3/testsuite/20_util/uses_allocator/lwg3527.cc new file mode 100644 index 00000000000..ae377f4b5a3 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/uses_allocator/lwg3527.cc @@ -0,0 +1,22 @@ +// { dg-options "-std=gnu++20" } +// { dg-do compile { target c++20 } } + +#include + +struct move_only +{ + move_only(move_only&&); +}; + +using P = std::pair; + +void +test_lwg3527(std::pair rvals) +{ + // LWG 3527. uses_allocator_construction_args handles rvalue pairs of + // rvalue references incorrectly. + // PR libstdc++/108952 Regression in uses_allocator_construction_args + // for pair of rvalue references + std::allocator a; + (void) std::uses_allocator_construction_args

(a, std::move(rvals)); +}