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 [216.205.24.124]) by sourceware.org (Postfix) with ESMTP id 4AD48385AC3D for ; Tue, 5 Oct 2021 14:58:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 4AD48385AC3D 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-447-mbZ17XR6N3iywX9D9WTjaQ-1; Tue, 05 Oct 2021 10:58:04 -0400 X-MC-Unique: mbZ17XR6N3iywX9D9WTjaQ-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6971F1023F52; Tue, 5 Oct 2021 14:58:03 +0000 (UTC) Received: from localhost (unknown [10.33.37.40]) by smtp.corp.redhat.com (Postfix) with ESMTP id F41735F4EB; Tue, 5 Oct 2021 14:58:02 +0000 (UTC) Date: Tue, 5 Oct 2021 15:58:01 +0100 From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Simplify constraints for std::any construction Message-ID: MIME-Version: 1.0 X-Clacks-Overhead: GNU Terry Pratchett X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: multipart/mixed; boundary="tyz24kL0d0uWUArS" 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: Tue, 05 Oct 2021 14:58:07 -0000 --tyz24kL0d0uWUArS Content-Type: text/plain; charset=us-ascii Content-Disposition: inline libstdc++-v3/ChangeLog: * include/bits/utility.h (__is_in_place_type_v): Define variable template to detect in_place_type_t specializations. (__is_in_place_type): Replace class template with alias template using __is_in_place_type_v. * include/std/any (any(T&&)): Check __is_in_place_type first and avoid instantiating is_copy_constructible unnecessarily. Tested powerpc64le-linux. Committed to trunk. --tyz24kL0d0uWUArS Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch.txt" commit 6da36b7d0e43b6f9281c65c19a025d4888a25b2d Author: Jonathan Wakely Date: Mon Oct 4 23:14:30 2021 libstdc++: Simplify constraints for std::any construction libstdc++-v3/ChangeLog: * include/bits/utility.h (__is_in_place_type_v): Define variable template to detect in_place_type_t specializations. (__is_in_place_type): Replace class template with alias template using __is_in_place_type_v. * include/std/any (any(T&&)): Check __is_in_place_type first and avoid instantiating is_copy_constructible unnecessarily. diff --git a/libstdc++-v3/include/bits/utility.h b/libstdc++-v3/include/bits/utility.h index 96d350874d9..fce52a4530d 100644 --- a/libstdc++-v3/include/bits/utility.h +++ b/libstdc++-v3/include/bits/utility.h @@ -184,17 +184,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION inline constexpr in_place_index_t<_Idx> in_place_index{}; template - struct __is_in_place_type_impl : false_type - { }; + inline constexpr bool __is_in_place_type_v = false; template - struct __is_in_place_type_impl> : true_type - { }; + inline constexpr bool __is_in_place_type_v> = true; template - struct __is_in_place_type - : public __is_in_place_type_impl<_Tp> - { }; + using __is_in_place_type = bool_constant<__is_in_place_type_v<_Tp>>; + #endif // C++17 #endif // C++14 diff --git a/libstdc++-v3/include/std/any b/libstdc++-v3/include/std/any index 625cac619f0..e3d9d774de4 100644 --- a/libstdc++-v3/include/std/any +++ b/libstdc++-v3/include/std/any @@ -183,8 +183,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION /// Construct with a copy of @p __value as the contained object. template , typename _Mgr = _Manager<_VTp>, - enable_if_t::value - && !__is_in_place_type<_VTp>::value, bool> = true> + typename = _Require<__not_<__is_in_place_type<_VTp>>, + is_copy_constructible<_VTp>>> any(_Tp&& __value) : _M_manager(&_Mgr::_S_manage) { --tyz24kL0d0uWUArS--