From patchwork Wed May 6 08:48:04 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 134534 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 8A3514BA23F7 for ; Wed, 6 May 2026 08:54:13 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8A3514BA23F7 Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=Xzjmk6qS 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 ESMTP id 11AE04BA23FD for ; Wed, 6 May 2026 08:53:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 11AE04BA23FD Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 11AE04BA23FD Authentication-Results: sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1778057627; cv=none; b=Sd7Pq2bDRjThe7FbkMG1XZEgv3Fy2/cE7bxiKIkHdqf1YC6Hl42coSprvnUmve7bOipW+JB6vhfrJjBzooiELapWWfsadJ4iAfpqCVCcIbdKxzN0WVLX8tHONv5XkCPPv/faFVKW40/ejb5YxiCIxS2YamXCHehRAGR6t1DDMS4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1778057627; c=relaxed/simple; bh=B7pDEpr0+fkrXRtxVSqbwRtsjOYndYyaWZ68RTI5KuM=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=AEEHjtot4z0mQxfpj1GXLfb4ku2ddeTQt5sY9nZybb+cmOYHM+oR0tNQczOmkzq2kP/pbVBB3RUAE7cM5v4xPzdD69hykiQwSI0vygb5yj+eNO4xe3cm+mlbaWQviblR+sPrLEkQWE+fRBsv630TcBgvJ+FkQyI75nb2rN0eNZA= ARC-Authentication-Results: i=1; sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=Xzjmk6qS DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 11AE04BA23FD DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1778057626; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/gLvmsU0C5sSPNYR4NT1HbrD/Fz+TQVbORtEDShrjVU=; b=Xzjmk6qSG7dQqhVcMTPxPw8uv5U1+LaowORajT9OMvo9DowoUbWKkI4YfOYd0og+a/k6Gc Rv2WhaRdZbwbVBArrE9fHPfSZbD0K9FxrI2/Sq6SNO1BRQM5hpQMxcHCPFoTJG3SvjpALv jDmIxn5ZgrhugCTaWwUj3yYXTSn48Vw= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-410-yyYHEzrUMdqpa33Qp0BpyQ-1; Wed, 06 May 2026 04:53:43 -0400 X-MC-Unique: yyYHEzrUMdqpa33Qp0BpyQ-1 X-Mimecast-MFC-AGG-ID: yyYHEzrUMdqpa33Qp0BpyQ_1778057622 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id EF8EB18005B3; Wed, 6 May 2026 08:53:41 +0000 (UTC) Received: from zen.kayari.org (unknown [10.44.32.38]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id EE1C91800240; Wed, 6 May 2026 08:53:40 +0000 (UTC) From: Jonathan Wakely To: gcc-patches@gcc.gnu.org, libstdc++@gcc.gnu.org Subject: [PATCH v2 1/3] libstdc++: Replace uses of EBO with [[no_unique_address]] Date: Wed, 6 May 2026 09:48:04 +0100 Message-ID: <20260506085339.325517-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: WNozS6X0qXxEdT-DpK5j1oR533F0x_1ylY8JgemkDVk_1778057622 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, PROLO_LEO1, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_NONE, TXREP autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces~patchwork=sourceware.org@gcc.gnu.org Clang 9 added support for [[__no_unique_address__]] and we don't support Intel icc any longer, so we can remove the code in that works around the absence of that attribute. We can also address a FIXME in and replace uses of EBO with the attribute. libstdc++-v3/ChangeLog: * include/bits/shared_ptr_base.h (_Sp_ebo_helper): Simplify by using [[__no_unique_address__]] instead of EBO. Use the attribute unconditionally for the unstable ABI. (_Sp_counted_deleter::_Impl): Adjust uses of _Sp_ebo_helper. (_Sp_counted_ptr_inplace::_Impl): Likewise. * include/std/tuple (_Head_base): Remove implementation for compilers that don't support [[__no_unique_address__]]. Use the attribute unconditionally for the unstable ABI. --- v2: Add the attribute to the data members of _Impl as well as to the _M_obj data member of _Sp_ebo_helper. Otherwise the _M_obj subobject is potentially overlapping, but the _M_ and _M_d ones are not. We need both to be marked with the attribute. What we *really* want is [[no_unique_address(expr)]] so that we can get rid of _Sp_ebo_helper entirely, and just do: #if ! _GLIBCXX_INLINE_VERSION // Stable ABI template __can_overlap = !__is_final(T) && __is_empty(T); #else // Unstable ABI template __can_overlap = true; #endif [[no_unique_address(__can_overlap<_Del>)]] _M_del; I should propose that to WG21, and if rejected just get it added to GCC and Clang. Tested x86_64-linux. libstdc++-v3/include/bits/shared_ptr_base.h | 65 +++++++++---------- libstdc++-v3/include/std/tuple | 69 ++++----------------- 2 files changed, 43 insertions(+), 91 deletions(-) diff --git a/libstdc++-v3/include/bits/shared_ptr_base.h b/libstdc++-v3/include/bits/shared_ptr_base.h index b92e3a4c90e4..3ab73f6e4a0d 100644 --- a/libstdc++-v3/include/bits/shared_ptr_base.h +++ b/libstdc++-v3/include/bits/shared_ptr_base.h @@ -513,57 +513,52 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION inline void _Sp_counted_ptr::_M_dispose() noexcept { } - // FIXME: once __has_cpp_attribute(__no_unique_address__)) is true for - // all supported compilers we can greatly simplify _Sp_ebo_helper. +#if ! __has_cpp_attribute(__no_unique_address__) +#error "support for [[__no_unique_address__]] attribute is required" +#endif + +#if ! _GLIBCXX_INLINE_VERSION // N.B. unconditionally applying the attribute could change layout for // final types, which currently cannot use EBO so have a unique address. - - template + template struct _Sp_ebo_helper; +#else + template + struct _Sp_ebo_helper; +#endif - /// Specialization using EBO. - template - struct _Sp_ebo_helper<_Nm, _Tp, true> : private _Tp + /// Specialization using [[no_unique_address]]. + template + struct _Sp_ebo_helper<_Tp, true> { - explicit _Sp_ebo_helper(const _Tp& __tp) : _Tp(__tp) { } - explicit _Sp_ebo_helper(_Tp&& __tp) : _Tp(std::move(__tp)) { } - - static _Tp& - _S_get(_Sp_ebo_helper& __eboh) { return static_cast<_Tp&>(__eboh); } + [[__no_unique_address__]] _Tp _M_obj; }; - /// Specialization not using EBO. - template - struct _Sp_ebo_helper<_Nm, _Tp, false> +#if ! _GLIBCXX_INLINE_VERSION + /// Specialization not using [[no_unique_address]]. + template + struct _Sp_ebo_helper<_Tp, false> { - explicit _Sp_ebo_helper(const _Tp& __tp) : _M_tp(__tp) { } - explicit _Sp_ebo_helper(_Tp&& __tp) : _M_tp(std::move(__tp)) { } - - static _Tp& - _S_get(_Sp_ebo_helper& __eboh) - { return __eboh._M_tp; } - - private: - _Tp _M_tp; + _Tp _M_obj; }; +#endif // Support for custom deleter and/or allocator template class _Sp_counted_deleter final : public _Sp_counted_base<_Lp> { - class _Impl : _Sp_ebo_helper<0, _Deleter>, _Sp_ebo_helper<1, _Alloc> + class _Impl { - typedef _Sp_ebo_helper<0, _Deleter> _Del_base; - typedef _Sp_ebo_helper<1, _Alloc> _Alloc_base; + [[__no_unique_address__]] _Sp_ebo_helper<_Deleter> _M_d; + [[__no_unique_address__]] _Sp_ebo_helper<_Alloc> _M_a; public: _Impl(_Ptr __p, _Deleter __d, const _Alloc& __a) noexcept - : _Del_base(std::move(__d)), _Alloc_base(__a), _M_ptr(__p) + : _M_d{std::move(__d)}, _M_a{__a}, _M_ptr(__p) { } - _Deleter& _M_del() noexcept { return _Del_base::_S_get(*this); } - _Alloc& _M_alloc() noexcept { return _Alloc_base::_S_get(*this); } + _Deleter& _M_del() noexcept { return _M_d._M_obj; } + _Alloc& _M_alloc() noexcept { return _M_a._M_obj; } _Ptr _M_ptr; }; @@ -645,14 +640,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template class _Sp_counted_ptr_inplace final : public _Sp_counted_base<_Lp> { - class _Impl : _Sp_ebo_helper<0, _Alloc> + class _Impl { - typedef _Sp_ebo_helper<0, _Alloc> _A_base; + [[__no_unique_address__]] _Sp_ebo_helper<_Alloc> _M_a; public: - explicit _Impl(_Alloc __a) noexcept : _A_base(__a) { } + explicit _Impl(_Alloc __a) noexcept : _M_a{std::move(__a)} { } - _Alloc& _M_alloc() noexcept { return _A_base::_S_get(*this); } + _Alloc& _M_alloc() noexcept { return _M_a._M_obj; } __gnu_cxx::__aligned_buffer<__remove_cv_t<_Tp>> _M_storage; }; diff --git a/libstdc++-v3/include/std/tuple b/libstdc++-v3/include/std/tuple index f7caa79cda04..32800d8d7752 100644 --- a/libstdc++-v3/include/std/tuple +++ b/libstdc++-v3/include/std/tuple @@ -68,7 +68,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template class tuple; +#if ! __has_cpp_attribute(__no_unique_address__) +#error "support for [[__no_unique_address__]] attribute is required" +#endif + /// @cond undocumented +#if ! _GLIBCXX_INLINE_VERSION template struct __is_empty_non_tuple : is_empty<_Tp> { }; @@ -76,17 +81,21 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template struct __is_empty_non_tuple> : false_type { }; - // Use the Empty Base-class Optimization for empty, non-final types. + // Use [[no_unique_address]] for empty, non-final types. template using __empty_not_final = __conditional_t<__is_final(_Tp), false_type, __is_empty_non_tuple<_Tp>>; +#else + // For the unstable ABI we always use [[no_unique_address]]. + template + using __empty_not_final = true_type; +#endif template::value> struct _Head_base; -#if __has_cpp_attribute(__no_unique_address__) template struct _Head_base<_Idx, _Head, true> { @@ -141,61 +150,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION [[__no_unique_address__]] _Head _M_head_impl; }; -#else - template - struct _Head_base<_Idx, _Head, true> - : public _Head - { - constexpr _Head_base() - : _Head() { } - - constexpr _Head_base(const _Head& __h) - : _Head(__h) { } - - constexpr _Head_base(const _Head_base&) = default; - constexpr _Head_base(_Head_base&&) = default; - - template - constexpr _Head_base(_UHead&& __h) - : _Head(std::forward<_UHead>(__h)) { } - - _GLIBCXX20_CONSTEXPR - _Head_base(allocator_arg_t, __uses_alloc0) - : _Head() { } - - template - _GLIBCXX20_CONSTEXPR - _Head_base(allocator_arg_t, __uses_alloc1<_Alloc> __a) - : _Head(allocator_arg, *__a._M_a) { } - - template - _GLIBCXX20_CONSTEXPR - _Head_base(allocator_arg_t, __uses_alloc2<_Alloc> __a) - : _Head(*__a._M_a) { } - - template - _GLIBCXX20_CONSTEXPR - _Head_base(__uses_alloc0, _UHead&& __uhead) - : _Head(std::forward<_UHead>(__uhead)) { } - - template - _GLIBCXX20_CONSTEXPR - _Head_base(__uses_alloc1<_Alloc> __a, _UHead&& __uhead) - : _Head(allocator_arg, *__a._M_a, std::forward<_UHead>(__uhead)) { } - - template - _GLIBCXX20_CONSTEXPR - _Head_base(__uses_alloc2<_Alloc> __a, _UHead&& __uhead) - : _Head(std::forward<_UHead>(__uhead), *__a._M_a) { } - - static constexpr _Head& - _M_head(_Head_base& __b) noexcept { return __b; } - - static constexpr const _Head& - _M_head(const _Head_base& __b) noexcept { return __b; } - }; -#endif +#if ! _GLIBCXX_INLINE_VERSION template struct _Head_base<_Idx, _Head, false> { @@ -250,6 +206,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _Head _M_head_impl; }; +#endif #if __cpp_lib_tuple_like // >= C++23 struct __tuple_like_tag_t { explicit __tuple_like_tag_t() = default; }; From patchwork Wed May 6 08:48:05 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 134533 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 1BD3D4BA23FA for ; Wed, 6 May 2026 08:54:08 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1BD3D4BA23FA Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=DeP3fKdO 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 ESMTP id AF0964BA23FA for ; Wed, 6 May 2026 08:53:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org AF0964BA23FA Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org AF0964BA23FA Authentication-Results: sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1778057626; cv=none; b=A8Fqs4ulrotdkzi4WaFcxZp4Aa1fh8V1SvbFSlpFxH9mj7zcVotIbkwsZ+hW1W59ogqy/fUnRuwsoW1FtafUbJc+X20xz4N4LJMSkTzHnNOpOtAaBQzq3/Yr8jErqkll1rOYuMXsRoihlsWQypHZxKGtdFXN+5D8WmtYwzKD9nk= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1778057626; c=relaxed/simple; bh=/Wr5MlrL/6zbYA8Llba0sDxUgecoX3gGGvrWSkhD24w=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=Go18GHUe71CD7UNuIamfy9UmPROsX1OiF6U7Cc199Q3PwHyir+VEl3B8BoZrnfefW2O3UPxFB8dZl+jtnulO9CrrbVRWSQsgnHdgXGVEiaBkftgznpm5D8ilStJb5JUYPao28fNmNJxxgyUKJdhdaY7FvtpKLPizi1juxaXc80g= ARC-Authentication-Results: i=1; sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=DeP3fKdO DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AF0964BA23FA DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1778057625; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1UMTh/tu3k+Tu+wO1jrQP/U9KOZy7t+gOu7ZbhBEFY0=; b=DeP3fKdOs3tzQnBkEYH7/xwrAuIksyeWcoy1Uvxg0qm7MYPjqb2E4umma8k5LQ4XDwumLn FJHqB/d+ZqcLMPU2mgqU1yUYldThTwj74squLciOR2nsZ6k1RNF8SeqvSPmMwSL3gZAss5 wH7OKsxiWZ9xVzHMe1x3grAzHRL+dno= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-194-a5zWVBzeO26gPVpVncfgUQ-1; Wed, 06 May 2026 04:53:44 -0400 X-MC-Unique: a5zWVBzeO26gPVpVncfgUQ-1 X-Mimecast-MFC-AGG-ID: a5zWVBzeO26gPVpVncfgUQ_1778057623 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B8B7D1956096; Wed, 6 May 2026 08:53:43 +0000 (UTC) Received: from zen.kayari.org (unknown [10.44.32.38]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 81E551801A63; Wed, 6 May 2026 08:53:42 +0000 (UTC) From: Jonathan Wakely To: gcc-patches@gcc.gnu.org, libstdc++@gcc.gnu.org Subject: [PATCH v2 2/3] libstdc++: Simplify std::shared_ptr internals Date: Wed, 6 May 2026 09:48:05 +0100 Message-ID: <20260506085339.325517-2-jwakely@redhat.com> In-Reply-To: <20260506085339.325517-1-jwakely@redhat.com> References: <20260506085339.325517-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: genzqw8tMpdaCYrpk3G76fdfblimFT34uKPoEj0Bfb4_1778057623 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.5 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_BLOCKED, SPF_HELO_PASS, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces~patchwork=sourceware.org@gcc.gnu.org Now that we don't use the EBO we can flatten the class layout by removing some _Impl classes. libstdc++-v3/ChangeLog: * include/bits/out_ptr.h (out_ptr_t::_Impl::~_Impl): Adjust access to shared_ptr internals. * include/bits/shared_ptr_base.h (_Sp_counted_deleter): Remove _Impl class and replace _M_impl with the data members it contained. (_Sp_counted_ptr_inplace): Likewise. --- v2: Use the attribute on the _M_del and _M_alloc members. Tested x86_64-linux. libstdc++-v3/include/bits/out_ptr.h | 2 +- libstdc++-v3/include/bits/shared_ptr_base.h | 60 ++++++--------------- 2 files changed, 18 insertions(+), 44 deletions(-) diff --git a/libstdc++-v3/include/bits/out_ptr.h b/libstdc++-v3/include/bits/out_ptr.h index cc5a8a3adacb..f5fdc6cf910f 100644 --- a/libstdc++-v3/include/bits/out_ptr.h +++ b/libstdc++-v3/include/bits/out_ptr.h @@ -257,7 +257,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION auto& __pi = _M_smart._M_refcount._M_pi; if (_Sp __ptr = _M_smart.get()) - static_cast<_Scd*>(__pi)->_M_impl._M_ptr = __ptr; + static_cast<_Scd*>(__pi)->_M_ptr = __ptr; else // Destroy the control block manually without invoking deleter. std::__exchange(__pi, nullptr)->_M_destroy(); } diff --git a/libstdc++-v3/include/bits/shared_ptr_base.h b/libstdc++-v3/include/bits/shared_ptr_base.h index 3ab73f6e4a0d..01fd57180ecc 100644 --- a/libstdc++-v3/include/bits/shared_ptr_base.h +++ b/libstdc++-v3/include/bits/shared_ptr_base.h @@ -547,32 +547,16 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template class _Sp_counted_deleter final : public _Sp_counted_base<_Lp> { - class _Impl - { - [[__no_unique_address__]] _Sp_ebo_helper<_Deleter> _M_d; - [[__no_unique_address__]] _Sp_ebo_helper<_Alloc> _M_a; - - public: - _Impl(_Ptr __p, _Deleter __d, const _Alloc& __a) noexcept - : _M_d{std::move(__d)}, _M_a{__a}, _M_ptr(__p) - { } - - _Deleter& _M_del() noexcept { return _M_d._M_obj; } - _Alloc& _M_alloc() noexcept { return _M_a._M_obj; } - - _Ptr _M_ptr; - }; - public: using __allocator_type = __alloc_rebind<_Alloc, _Sp_counted_deleter>; // __d(__p) must not throw. _Sp_counted_deleter(_Ptr __p, _Deleter __d) noexcept - : _M_impl(__p, std::move(__d), _Alloc()) { } + : _M_del{std::move(__d)}, _M_alloc{}, _M_ptr(__p) { } // __d(__p) must not throw. _Sp_counted_deleter(_Ptr __p, _Deleter __d, const _Alloc& __a) noexcept - : _M_impl(__p, std::move(__d), __a) { } + : _M_del{std::move(__d)}, _M_alloc{__a}, _M_ptr(__p) { } #pragma GCC diagnostic push // PR tree-optimization/122197 #pragma GCC diagnostic ignored "-Wfree-nonheap-object" @@ -582,12 +566,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION virtual void _M_dispose() noexcept - { _M_impl._M_del()(_M_impl._M_ptr); } + { _M_del._M_obj(_M_ptr); } virtual void _M_destroy() noexcept { - __allocator_type __a(_M_impl._M_alloc()); + __allocator_type __a(_M_alloc._M_obj); __allocated_ptr<__allocator_type> __guard_ptr{ __a, this }; this->~_Sp_counted_deleter(); } @@ -598,19 +582,20 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION #if __cpp_rtti // _GLIBCXX_RESOLVE_LIB_DEFECTS // 2400. shared_ptr's get_deleter() should use addressof() - return __ti == typeid(_Deleter) - ? std::__addressof(_M_impl._M_del()) - : nullptr; -#else - return nullptr; + if (__ti == typeid(_Deleter)) + return std::__addressof(_M_del._M_obj); #endif + return nullptr; } private: #ifdef __glibcxx_out_ptr template friend class out_ptr_t; #endif - _Impl _M_impl; + + [[__no_unique_address__]] _Sp_ebo_helper<_Deleter> _M_del; + [[__no_unique_address__]] _Sp_ebo_helper<_Alloc> _M_alloc; + _Ptr _M_ptr; }; // helpers for make_shared / allocate_shared @@ -640,25 +625,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template class _Sp_counted_ptr_inplace final : public _Sp_counted_base<_Lp> { - class _Impl - { - [[__no_unique_address__]] _Sp_ebo_helper<_Alloc> _M_a; - - public: - explicit _Impl(_Alloc __a) noexcept : _M_a{std::move(__a)} { } - - _Alloc& _M_alloc() noexcept { return _M_a._M_obj; } - - __gnu_cxx::__aligned_buffer<__remove_cv_t<_Tp>> _M_storage; - }; - public: using __allocator_type = __alloc_rebind<_Alloc, _Sp_counted_ptr_inplace>; // Alloc parameter is not a reference so doesn't alias anything in __args template _Sp_counted_ptr_inplace(_Alloc __a, _Args&&... __args) - : _M_impl(__a) + : _M_alloc{__a} { // _GLIBCXX_RESOLVE_LIB_DEFECTS // 2070. allocate_shared should use allocator_traits::construct @@ -674,14 +647,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION virtual void _M_dispose() noexcept { - allocator_traits<_Alloc>::destroy(_M_impl._M_alloc(), _M_ptr()); + allocator_traits<_Alloc>::destroy(_M_alloc._M_obj, _M_ptr()); } // Override because the allocator needs to know the dynamic type virtual void _M_destroy() noexcept { - __allocator_type __a(_M_impl._M_alloc()); + __allocator_type __a(_M_alloc._M_obj); __allocated_ptr<__allocator_type> __guard_ptr{ __a, this }; this->~_Sp_counted_ptr_inplace(); } @@ -711,9 +684,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } __remove_cv_t<_Tp>* - _M_ptr() noexcept { return _M_impl._M_storage._M_ptr(); } + _M_ptr() noexcept { return _M_storage._M_ptr(); } - _Impl _M_impl; + [[__no_unique_address__]] _Sp_ebo_helper<_Alloc> _M_alloc; + __gnu_cxx::__aligned_buffer<__remove_cv_t<_Tp>> _M_storage; }; #ifdef __glibcxx_smart_ptr_for_overwrite // C++ >= 20 && HOSTED From patchwork Wed May 6 08:48:06 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 134535 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5D7E54BA23F7 for ; Wed, 6 May 2026 08:54:28 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5D7E54BA23F7 Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=CQavv0QN 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.129.124]) by sourceware.org (Postfix) with ESMTP id 78AD14BA23F7 for ; Wed, 6 May 2026 08:53:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 78AD14BA23F7 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 78AD14BA23F7 Authentication-Results: sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1778057630; cv=none; b=xuZa5+uJwxp+eN+D2Ot/R8qTh8YVfsOs4hPeN6Q6gNiMccC7rT7jjVsi+FOxnhQ7FS2XkxXCWq01irq1LvHB9o4p8XdkD8jMeFz6iH7Dx0VotYxWE++nbZ3HgbTsAxNfsyYPAtArJi+betpWG+nvC5u4IDwpaUQaRt4jTAwaXUk= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1778057630; c=relaxed/simple; bh=Wn0JFPdfNPv9Y82HstvqiF6v6Tofb6xuh1RL/exeF/Q=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=RcZaCJuG1M2teVXXlNvnWoc/GMgtT1SvnhfWu3OWP3+v459K5PKUKlqzi2UWgg+gUR56Qc3trZYUte7PihgblZcZAkcWCbIWIrtlxFPYOqjz4ipiNz4HRDR9P6eyTweQ56OWeXNWSbxYUPhcRlcEgcsipova1hffI7NGXnVD5qc= ARC-Authentication-Results: i=1; sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=CQavv0QN DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 78AD14BA23F7 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1778057629; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7YMcrYGsYjFRMCVes65DZs6dkd+vY2WBqAQcmyM9wNc=; b=CQavv0QNsKLUEJSu/xqVHTKW9BGIR3Ao3xAecUBZ5CuXQyzoqhLGNfsOKg/vbk2Yy073/w FYBZIlY7jBcwQn9N/1X3fP5fQg/qze9THFj1032Q6Bz8W4GkiEPvFegcPGGUJ0ub8q1irY pTYQkP5peEF8fmVZm7hZfH2TOIDcN+c= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-561-di0fuDr6Mdmntzc1Eo4PTQ-1; Wed, 06 May 2026 04:53:46 -0400 X-MC-Unique: di0fuDr6Mdmntzc1Eo4PTQ-1 X-Mimecast-MFC-AGG-ID: di0fuDr6Mdmntzc1Eo4PTQ_1778057625 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 87C8D195608B; Wed, 6 May 2026 08:53:45 +0000 (UTC) Received: from zen.kayari.org (unknown [10.44.32.38]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 553FA1801A63; Wed, 6 May 2026 08:53:44 +0000 (UTC) From: Jonathan Wakely To: gcc-patches@gcc.gnu.org, libstdc++@gcc.gnu.org Subject: [PATCH v2 3/3] libstdc++: Remove non-concepts fallback for std::make_shared_for_overwrite Date: Wed, 6 May 2026 09:48:06 +0100 Message-ID: <20260506085339.325517-3-jwakely@redhat.com> In-Reply-To: <20260506085339.325517-1-jwakely@redhat.com> References: <20260506085339.325517-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: YC9EtSohpqAOr-d1Je6jNaew9DE90P_9gJRALzt3nVU_1778057625 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.5 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_BLOCKED, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_NONE, TXREP autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces~patchwork=sourceware.org@gcc.gnu.org Clang 10 added support for concepts, so we no longer need to support C++20 compilers that don't define __cpp_concepts. libstdc++-v3/ChangeLog: * include/bits/shared_ptr.h (_UnboundedArray, _BoundedArray) (_NotUnboundedArray): Remove fallback definition for C++20 compilers that don't define __cpp_concepts. * include/bits/shared_ptr_base.h (_Sp_counted_ptr_inplace): Remove fallback declaration of _Sp_overwrite_tag partial specialization. --- v2: Unchanged, just rebased on PATCH v2 2/3. Tested x86_64-linux. libstdc++-v3/include/bits/shared_ptr.h | 18 ------------------ libstdc++-v3/include/bits/shared_ptr_base.h | 5 ----- 2 files changed, 23 deletions(-) diff --git a/libstdc++-v3/include/bits/shared_ptr.h b/libstdc++-v3/include/bits/shared_ptr.h index fd00384df223..ada32d3d3cb9 100644 --- a/libstdc++-v3/include/bits/shared_ptr.h +++ b/libstdc++-v3/include/bits/shared_ptr.h @@ -114,38 +114,20 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION #if __glibcxx_shared_ptr_arrays >= 201707L // Constraint for overloads taking array types with unknown bound, U[]. -#if __cpp_concepts template requires is_array_v<_Tp> && (extent_v<_Tp> == 0) using _UnboundedArray = _Tp; -#else - template - using _UnboundedArray - = __enable_if_t<__is_array_unknown_bounds<_Tp>::value, _Tp>; -#endif // Constraint for overloads taking array types with known bound, U[N]. -#if __cpp_concepts template requires (extent_v<_Tp> != 0) using _BoundedArray = _Tp; -#else - template - using _BoundedArray - = __enable_if_t<__is_array_known_bounds<_Tp>::value, _Tp>; -#endif #if __glibcxx_smart_ptr_for_overwrite // Constraint for overloads taking either non-array or bounded array, U[N]. -#if __cpp_concepts template requires (!is_array_v<_Tp>) || (extent_v<_Tp> != 0) using _NotUnboundedArray = _Tp; -#else - template - using _NotUnboundedArray - = __enable_if_t::value, _Tp>; -#endif #endif // smart_ptr_for_overwrite #endif // shared_ptr_arrays diff --git a/libstdc++-v3/include/bits/shared_ptr_base.h b/libstdc++-v3/include/bits/shared_ptr_base.h index 01fd57180ecc..7366f1e04702 100644 --- a/libstdc++-v3/include/bits/shared_ptr_base.h +++ b/libstdc++-v3/include/bits/shared_ptr_base.h @@ -696,14 +696,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // Partial specialization used for make_shared_for_overwrite(). // This partial specialization is used when the allocator's value type // is the special _Sp_overwrite_tag type. -#if __cpp_concepts template requires is_same_v class _Sp_counted_ptr_inplace<_Tp, _Alloc, _Lp> final -#else - template class _Alloc, _Lock_policy _Lp> - class _Sp_counted_ptr_inplace<_Tp, _Alloc<_Sp_overwrite_tag>, _Lp> final -#endif : public _Sp_counted_base<_Lp> { [[no_unique_address]] _Alloc _M_alloc;