From nobody Fri May 29 23:04:33 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4gRzSx4LYyz6gFqY for ; Fri, 29 May 2026 23:04:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gRzSx0xWvz3HB6 for ; Fri, 29 May 2026 23:04:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780095873; 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=vTyo/WSM6SelEkHyOGTKm8kTjHMVGGhP264Auqx1tc0=; b=VfvBOJ163nP2LLpEvvGKf+X3sTns0bCk/YSerXlncN8lSqQfpmaePuGNTI1hNN2MDTIb8L 2BQau9utIZCYYJyPIfry16NjCF+rzhnswvEy8bKCXSYE8n7RUPsUbWJA+T7UlqLsV3tbpD MofkALtXn0J1f79Xe001Xaos2P0SYa4qqMKjj+wZ0HsLOfbF8QW/XQh2BDTuDack30Lp4o u3O83Q4eh9hSBPLNFGIJ2JAsDTkI6O4OmsyyJUWbEVpE1V6w/JpHR2mIk133u+hzgpS3IM FKDqEOn+U2xJPx2Hiljej4IDZ6MhrJ11ln7raeSm2ta/gNb5XuMV2Qz1GuV2yg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1780095873; a=rsa-sha256; cv=none; b=Yk3QQ/XmfRecvnZPJN6E9v5ykRB8gcU8vLsakXfUHe6WS+5zimmdP026DJOwWESkD/0dnz Om1xOpuB0PVWM43EmO2QRKnRacm65PKIfu2VCrmdG8EA75p1D3AXess9BPq4qScw9GpnWq 8gxUqCcttqp3DUwzwK67PijcozjYTp+nBk3NPZv3EbE6UPEXTeUbY60MazN9ar0a+7soAH b/Ef74+NgsjNg0tisfuUPQtcp4oSGHdMWlaOIbkeYKmbcDoCReUFKdcxvwHfsiNEmXhDTT vbb68C8Txvmnf8GiqwUCDIzspyYP+YS9qTf0icW65yvTdBqvM5timy+i8VMmlg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1780095873; 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=vTyo/WSM6SelEkHyOGTKm8kTjHMVGGhP264Auqx1tc0=; b=F75hQfW7iCeX1x/bgo8BvZ8Se4ffRsp4pdLprkzYypal1cme3ZQKS7RuzgyP3qU6dD9VWl 8R9/hmGrOUM9l4LnCpvdwKQVpYvkHRsAqT4s9aGPNfvLlP5LuqI+ZqmrL1HKTx0jhU/Lmp I3uF9QV8+eAPEhMdDCzUv+d5BqHW5pbodedz6OU/X3rPksGk6RGiNLE9AP645HxNLuDBIp o3fI7Jj4BxdpDmaRZmuJucLOfYkAdKZEtn3D7GYWSrCjo3w4raJBEP+1mcgnvaujEWLb9a 2QGkMAiYV668CkBW2/sLJhFOV2o+1KeLvn6HddAH0dIaEj42oiXFybj5glldyw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gRzSx06wXztwy for ; Fri, 29 May 2026 23:04:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42b23 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 29 May 2026 23:04:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Dimitry Andric From: Dimitry Andric Subject: git: c350cdf7c80c - stable/14 - libcxx-compat: revert llvmorg-21-init-15984-g650b451d0065: List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c350cdf7c80c4e5cba60ac7c5c1a9207abea005e Auto-Submitted: auto-generated Date: Fri, 29 May 2026 23:04:33 +0000 Message-Id: <6a1a1b81.42b23.3881e973@gitrepo.freebsd.org> The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=c350cdf7c80c4e5cba60ac7c5c1a9207abea005e commit c350cdf7c80c4e5cba60ac7c5c1a9207abea005e Author: Dimitry Andric AuthorDate: 2026-01-04 19:43:58 +0000 Commit: Dimitry Andric CommitDate: 2026-05-29 22:59:36 +0000 libcxx-compat: revert llvmorg-21-init-15984-g650b451d0065: [libc++] Simplify the implementation of pointer_traits a bit (#142260) This is part of making libc++ 21 build with clang 18. PR: 292067 MFC after: 1 month (cherry picked from commit bb6713d38cc0d988378394f599d81d3a83dbaf03) --- .../libcxx/include/__memory/pointer_traits.h | 116 +++++++++++++++------ 1 file changed, 83 insertions(+), 33 deletions(-) diff --git a/contrib/llvm-project/libcxx/include/__memory/pointer_traits.h b/contrib/llvm-project/libcxx/include/__memory/pointer_traits.h index 8c7f8dff1b76..879b387b9ad1 100644 --- a/contrib/llvm-project/libcxx/include/__memory/pointer_traits.h +++ b/contrib/llvm-project/libcxx/include/__memory/pointer_traits.h @@ -16,13 +16,11 @@ #include <__type_traits/conditional.h> #include <__type_traits/conjunction.h> #include <__type_traits/decay.h> -#include <__type_traits/detected_or.h> #include <__type_traits/enable_if.h> #include <__type_traits/integral_constant.h> #include <__type_traits/is_class.h> #include <__type_traits/is_function.h> #include <__type_traits/is_void.h> -#include <__type_traits/nat.h> #include <__type_traits/void_t.h> #include <__utility/declval.h> #include <__utility/forward.h> @@ -36,37 +34,67 @@ _LIBCPP_PUSH_MACROS _LIBCPP_BEGIN_NAMESPACE_STD +// clang-format off +#define _LIBCPP_CLASS_TRAITS_HAS_XXX(NAME, PROPERTY) \ + template \ + struct NAME : false_type {}; \ + template \ + struct NAME<_Tp, __void_t > : true_type {} +// clang-format on + +_LIBCPP_CLASS_TRAITS_HAS_XXX(__has_pointer, pointer); +_LIBCPP_CLASS_TRAITS_HAS_XXX(__has_element_type, element_type); + +template ::value> +struct __pointer_traits_element_type {}; + template -struct __pointer_traits_element_type_impl {}; +struct __pointer_traits_element_type<_Ptr, true> { + using type _LIBCPP_NODEBUG = typename _Ptr::element_type; +}; template