From nobody Sat Apr 25 14:20:09 2026 X-Original-To: dev-commits-src-main@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 4g2sRZ2cvSz6bZXS for ; Sat, 25 Apr 2026 14:20:10 +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 4g2sRY3bh8z3HsC for ; Sat, 25 Apr 2026 14:20:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777126809; 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=p6lnsCraRKd/8AAJQM0+eentViL0LnBxcWYCMgAa2KE=; b=mTz8ZfBB1M09Favay2v7yeIcHcYQ11JaCUOez1WXkcHIUpwOd9wM9TSPNSRsQI2J7XFTmq CVCrwrkLHKdmOqwfk9mDaqlX2OG5pJshKBaARTfY8jHsgakkeiBHeNSHTlJgG0A2C/dT7m jfhHxSpA/bgp7T7p+iFK/oRgrHNBzox6cthXZCKFnb6SpoGLoyPUD+J2UZvCQYUCWUnNYI 8w7wWd4dsHe797Jw3bsb49TEXOHmB7KXxSr/vlCdTjFxX2iy0xo8wcxA0GBctwbUIJPANq XUs/AKiiUb4TIurXTO8nNIPybLPsG7fZ+m2e/Y/8igLwSdJWeQS/lr/giNOLKw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777126809; a=rsa-sha256; cv=none; b=gpM9hkZAxOBNM/6pfsGeZWNIkqrayGJNRE8nrWZhJ13QNBoF3dMhvM2lgFcRUWYR1Emrpu XBMiIHNuSwAoOU8OlGJDGyLlVC1RVkcEryZHwbIeuzO9AZkXaqqjln5Oox8tAQpKsSEOgy 3LYhYQCRF2avklwbMryvMgiT4VM4sI9UbgwqYBWfMk/Tlr4Iby11W4jMSO+n+EJGWn/7zj F5aJrNYW5tsIpgEbnfB+70TkJPNh0SoOLBiT5WlElWCdoEapd1YA/9IXeurPRNjxJ510SR ovjOmP+AmV5Edeh7giX8O0ODb7jU+nC38qQTPIFTV5IkDFsopeA8ggFhnjqNGA== 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=1777126809; 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=p6lnsCraRKd/8AAJQM0+eentViL0LnBxcWYCMgAa2KE=; b=xoaWlj7ASWPp2C6U1/TCebzEMT9Fe23fy3aH0ESCgajnlYeu1od/OpPgYlLoBdBX/gGa9V Qg0R49XtxapyXPxq8HruzhHHSf9Q7b6uF2tfhpdp0itxV5eD8JJqokEKK0AwiTXmMnf7kv i/8lhti0ATDI0CYkEz6xaRjVZ0eCCX5FhfKgu9TDo0ESxguBItHxND+ptqKb0+zP8U6LWh dp1FesqG1DC6Qy//6bnK0y3xeW9yvsob5mpld9pRQPEDmPCG9dNcVhOBbnEiqeUcXHv73y bhlVJL6ky+R0cWuG69Lx6/Rvo+L3M76aDJ4W09Oa785dJGWJaVxVuqTQfyzqWw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g2sRY385KzdS1 for ; Sat, 25 Apr 2026 14:20:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 375eb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 25 Apr 2026 14:20:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Dimitry Andric From: Dimitry Andric Subject: git: bb6713d38cc0 - main - libcxx-compat: revert llvmorg-21-init-15984-g650b451d0065: List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org 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/main X-Git-Reftype: branch X-Git-Commit: bb6713d38cc0d988378394f599d81d3a83dbaf03 Auto-Submitted: auto-generated Date: Sat, 25 Apr 2026 14:20:09 +0000 Message-Id: <69eccd99.375eb.2b39e3c3@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=bb6713d38cc0d988378394f599d81d3a83dbaf03 commit bb6713d38cc0d988378394f599d81d3a83dbaf03 Author: Dimitry Andric AuthorDate: 2026-01-04 19:43:58 +0000 Commit: Dimitry Andric CommitDate: 2026-04-25 14:14:20 +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 --- .../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