From nobody Sat Nov 30 18:44:47 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 4Y0zVl2LPrz5fTWR; Sat, 30 Nov 2024 18:44:47 +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 4Y0zVl1V4zz4Cbk; Sat, 30 Nov 2024 18:44:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732992287; 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=bqJlBGZDKbR4Ajc9Fw3JUaMMkE2IoacClau5rvScKB0=; b=wj1ywcee1+kCz0J7j0v1ikm/AH3zQrNviceRSjdIIK0cjom/ZIVSZmDHC7mbndCd2z259R 1SdWjl+7jATYwN52PUc2kdN8s+lV5jC2ETZl1l8NpTfbrZrOSibVbBcU6qQPIoZg80RBfx oHWK8mWGBZcS+NmtjlXimVIqDX37nNDEbOt3w9xbpXqitnEji0f4LrYB4DAi5Uk54NjylV sIQfyHNUxBd2IrU4SCGK7N6bJm8t0QjaXMgUSnGSYVugv7H1bYJcvK9WSOfjSbjmC8BAZu kX/Tx39xcvdZgXf0dlob6tGlJIFwaMBCXSeXH/LQvjBWKSlaZdfwjMN7Ir1mbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732992287; 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=bqJlBGZDKbR4Ajc9Fw3JUaMMkE2IoacClau5rvScKB0=; b=SpwsFqxJUineObY6Nj/3oFpF6rSAY8l8rvAdI/m45avFmTR+kYMl2AYBF1Gz9TsIAU3JXw c1claIwLeOthQHoLBLQX5W2PD+R221QoPebZXrocNMX99ocId8osmXX1ssEANmiR+OZZTL 5XLmqFKtIEWmDPxb8t43RNylzng2ld2qmtUIJyP1vZSQMYQJ+DQQTZkozon/0NdVdsgz7M y3fzYi2tMXqutUulPeCVX0nUnO9p5FHW5zM98SMEu2n40c2LtnoW6Mhqs9uf3cL86v46uQ sCe9k0YOJ+VPCjPCDEMwOMBICYeozA7wysd0hSKoiqGs2P2CV2cTwWoaNj8BnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732992287; a=rsa-sha256; cv=none; b=ccUvwdQ4fjGvVft4Z7m8viMhAQHZ2P19kfR9uiIQJ5J8mbpGH62CPc2fhFysBZ5kvPa5tR e+hlGaKqC9l/COZ0kaXZDNemIVpKdhAf7jA7WJJmpU82BBaCEhu6N4FYQL0NwarhG3zfLx DKTLRC2CRocgP2z6XhgjAlVjzRhiwi4K37dd1aanwT29TovU5d08Eu3IvjiP4HJY60mDj8 h77xx9/bTmkzYbFOLibAiU9RKxQljf/XymWaRsqqsP7R8kq693UpPaRksWIEwx2wVWIrKc TDy8VqDXoI1tdSXRxM6itaHy+xKdRJsO/Zy7AL4asymVZd5pAC5ABOOZn6tF3w== 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 4Y0zVl15S4zKFG; Sat, 30 Nov 2024 18:44:47 +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 4AUIilXQ058256; Sat, 30 Nov 2024 18:44:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AUIilrn058253; Sat, 30 Nov 2024 18:44:47 GMT (envelope-from git) Date: Sat, 30 Nov 2024 18:44:47 GMT Message-Id: <202411301844.4AUIilrn058253@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: 904a91a90445 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 904a91a90445e4c710046f59b375a169b7b54fad Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=904a91a90445e4c710046f59b375a169b7b54fad commit 904a91a90445e4c710046f59b375a169b7b54fad Author: John Baldwin AuthorDate: 2024-08-05 19:19:30 +0000 Commit: John Baldwin CommitDate: 2024-11-30 18:03:18 +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; }