From nobody Sat Nov 30 20:12:45 2024 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 4Y11SF6KkLz5fbNx; Sat, 30 Nov 2024 20:12:45 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y11SF3rJGz4Tnq; Sat, 30 Nov 2024 20:12:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732997565; 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=i3Kz8jQNv1kmmlubaehM+I238VhFNVCEreW/btcj/fs=; b=NpTAFibl4osdg8Fk9cYO+GlfsaEtNr3TZraUXQodgimJ/Y9FzET+hsCkXQlyisa75F65OU r+gQSkE7C1tC/BFvIREARQcH/tXAIp4mhLMJx4+BT5fmJkBz1kfprZ/mDXEe6BhZaUV+J4 nxus+0abZKHSQ8OE3W1Ygtk006Yk06pr2LmsNiHToWsNWfFC0874Ukf7bLVRw1Dmeqr33w qZzU+VZZFLT6h2rJWMMeKNQR9L/4J7XuYsJ+VujKPfw3Hl2iTLJs59bypglG0hNbLvXKC2 mEtHcTeE/Lde/mZ1YuteA7P5uxIowKbZfxQPvGKCSabxBg3+5bZB5WsWRnbTWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732997565; 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=i3Kz8jQNv1kmmlubaehM+I238VhFNVCEreW/btcj/fs=; b=fuRSIDmcAlS3lNltNOa1GvSvlaWcYmLvjfbhWWKR5i1KWuZArqlV9alkK5PrZfx9llh3P1 eHI1Qf1rvbYZyU6vUqM5mgDXbdGAISvg+UMHdpE3UAuAetjt9s5jvrX3k6sd9qV50/VqHP NvzpS41lyq7ax7dxkMlQNIZg6EVM2WIN5mL5vf187SCvE8aL8zdQmLuC9UwjCjRgIYZlpS XDFXoxSKS0IfiSwbn7yt4PhX3AK2h9O6jPFUyGMdcEBJZ28wZ5T9lE/Iws13rpXpzoF+u0 wdRGj4FbpjqpEynJ3pfgRIhLA/peoESzj2xfW+K07ZCmtsEGVWU+Q1B5Y3oAAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732997565; a=rsa-sha256; cv=none; b=bKmZ2iyBg8vxizf0OXzmo23cQR3i7z7Gprmm05L6W/S+WQm832YMQOti2sJOP1s8WvAYvU ni0XEtcd7BXlN2Vt4eN7SdVGB9it2YmrpXgXwxgbgK85P/ooo5yBKH5ADuETb59fM9FSl9 ZKv/gGaTTe5P0p+ii6ou2G5UZx8XmPz9jcraleAEZ2XLGVEA0SU/qcBAlftGICO+ie8PDD Yyk3sroKakyifY3/B28esYi3P4q8a7FhL6v5kJ/vq+rxDwWLaDWOEMU2oY3jobILcu9I5d fAgFZX7ZdBr5pUfrLFvPMftIn51w1LXvR+l03z8oWUly+uC/Fuc7bQUdzeZDNQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y11SF37gkzM46; Sat, 30 Nov 2024 20:12:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4AUKCj4A026533; Sat, 30 Nov 2024 20:12:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AUKCjYF026530; Sat, 30 Nov 2024 20:12:45 GMT (envelope-from git) Date: Sat, 30 Nov 2024 20:12:45 GMT Message-Id: <202411302012.4AUKCjYF026530@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: eb9ef9d7dfa1 - stable/13 - Merge commit cb7a03b41fff from llvm git (by Nikolas Klauser): 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: eb9ef9d7dfa1d8ef2a74d03cdf7169edd90ec83a Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=eb9ef9d7dfa1d8ef2a74d03cdf7169edd90ec83a commit eb9ef9d7dfa1d8ef2a74d03cdf7169edd90ec83a Author: John Baldwin AuthorDate: 2024-08-05 19:19:30 +0000 Commit: John Baldwin CommitDate: 2024-11-30 19:11:03 +0000 Merge commit cb7a03b41fff from llvm git (by Nikolas Klauser): [libc++] Fix failures with GCC 14 (#92663) Fixes #91831 Reviewed by: dim Differential Revision: https://reviews.freebsd.org/D46003 (cherry picked from commit 9bc300465e48e19d794d88d0c158a2adb92c7197) --- contrib/llvm-project/libcxx/include/__string/constexpr_c_functions.h | 2 +- contrib/llvm-project/libcxx/include/__type_traits/remove_pointer.h | 5 +++++ contrib/llvm-project/libcxx/include/bitset | 3 +++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/contrib/llvm-project/libcxx/include/__string/constexpr_c_functions.h b/contrib/llvm-project/libcxx/include/__string/constexpr_c_functions.h index 198f0f5e6809..46ad388ec2ea 100644 --- a/contrib/llvm-project/libcxx/include/__string/constexpr_c_functions.h +++ b/contrib/llvm-project/libcxx/include/__string/constexpr_c_functions.h @@ -108,7 +108,7 @@ __constexpr_memcmp_equal(const _Tp* __lhs, const _Up* __rhs, __element_count __n } return true; } else { - return __builtin_memcmp(__lhs, __rhs, __count * sizeof(_Tp)) == 0; + return ::__builtin_memcmp(__lhs, __rhs, __count * sizeof(_Tp)) == 0; } } diff --git a/contrib/llvm-project/libcxx/include/__type_traits/remove_pointer.h b/contrib/llvm-project/libcxx/include/__type_traits/remove_pointer.h index 54390a1939f7..1048f67055a2 100644 --- a/contrib/llvm-project/libcxx/include/__type_traits/remove_pointer.h +++ b/contrib/llvm-project/libcxx/include/__type_traits/remove_pointer.h @@ -23,8 +23,13 @@ struct remove_pointer { using type _LIBCPP_NODEBUG = __remove_pointer(_Tp); }; +# ifdef _LIBCPP_COMPILER_GCC +template +using __remove_pointer_t = typename remove_pointer<_Tp>::type; +# else template using __remove_pointer_t = __remove_pointer(_Tp); +# endif #else // clang-format off template struct _LIBCPP_TEMPLATE_VIS remove_pointer {typedef _LIBCPP_NODEBUG _Tp type;}; diff --git a/contrib/llvm-project/libcxx/include/bitset b/contrib/llvm-project/libcxx/include/bitset index 308c58995dc3..5ea48d491303 100644 --- a/contrib/llvm-project/libcxx/include/bitset +++ b/contrib/llvm-project/libcxx/include/bitset @@ -376,8 +376,11 @@ template _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX23 unsigned long long __bitset<_N_words, _Size>::to_ullong(true_type, true_type) const { unsigned long long __r = __first_[0]; + _LIBCPP_DIAGNOSTIC_PUSH + _LIBCPP_GCC_DIAGNOSTIC_IGNORED("-Wshift-count-overflow") for (size_t __i = 1; __i < sizeof(unsigned long long) / sizeof(__storage_type); ++__i) __r |= static_cast(__first_[__i]) << (sizeof(__storage_type) * CHAR_BIT); + _LIBCPP_DIAGNOSTIC_POP return __r; }