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 C0C293858C33 for ; Wed, 24 Aug 2022 16:36:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C0C293858C33 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=1661359013; 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: content-transfer-encoding:content-transfer-encoding; bh=kXV0MJ1QroU71p7jmcZz8IFu/aOVkNScvTLWHRLQGHo=; b=RgR3EqD9cYSdL/jPtxEWmieRL3twYJPZF/HNJsCcwTOgaL1OshB4xNAUlo71W8A96QGERN v0SUAqg+k7kfOcyE3hPn3Kj+JPK7WB2z3l7SssZiKdMosiaYIaUrPv5Z33UL2/aE7WulT8 JTPfqwUicM1SGfnZEBkVuDu9hSS392E= Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-232-2ZSyyIbHMzCJ83-u9KyA7w-1; Wed, 24 Aug 2022 12:36:51 -0400 X-MC-Unique: 2ZSyyIbHMzCJ83-u9KyA7w-1 Received: by mail-qk1-f198.google.com with SMTP id w17-20020a05620a425100b006b97978c693so15205711qko.19 for ; Wed, 24 Aug 2022 09:36:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc; bh=kXV0MJ1QroU71p7jmcZz8IFu/aOVkNScvTLWHRLQGHo=; b=4pWG5RrR+j+dwfAb7sGwRbdTcqAxs8eIE4VwHAGmHvV5AX+SOvp72xyuZBtnRmGHHs +NFGyrkx5Ir8SS7G6IfV/rvDlWOfeC3fH6Z+CbGrJTCeIXu1C58uG0GPaj7MPunT6yhq KvVVdZA7/unv+5ITKm0LKQRIE5pLw4Hvh3VPmdIi9B1aYWprNaPr7Kh0GrRJSTtgj/nv 9lT8ak7dNsMNhRLSS8Pa/0DKu+HMVE7djeZwev2mAoapT9OO53KhQqIcmwzV40ijSupe bEhDtBjtD5qK6HtkWng4meO9zo14oKtS7a6Tn+KUBSCLh8gws09uNsqPK19yg1wAv8ZK nSXA== X-Gm-Message-State: ACgBeo0s4o+ereQdsjZQM56XYQdCcy/aO+G5axyML1C7/2N9ayz16aD2 1wDlhpzwqDQdEWAuPuc9aESc5c5KN6+++3UqZfu3jN2eGhWIgELyTuo6bDMHW0e+kyw50HUmawa a4+ZeLXBdBKhfuT0= X-Received: by 2002:ad4:5d61:0:b0:496:b107:b7cb with SMTP id fn1-20020ad45d61000000b00496b107b7cbmr25925411qvb.53.1661359011045; Wed, 24 Aug 2022 09:36:51 -0700 (PDT) X-Google-Smtp-Source: AA6agR4zTkM39UaZrXXY4LWD+nE/uqOd/wgR9e+reKk6TzHMDB3WJ5AmA5rojYAdB8ZM3JdEPyZeSw== X-Received: by 2002:ad4:5d61:0:b0:496:b107:b7cb with SMTP id fn1-20020ad45d61000000b00496b107b7cbmr25925321qvb.53.1661359009730; Wed, 24 Aug 2022 09:36:49 -0700 (PDT) Received: from localhost.localdomain (ool-457670bb.dyn.optonline.net. [69.118.112.187]) by smtp.gmail.com with ESMTPSA id d22-20020ac86696000000b00342e86b3bdasm12672806qtp.12.2022.08.24.09.36.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Aug 2022 09:36:49 -0700 (PDT) From: Patrick Palka To: gcc-patches@gcc.gnu.org Cc: libstdc++@gcc.gnu.org, Patrick Palka Subject: [PATCH] libstdc++: Fix fallout from P2321R2 pair/tuple enhancements Date: Wed, 24 Aug 2022 12:36:44 -0400 Message-Id: <20220824163644.1963933-1-ppalka@redhat.com> X-Mailer: git-send-email 2.37.2.382.g795ea8776b MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Spam-Status: No, score=-13.9 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=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: 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. * testsuite/20_util/tuple/cons/noexcept_specs.cc: Adjust some asserts for C++23 mode. --- libstdc++-v3/include/std/tuple | 9 ++++ .../20_util/tuple/cons/noexcept_specs.cc | 41 +++++++++++++++++++ 2 files changed, 50 insertions(+) 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