From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 58B663853576 for ; Wed, 24 Aug 2022 16:59:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 58B663853576 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1661360392; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=fdhSs3t48OMhliZHmI0tMYn6IgRicba+MLwJPM5uI2U=; b=PIYQy1+Qi+lhlE+MBxwFByu3A8LSDvJhWbzYQO9V9XDUnIrQXVReINFPn76GAN9G7DNgxk D1VezEtY/qp3pi1nVxt4TKWR3XBBqEmKZK5C0lzU1BZxomj7eDXdNB/1N7dj2lV9Htx6n3 oLpAl3IttDnuszQq71dW5d74ybmuPVE= Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-294-Y0vspVqxPuOn1ZXq7SRAyQ-1; Wed, 24 Aug 2022 12:59:50 -0400 X-MC-Unique: Y0vspVqxPuOn1ZXq7SRAyQ-1 Received: by mail-qt1-f200.google.com with SMTP id e30-20020ac8011e000000b00342f61e67aeso13223936qtg.3 for ; Wed, 24 Aug 2022 09:59:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:references:message-id:in-reply-to:subject:cc:to:date :from:x-gm-message-state:from:to:cc; bh=fdhSs3t48OMhliZHmI0tMYn6IgRicba+MLwJPM5uI2U=; b=bvyNvsMuRbC7jigfI5M8cX5hxAKcF0j0slA/HU9DXDXLymrHZNipz3SgdIwqQGhSjH 6kIjyBDDA6+OgDdcGyPO1bWqI5jxyzpgm0Z9IU0M9GtM2+tdA6oXmrmBXZ+1oib7Nvau acJtoMLVlbnTORZcnqOdpKX8+IqKNc1xq8fcnYNJQ3jYBEeRsZMdDJX2DnIaJk6jcCm5 xc0tLDog9OxlbifM1dyep7+nH44pTG8a32IKJ8cTrQjmiF6sZOybiw77IGBXgIGvcZIH XAPc6J1LiGQxH6K8Rgq+XF6MXWgs1LwlRg0GjQMiSelJO5fy5y9HARoPAJgPBp8S8v73 sS5A== X-Gm-Message-State: ACgBeo2ynJo3eGJtd8JL9eoZNobN+iVLuNvzSHTex76FHrAc69w2TY9b pt94Y1XbzlvlqYhAgKQ9HThw0udNKhhOwQwGVr9VvUG9wgsns29L1dLQGGkbkzut9zLam4Cy95l RDcIWzs8LLdFSZ9c= X-Received: by 2002:a05:620a:25c8:b0:6ae:2408:6e9a with SMTP id y8-20020a05620a25c800b006ae24086e9amr157315qko.222.1661360390016; Wed, 24 Aug 2022 09:59:50 -0700 (PDT) X-Google-Smtp-Source: AA6agR4AWFGdibSLWSaq5DVA+zXTDA6JNNfb7jWXgmtmUScOkjOucwnujQSlv0hoEfWgh+vdu2OE8w== X-Received: by 2002:a05:620a:25c8:b0:6ae:2408:6e9a with SMTP id y8-20020a05620a25c800b006ae24086e9amr157290qko.222.1661360389555; Wed, 24 Aug 2022 09:59:49 -0700 (PDT) Received: from [192.168.1.130] (ool-457670bb.dyn.optonline.net. [69.118.112.187]) by smtp.gmail.com with ESMTPSA id bl8-20020a05622a244800b00342fdc4004fsm13121010qtb.52.2022.08.24.09.59.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Aug 2022 09:59:49 -0700 (PDT) From: Patrick Palka X-Google-Original-From: Patrick Palka Date: Wed, 24 Aug 2022 12:59:48 -0400 (EDT) To: Patrick Palka cc: gcc-patches@gcc.gnu.org, libstdc++@gcc.gnu.org Subject: Re: [PATCH] libstdc++: Fix fallout from P2321R2 pair/tuple enhancements In-Reply-To: <20220824163644.1963933-1-ppalka@redhat.com> Message-ID: <3f7196b6-e7cc-e580-50f9-e768aa567c9e@idea> References: <20220824163644.1963933-1-ppalka@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII X-Spam-Status: No, score=-14.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_NONE,TXREP,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On Wed, 24 Aug 2022, Patrick Palka wrote: > r13-2159-g72886fcc626953 introduced some testsuite regressions in C++23 > mode: > > FAIL: 20_util/pair/requirements/explicit_instantiation/1.cc (test for excess errors) > FAIL: 20_util/tuple/53648.cc (test for excess errors) > FAIL: 20_util/tuple/cons/noexcept_specs.cc (test for excess errors) > FAIL: 20_util/tuple/requirements/explicit_instantiation.cc (test for excess errors) > > The test noexcept_specs.cc just needs to be updated to consider the > additional converting constructors of tuple in C++23 mode, which happen > to improve constructing from a const tuple rvalue containing rvalue > reference elements (for the better, as far as I can tell). > > The other three tests fail because they explicitly instantiate a specialization > of tuple whose elements are not all const swappable, which in C++23 mode now > results in a hard error due to tuple's new const swap member function. Rather > than XFAILing the tests in C++23 mode, this patch adds non-standard constraints > to this member function so that we continue to accept such explicit instantiations. > > Tested on x86_64-pc-linux-gnu with and without --target_board=unix/-std=gnu++23, > does this look OK for trunk? > > libstdc++-v3/ChangeLog: > > * include/std/tuple (tuple::swap const): Add is_swappable_v constraints. D'oh, pair's const swap needs the same workaround: -- >8 -- libstdc++-v3/ChangeLog: * include/bits/stl_pair.h (pair::swap const): Add non-standard is_swappable_v constraints. * include/std/tuple (tuple::swap const): Likewise. * testsuite/20_util/tuple/cons/noexcept_specs.cc: Update some asserts in C++23 mode. --- libstdc++-v3/include/bits/stl_pair.h | 8 ++++ libstdc++-v3/include/std/tuple | 9 ++++ .../20_util/tuple/cons/noexcept_specs.cc | 41 +++++++++++++++++++ 3 files changed, 58 insertions(+) diff --git a/libstdc++-v3/include/bits/stl_pair.h b/libstdc++-v3/include/bits/stl_pair.h index bffca0daf65..a65a4763c54 100644 --- a/libstdc++-v3/include/bits/stl_pair.h +++ b/libstdc++-v3/include/bits/stl_pair.h @@ -213,10 +213,18 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } #if __cplusplus > 202002L + // As an extension, we constrain the const swap member function + // in order to continue accepting explicit instantiation of tuple + // specializations whose elements are not all const swappable. + // Without this constraint, such an explicit instantiation would + // also instantiate the ill-formed body of this function and yield + // a hard error. This constraint shouldn't affect the behavior of + // valid programs. constexpr void swap(const pair& __p) const noexcept(__and_v<__is_nothrow_swappable, __is_nothrow_swappable>) + requires is_swappable_v && is_swappable_v { using std::swap; swap(first, __p.first); diff --git a/libstdc++-v3/include/std/tuple b/libstdc++-v3/include/std/tuple index 05433d5ae36..9d1abc2f80e 100644 --- a/libstdc++-v3/include/std/tuple +++ b/libstdc++-v3/include/std/tuple @@ -1176,9 +1176,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { _Inherited::_M_swap(__in); } #if __cplusplus > 202002L + // As an extension, we constrain this const swap member function + // in order to continue accepting explicit instantiation of tuple + // specializations whose elements are not all const swappable. + // Without this constraint, such an explicit instantiation would + // also instantiate the ill-formed body of this function and + // yield a hard error. This constraint shouldn't affect the behavior of + // valid programs. constexpr void swap(const tuple& __in) const noexcept(__and_v<__is_nothrow_swappable...>) + requires (is_swappable_v && ...) { _Inherited::_M_swap(__in); } #endif // C++23 }; @@ -1730,6 +1738,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION swap(const tuple& __in) const noexcept(__and_v<__is_nothrow_swappable, __is_nothrow_swappable>) + requires is_swappable_v && is_swappable_v { _Inherited::_M_swap(__in); } #endif // C++23 }; diff --git a/libstdc++-v3/testsuite/20_util/tuple/cons/noexcept_specs.cc b/libstdc++-v3/testsuite/20_util/tuple/cons/noexcept_specs.cc index 6044a377348..a326d1bc228 100644 --- a/libstdc++-v3/testsuite/20_util/tuple/cons/noexcept_specs.cc +++ b/libstdc++-v3/testsuite/20_util/tuple/cons/noexcept_specs.cc @@ -503,7 +503,17 @@ namespace NothrowCopyThrowMoveThrowCopyConversionNothrowMoveConversion static_assert(!std::is_nothrow_constructible::value, ""); static_assert(!std::is_nothrow_constructible::value, ""); static_assert(!std::is_nothrow_constructible>::value, ""); +#if __cplusplus > 202002L + // C++23 extended tuple's constructor overload set as part of P2321R2, after + // which its converting constructors more accurately forward the elements + // from a non-const tuple lvalue and from a const tuple rvalue. In particular + // for the below test we now forward int&& as an rvalue reference instead of + // as an lvalue reference, which means we now select the noexcept B(int&&) + // ctor instead of the non-noexcept B(const int&) ctor. + static_assert(std::is_nothrow_constructible>::value, ""); +#else static_assert(!std::is_nothrow_constructible>::value, ""); +#endif static_assert(test_trait::is_nothrow_convertible::value,""); static_assert(!test_trait::is_nothrow_convertible::value,""); @@ -515,7 +525,13 @@ namespace NothrowCopyThrowMoveThrowCopyConversionNothrowMoveConversion static_assert(!test_trait::is_nothrow_convertible::value,""); static_assert(!test_trait::is_nothrow_convertible::value,""); static_assert(!test_trait::is_nothrow_convertible,BT>::value,""); +#if __cplusplus > 202002L + // See the note about P2321R2 above. + static_assert(test_trait::is_nothrow_convertible,BT>::value,""); +#else static_assert(!test_trait::is_nothrow_convertible,BT>::value,""); +#endif + static_assert(!std::is_nothrow_constructible::value, ""); @@ -528,7 +544,12 @@ namespace NothrowCopyThrowMoveThrowCopyConversionNothrowMoveConversion static_assert(std::is_nothrow_constructible::value, ""); static_assert(std::is_nothrow_constructible::value, ""); static_assert(std::is_nothrow_constructible>::value, ""); +#if __cplusplus > 202002L + // See the note about P2321R2 above. + static_assert(!std::is_nothrow_constructible>::value, ""); +#else static_assert(std::is_nothrow_constructible>::value, ""); +#endif static_assert(!test_trait::is_nothrow_convertible::value,""); static_assert(test_trait::is_nothrow_convertible::value,""); @@ -540,7 +561,12 @@ namespace NothrowCopyThrowMoveThrowCopyConversionNothrowMoveConversion static_assert(test_trait::is_nothrow_convertible::value,""); static_assert(test_trait::is_nothrow_convertible::value,""); static_assert(test_trait::is_nothrow_convertible,BT>::value,""); +#if __cplusplus > 202002L + // See the note about P2321R2 above. + static_assert(!test_trait::is_nothrow_convertible,BT>::value,""); +#else static_assert(test_trait::is_nothrow_convertible,BT>::value,""); +#endif /* explicit */ static_assert(std::is_nothrow_constructible::value, ""); @@ -553,7 +579,12 @@ namespace NothrowCopyThrowMoveThrowCopyConversionNothrowMoveConversion static_assert(!std::is_nothrow_constructible::value, ""); static_assert(!std::is_nothrow_constructible::value, ""); static_assert(!std::is_nothrow_constructible>::value, ""); +#if __cplusplus > 202002L + // See the note about P2321R2 above. + static_assert(std::is_nothrow_constructible>::value, ""); +#else static_assert(!std::is_nothrow_constructible>::value, ""); +#endif static_assert(!std::is_nothrow_constructible::value, ""); static_assert(std::is_nothrow_constructible::value, ""); @@ -565,7 +596,12 @@ namespace NothrowCopyThrowMoveThrowCopyConversionNothrowMoveConversion static_assert(std::is_nothrow_constructible::value, ""); static_assert(std::is_nothrow_constructible::value, ""); static_assert(std::is_nothrow_constructible>::value, ""); +#if __cplusplus > 202002L + // See note about P2321R2 above. + static_assert(!std::is_nothrow_constructible>::value, ""); +#else static_assert(std::is_nothrow_constructible>::value, ""); +#endif static_assert(!test_trait::is_nothrow_convertible::value,""); static_assert(test_trait::is_nothrow_convertible::value,""); @@ -884,7 +920,12 @@ namespace ThrowMoveNothrowConversion static_assert(std::is_nothrow_constructible::value, ""); static_assert(std::is_nothrow_constructible::value, ""); static_assert(std::is_nothrow_constructible>::value, ""); +#if __cplusplus > 202002L + // See the note about P2321R2 above. + static_assert(!std::is_nothrow_constructible>::value, ""); +#else static_assert(std::is_nothrow_constructible>::value, ""); +#endif static_assert(test_trait::is_nothrow_convertible::value,""); static_assert(test_trait::is_nothrow_convertible::value,""); -- 2.37.2.382.g795ea8776b