From patchwork Mon Feb 6 14:26:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 53313 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2265324wrn; Mon, 6 Feb 2023 06:28:35 -0800 (PST) X-Google-Smtp-Source: AK7set+ru7qrzsGAQTwZQoYipk2awLAKvcJ8P1tByGhSKpEqIymxLYRgHFp2efbHk+svffkXYtBz X-Received: by 2002:a17:906:6d42:b0:88c:3a48:715b with SMTP id a2-20020a1709066d4200b0088c3a48715bmr21068320ejt.30.1675693714966; Mon, 06 Feb 2023 06:28:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675693714; cv=none; d=google.com; s=arc-20160816; b=cJCmwfVLB3EksIeE0HsTnOJ4n/jqpEFu6wxMZ+vuLe+WoPlt6bp8KBUjhMbginvO5T E6tPUtRZ0DkmzFhu+1m95zNLiCwvhIo/jtjzid0nkKJtf70KTp457/SktZIQ64yv04Tj eCuXZJ998wnWHGXt3ZK2JcPu6ua79fozxx4OB2XbgApuA2lqfiN8Wb57D2JU5am4gevu ZF6948Cx2inDkJPD4WrA68zaz9Yzotsgz0cnc6ovAN2UWWqSRHQfPlWQlLUavBZWxIM4 vK98Gi9Cfnej/Y8TOhAGqz98bj9WIswext329t0ff/sU33ilQ14v3WWxqdHna+KwW39D 0Vow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:message-id:date:subject:to :dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=q0H0eHATP/Re+MAORKuNg44n0D1r+lMeBXXlBlSGbBg=; b=E4HUtozXgeY0YMU8uIE3DmNuQSP9NsaLYSPPxUlLUd2A1r0EAc9DhMpKEEzxjEM99p 76HLDPLRXjSutcMRKSsZ8A/L/+ACpcJtE8vK0zVM5+v7xkgwNw/VSEOs0JarU6hG6Whp wrU9hr1URw8+SBqpIO/TFPJLitBe287tu1WIXI1taXx65+kgkkRr9OjpdTuh2+ZKfP5O cHuiN3kn2Y9E6XeN9KdIAg1Jhl57EbhsqcCprZIYRehLfW4kGxzbPe75aEHIvABMoIFe Wt7iWuCENzYax2qMw4pr3O3eRhtr+tONPOgWRjRM4eMh6QB9zI93kL0viQh7hCT+voR+ fDgQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=uX4PahXu; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id y14-20020a17090668ce00b007c122a9ba98si12834844ejr.685.2023.02.06.06.28.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Feb 2023 06:28:34 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=uX4PahXu; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id CD162385B519 for ; Mon, 6 Feb 2023 14:27:22 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CD162385B519 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1675693642; bh=q0H0eHATP/Re+MAORKuNg44n0D1r+lMeBXXlBlSGbBg=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=uX4PahXuQz07j8aeHcPtqz/xtleAtOmz8n0sohuo0JuBJveAvDolIuvwjeU5oubqv 57IG1xhM2lCQfTNnK9M4soeCuJLKoqoGw7CDpsv8dSzmC0TI8ccNMfEfkCqajsB+h9 n4D2X5c97bVNcQETjUEYeyGIBstCpzsfRm/T6StQ= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org 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 EAC0E38555A1 for ; Mon, 6 Feb 2023 14:26:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org EAC0E38555A1 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-466-46auulhZMVOZQKp3_jgqOQ-1; Mon, 06 Feb 2023 09:26:02 -0500 X-MC-Unique: 46auulhZMVOZQKp3_jgqOQ-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 008E71C07544; Mon, 6 Feb 2023 14:26:02 +0000 (UTC) Received: from localhost (unknown [10.33.36.186]) by smtp.corp.redhat.com (Postfix) with ESMTP id BB003140EBF6; Mon, 6 Feb 2023 14:26:01 +0000 (UTC) To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Fix testsuite warnings about new C++23 deprecations Date: Mon, 6 Feb 2023 14:26:01 +0000 Message-Id: <20230206142601.2970070-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.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, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Jonathan Wakely via Gcc-patches From: Jonathan Wakely Reply-To: Jonathan Wakely Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757092213271988547?= X-GMAIL-MSGID: =?utf-8?q?1757092213271988547?= Tested powerpc64le-linux. Pushed to trunk. -- >8 -- With the recent change to deprecate std::aligned_storage and std::aligned_union we need to adjust some tests that now fail with -std=c++23. libstdc++-v3/ChangeLog: * include/std/type_traits: Add diagnostic pragmas around references to deprecated std::aligned_storage and std::aligned_union traits. * testsuite/20_util/aligned_storage/requirements/alias_decl.cc: Add dg-warning for et c++23. * testsuite/20_util/aligned_storage/requirements/explicit_instantiation.cc: Likewise. * testsuite/20_util/aligned_storage/value.cc: Likewise. * testsuite/20_util/aligned_union/1.cc: Likewise. * testsuite/20_util/aligned_union/requirements/alias_decl.cc: Likewise. --- libstdc++-v3/include/std/type_traits | 7 +++++++ .../20_util/aligned_storage/requirements/alias_decl.cc | 3 +++ .../aligned_storage/requirements/explicit_instantiation.cc | 3 +++ libstdc++-v3/testsuite/20_util/aligned_storage/value.cc | 2 ++ libstdc++-v3/testsuite/20_util/aligned_union/1.cc | 2 ++ .../20_util/aligned_union/requirements/alias_decl.cc | 3 +++ 6 files changed, 20 insertions(+) diff --git a/libstdc++-v3/include/std/type_traits b/libstdc++-v3/include/std/type_traits index d13af433a17..2bd607a8b8f 100644 --- a/libstdc++-v3/include/std/type_traits +++ b/libstdc++-v3/include/std/type_traits @@ -2123,6 +2123,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ? sizeof(_Tp) : __strictest_alignment<_Types...>::_S_size; }; +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" + /** * @brief Provide aligned storage for types. * @@ -2155,6 +2158,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template const size_t aligned_union<_Len, _Types...>::alignment_value; +#pragma GCC diagnostic pop /// @cond undocumented @@ -2586,6 +2590,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { } _GLIBCXX17_DEPRECATED_SUGGEST("std::invoke_result"); #if __cplusplus >= 201402L +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" /// Alias template for aligned_storage template::__type)> @@ -2593,6 +2599,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template using aligned_union_t _GLIBCXX23_DEPRECATED = typename aligned_union<_Len, _Types...>::type; +#pragma GCC diagnostic pop /// Alias template for decay template diff --git a/libstdc++-v3/testsuite/20_util/aligned_storage/requirements/alias_decl.cc b/libstdc++-v3/testsuite/20_util/aligned_storage/requirements/alias_decl.cc index fc230b66a9d..2e8e90efcd7 100644 --- a/libstdc++-v3/testsuite/20_util/aligned_storage/requirements/alias_decl.cc +++ b/libstdc++-v3/testsuite/20_util/aligned_storage/requirements/alias_decl.cc @@ -26,3 +26,6 @@ using namespace std; static_assert (is_same::type, aligned_storage_t<4>>(), "aligned_storage_t" ); + +// { dg-warning "deprecated" "" { target c++23 } 26 } +// { dg-warning "deprecated" "" { target c++23 } 27 } diff --git a/libstdc++-v3/testsuite/20_util/aligned_storage/requirements/explicit_instantiation.cc b/libstdc++-v3/testsuite/20_util/aligned_storage/requirements/explicit_instantiation.cc index 36dfe04b083..baec6667f30 100644 --- a/libstdc++-v3/testsuite/20_util/aligned_storage/requirements/explicit_instantiation.cc +++ b/libstdc++-v3/testsuite/20_util/aligned_storage/requirements/explicit_instantiation.cc @@ -29,3 +29,6 @@ namespace std template struct aligned_storage<1, alignment_of::value>; template struct aligned_storage<2>; } + +// { dg-warning "deprecated" "" { target c++23 } 29 } +// { dg-warning "deprecated" "" { target c++23 } 30 } diff --git a/libstdc++-v3/testsuite/20_util/aligned_storage/value.cc b/libstdc++-v3/testsuite/20_util/aligned_storage/value.cc index 16a5580a6b7..6e9df7ffc5d 100644 --- a/libstdc++-v3/testsuite/20_util/aligned_storage/value.cc +++ b/libstdc++-v3/testsuite/20_util/aligned_storage/value.cc @@ -59,3 +59,5 @@ void test01() static_assert(sizeof(aligned_storage<5>::type) >= 5, ""); static_assert(__alignof__(aligned_storage<5>::type) == align_msa, ""); } + +// { dg-warning "deprecated" "" { target c++23 } 0 } diff --git a/libstdc++-v3/testsuite/20_util/aligned_union/1.cc b/libstdc++-v3/testsuite/20_util/aligned_union/1.cc index b779884dcc2..7501529cbf4 100644 --- a/libstdc++-v3/testsuite/20_util/aligned_union/1.cc +++ b/libstdc++-v3/testsuite/20_util/aligned_union/1.cc @@ -64,6 +64,8 @@ void test01() static_assert(sizeof(au_type2::type) >= max_s+100, "Storage size (at least len)"); } +// { dg-warning "deprecated" "" { target c++23 } 57 } +// { dg-warning "deprecated" "" { target c++23 } 62 } int main() { diff --git a/libstdc++-v3/testsuite/20_util/aligned_union/requirements/alias_decl.cc b/libstdc++-v3/testsuite/20_util/aligned_union/requirements/alias_decl.cc index 6790d2aa828..41f2b0881af 100644 --- a/libstdc++-v3/testsuite/20_util/aligned_union/requirements/alias_decl.cc +++ b/libstdc++-v3/testsuite/20_util/aligned_union/requirements/alias_decl.cc @@ -26,3 +26,6 @@ using namespace std; static_assert (is_same::type, aligned_union_t<0, char, int>>(), "aligned_union_t" ); + +// { dg-warning "deprecated" "" { target c++23 } 26 } +// { dg-warning "deprecated" "" { target c++23 } 27 }