From nobody Sat Apr 25 14:18:35 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 4g2sPl5jBTz6bZGR for ; Sat, 25 Apr 2026 14:18:35 +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 4g2sPl0ptrz3FQh for ; Sat, 25 Apr 2026 14:18:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777126715; 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=u4MaDDGI+dgyKN0ckW72mB+lBtF/1QZHBAubPW5wp2U=; b=EZmY2q25Ti64hI8rYPFW2uPBa42jgHu49aAIMAtQ4dlHq5PKF3nErHW/7UTZez9yBZfNoE 2NnrfSsIBwBJSSAeK8TUJUOK3ZfJd5wBfcSwJvTjy4NEslgpv5bVviMpsFCV+Gwok4n/1k O2lGPkY6XN48bXvdpfdGRv2kbGyR6URYh+RCeNYBFsvnnNKBENo6j3QhX5FCpRDMFbrjwJ T8dsm3BbvIhmO6SigWglrvPqs8Mq3QlQynwyOW/A1yMoiKMW765oG9py1dMPj+8XTFwWhL ytS+msJVfPmXPQbZILWReyJ9NUB2GxuIrNq9fSveU9MqXgWwOCIdWJtqWnh5Gw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777126715; a=rsa-sha256; cv=none; b=uCJJsD3tYCtWbU4DTGip5QxBNp3JxemQVbzd73kKqy5qXYKqNjm/9FEFe7Tj4DBF4+LZc9 J+H2SH0s7DFPZFyT9UGxCWFGjFbvjqsZIzIcSjfRpagDX6AcUlJnTxGSxukSqLeWzZzn8u qj1d57veIWu4MNfm7Fn5OI2aH1rFukTzbwKyc+rNg0zL6g1t3ObhFwyS8FU2UIeFiV2tWV IduUJT2/pFNGIT5AyWIvu1ajDimeLzNvXQ0ltIG+mpn3fsgRe4VKDTCsrLsoX15FVonQuw u8ZVDIYB6ukvEHBRNH8EVWYYnoW+0eeAsggIaPri4GuxhtHzmZXgQZz0Fukmzg== 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=1777126715; 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=u4MaDDGI+dgyKN0ckW72mB+lBtF/1QZHBAubPW5wp2U=; b=l9Rfj1lKiSRDYjlaaGnkLpUlHlzWuBxZgj/AXPzE5tI/2zGPhVZ0AMNhJXjrf2QpZBklkf d1hkclge6DTDSo83O7ItUBvWkIS/4LvrQAoIIPlqkT1lVarxGfDVBD1L6un3mebSgKJ3fA ciePuVEhA5+C92ERdr85RniIaHEoVCAFYo7+kLGJKRMDgjGbJFK4mAJ2TEVFX4P3R676a9 1gPAbeF72A9EWC7bOyh9FlNMswGamqwPQ4SJROj+H1dL2kAkUQHGAr590SX17q11heYOnC wA4D+zn7PX7RdT2eAJXa/xWEwyqmDQKcWPgzo80QtwB0LerudvRSB4KLq/kYyg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g2sPl0MmjzdQc for ; Sat, 25 Apr 2026 14:18:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 376ad by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 25 Apr 2026 14:18:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 3ca6facafc4c - main - Revert "libcxx-compat: revert llvmorg-19-init-4504-g937a5396cf3e:" 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: 3ca6facafc4c96fa9d6027b6f3b50b7c3e3a5dbf Auto-Submitted: auto-generated Date: Sat, 25 Apr 2026 14:18:35 +0000 Message-Id: <69eccd3b.376ad.7ee4a48d@gitrepo.freebsd.org> The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=3ca6facafc4c96fa9d6027b6f3b50b7c3e3a5dbf commit 3ca6facafc4c96fa9d6027b6f3b50b7c3e3a5dbf Author: Dimitry Andric AuthorDate: 2025-12-06 20:24:15 +0000 Commit: Dimitry Andric CommitDate: 2026-04-25 14:07:41 +0000 Revert "libcxx-compat: revert llvmorg-19-init-4504-g937a5396cf3e:" This reverts commit a7455c47801ea1e4c4eed10cab2072375f6f92a2, in preparation for merging llvm 21, in preparation for merging llvm 21. PR: 292067 MFC after: 1 month --- contrib/llvm-project/libcxx/include/__type_traits/is_convertible.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/contrib/llvm-project/libcxx/include/__type_traits/is_convertible.h b/contrib/llvm-project/libcxx/include/__type_traits/is_convertible.h index b378a20cedeb..baa6df94714f 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/is_convertible.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/is_convertible.h @@ -11,12 +11,6 @@ #include <__config> #include <__type_traits/integral_constant.h> -#include <__type_traits/is_array.h> -#include <__type_traits/is_function.h> -#include <__type_traits/is_void.h> -#include <__type_traits/remove_reference.h> -#include <__utility/declval.h> -#include #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC system_header