From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 7CB4B3858D1E; Sat, 15 Oct 2022 20:21:30 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7CB4B3858D1E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1665865290; bh=OOl9la47QVRB7Qou64i/NedNlWmUYA3MRFXfZ9MAgN4=; h=From:To:Subject:Date:From; b=YDMV7PK0mzOwjLbmaPc1uxOB04gSVtwK5kWcuzLXvemfS68H2crpO5yksyN5yzJ21 UCJLy1+nLVkHY23FzGP+8I+bDWtl3HvbUINWK+1v8VHyaHaiExPSAK4Lz8ZZmKmQa1 N9bRzSSlcBwxUyd34T9PInt5XdYA3+QPRa1Bv8Ts= 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 r13-3312] libstdc++: Fix uses_allocator_construction args for cv pair (LWG 3677) X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: baeec7cc83b19b46d1c73523f06efa7ea2b30390 X-Git-Newrev: e24b430f1ea60205162fd9b327ac6a4dfc57f37c Message-Id: <20221015202130.7CB4B3858D1E@sourceware.org> Date: Sat, 15 Oct 2022 20:21:30 +0000 (GMT) List-Id: https://gcc.gnu.org/g:e24b430f1ea60205162fd9b327ac6a4dfc57f37c commit r13-3312-ge24b430f1ea60205162fd9b327ac6a4dfc57f37c Author: Jonathan Wakely Date: Fri Oct 14 14:25:48 2022 +0100 libstdc++: Fix uses_allocator_construction args for cv pair (LWG 3677) The _Std_pair concept uses in handles const qualified pairs, but not volatile qualified. That's because it just uses __is_pair which is specialized for const pairs. This removes the partial specialization __is_pair>, so that __is_pair is now only true for cv-unqualified pairs. Then _Std_pair needs to explicitly use remove_cv_t for the argument to __is_pair. The other use of __is_pair is in map::insert(Pair&&) which doesn't want to handle volatile so should just use remove_const_t. libstdc++-v3/ChangeLog: * include/bits/stl_map.h (map::insert(Pair&&)): Use remove_const_t on argument to __is_pair. * include/bits/stl_pair.h (__is_pair>): Remove partial specialization. * include/bits/uses_allocator_args.h (_Std_pair): Use remove_cv_t as per LWG 3677. * testsuite/20_util/uses_allocator/lwg3677.cc: New test. Diff: --- libstdc++-v3/include/bits/stl_map.h | 2 +- libstdc++-v3/include/bits/stl_pair.h | 3 -- libstdc++-v3/include/bits/uses_allocator_args.h | 2 +- .../testsuite/20_util/uses_allocator/lwg3677.cc | 52 ++++++++++++++++++++++ 4 files changed, 54 insertions(+), 5 deletions(-) diff --git a/libstdc++-v3/include/bits/stl_map.h b/libstdc++-v3/include/bits/stl_map.h index 9c2b0745673..83c579aaedc 100644 --- a/libstdc++-v3/include/bits/stl_map.h +++ b/libstdc++-v3/include/bits/stl_map.h @@ -847,7 +847,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER { #if __cplusplus >= 201703L using _P2 = remove_reference_t<_Pair>; - if constexpr (__is_pair<_P2>) + if constexpr (__is_pair>) if constexpr (is_same_v>) if constexpr (__usable_key) { diff --git a/libstdc++-v3/include/bits/stl_pair.h b/libstdc++-v3/include/bits/stl_pair.h index d0f07b09d34..195167019b7 100644 --- a/libstdc++-v3/include/bits/stl_pair.h +++ b/libstdc++-v3/include/bits/stl_pair.h @@ -889,9 +889,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template inline constexpr bool __is_pair> = true; - - template - inline constexpr bool __is_pair> = true; #endif /// @cond undocumented diff --git a/libstdc++-v3/include/bits/uses_allocator_args.h b/libstdc++-v3/include/bits/uses_allocator_args.h index ef5c4fffb70..77e48602aac 100644 --- a/libstdc++-v3/include/bits/uses_allocator_args.h +++ b/libstdc++-v3/include/bits/uses_allocator_args.h @@ -44,7 +44,7 @@ namespace std _GLIBCXX_VISIBILITY(default) _GLIBCXX_BEGIN_NAMESPACE_VERSION template - concept _Std_pair = __is_pair<_Tp>; + concept _Std_pair = __is_pair>; /** @addtogroup allocators * @{ diff --git a/libstdc++-v3/testsuite/20_util/uses_allocator/lwg3677.cc b/libstdc++-v3/testsuite/20_util/uses_allocator/lwg3677.cc new file mode 100644 index 00000000000..649b98d3922 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/uses_allocator/lwg3677.cc @@ -0,0 +1,52 @@ +// { dg-options "-std=gnu++23" } +// { dg-do run { target c++20 } } + +#include +#include + +struct UsesAlloc +{ + using allocator_type = std::allocator; + + bool passed_alloc; + + UsesAlloc(int) : passed_alloc(false) { } + + UsesAlloc(int, std::allocator) : passed_alloc(true) { } +}; + +using Pair = std::pair; + +void +test_const() +{ + std::allocator a; + int i = 0; + auto p = std::make_obj_using_allocator(a, i, i); + VERIFY( p.first.passed_alloc ); +} + +void +test_volatile() +{ + std::allocator a; + int i = 0; + auto p = std::make_obj_using_allocator(a, i, i); + VERIFY( p.first.passed_alloc ); +} + +void +test_const_volatile() +{ + std::allocator a; + int i = 0; + auto p = std::make_obj_using_allocator(a, i, i); + VERIFY( p.first.passed_alloc ); +} + +int main() +{ + test_const(); + test_volatile(); + test_const_volatile(); +}