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 ESMTP id B48433857C53 for ; Thu, 14 Oct 2021 21:20:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B48433857C53 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-110-7wWLrAjkN3CdfIXp1Opvyw-1; Thu, 14 Oct 2021 17:20:07 -0400 X-MC-Unique: 7wWLrAjkN3CdfIXp1Opvyw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 45A49659; Thu, 14 Oct 2021 21:20:06 +0000 (UTC) Received: from localhost (unknown [10.33.36.131]) by smtp.corp.redhat.com (Postfix) with ESMTP id E82A45FC23; Thu, 14 Oct 2021 21:20:05 +0000 (UTC) Date: Thu, 14 Oct 2021 22:20:05 +0100 From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Simplify variant access functions Message-ID: MIME-Version: 1.0 X-Clacks-Overhead: GNU Terry Pratchett X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: multipart/mixed; boundary="O6EqyiJK2Aa7j5Z+" Content-Disposition: inline X-Spam-Status: No, score=-13.8 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_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libstdc++@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++ mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Oct 2021 21:20:11 -0000 --O6EqyiJK2Aa7j5Z+ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline libstdc++-v3/ChangeLog: * include/std/variant (__variant::__get(in_place_index_t, U&&)): Rename to __get_n and remove first argument. Replace pair of overloads with a single function using 'if constexpr'. (__variant::__get(Variant&&)): Adjust to use __get_n. Tested powerpc64le-linux. Committed to trunk. --O6EqyiJK2Aa7j5Z+ Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch.txt" commit 4f87d4c5aec9a1eaca7be61e5c8aab4d6e61b1d8 Author: Jonathan Wakely Date: Thu Oct 14 20:37:38 2021 libstdc++: Simplify variant access functions libstdc++-v3/ChangeLog: * include/std/variant (__variant::__get(in_place_index_t, U&&)): Rename to __get_n and remove first argument. Replace pair of overloads with a single function using 'if constexpr'. (__variant::__get(Variant&&)): Adjust to use __get_n. diff --git a/libstdc++-v3/include/std/variant b/libstdc++-v3/include/std/variant index 6377b6731ea..b85a89d0b7b 100644 --- a/libstdc++-v3/include/std/variant +++ b/libstdc++-v3/include/std/variant @@ -279,27 +279,26 @@ namespace __variant __gnu_cxx::__aligned_membuf<_Type> _M_storage; }; - template - constexpr decltype(auto) - __get(in_place_index_t<0>, _Union&& __u) noexcept - { return std::forward<_Union>(__u)._M_first._M_get(); } - template constexpr decltype(auto) - __get(in_place_index_t<_Np>, _Union&& __u) noexcept + __get_n(_Union&& __u) noexcept { - return __variant::__get(in_place_index<_Np-1>, - std::forward<_Union>(__u)._M_rest); + if constexpr (_Np == 0) + return std::forward<_Union>(__u)._M_first._M_get(); + else if constexpr (_Np == 1) + return std::forward<_Union>(__u)._M_rest._M_first._M_get(); + else if constexpr (_Np == 2) + return std::forward<_Union>(__u)._M_rest._M_rest._M_first._M_get(); + else + return __variant::__get_n<_Np - 3>( + std::forward<_Union>(__u)._M_rest._M_rest._M_rest); } // Returns the typed storage for __v. template constexpr decltype(auto) __get(_Variant&& __v) noexcept - { - return __variant::__get(std::in_place_index<_Np>, - std::forward<_Variant>(__v)._M_u); - } + { return __variant::__get_n<_Np>(std::forward<_Variant>(__v)._M_u); } template struct _Traits --O6EqyiJK2Aa7j5Z+--