From nobody Mon Aug 05 19:19:52 2024 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 4Wd5qD5mH0z5SYLc; Mon, 05 Aug 2024 19:19:52 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wd5qD3YfPz52QD; Mon, 5 Aug 2024 19:19:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722885592; 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=3cGGpjhrCffLQ1TuUYYL2Oq+CUgPR5v90J7fLrCdJfI=; b=vQMFSQUGwxYAz0zUlE7qTe/EdkFJgWq8D/CqiA05TsNi3TgakHvGMPKjRKqmvwRBg43oih D+w2pOM7ur4V/PLIojCt0e2Afygv8dZTeNWZ18VuFQ4/aekjxUAbGtAmFzEQQ/K0jHapmc mMoj6JgALkkCVqeNEwFoudBGDrAx44UqcD97DUa1hGEVSAg84NvITL8DyJyfKpn1TCIX1/ CP/5re1gYHv/w+aigdIwMAPDASYmGFUpZZIPdf7jH6TbHvlu/j/3SEQNp5XOpOj+uoNW/Q VcSe0uL85CxmaHEkGxucuffnV82iRP9AfpPNYiFBEhsyZihXGey5C+6Qqzlujw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722885592; a=rsa-sha256; cv=none; b=OCLtAak0GrxWJ9voAD0SdAlDziRkjEO+k4wpLnpe27SkLfcJIIbvjfXv8VtSapjJ5WYgpx OMkVx6DwJM3+Pq4okp+GdwPhegDbW6pg3gNVep0L+e1oe+DqE5gqclSm4qlq0E2ZTwNYO5 ywwgtbzcBtsCllnaPuobqOy3mjsm4YogCXH+9/mD6fHoSYaRokiCos0y3cua+1ktZY5zfT hxdn66eEiq2gi6KTmNxX5fiGlNIeYJABweEDLGdehhMwD68pdZgZ9knvy9QK0xQUsxzhJH a7mMJY2UHaF7Ad9zv5rcBK8SnJnO2sZajlzdeHr6TgVI3SNBjGsFHLLkgvOXsQ== 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=1722885592; 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=3cGGpjhrCffLQ1TuUYYL2Oq+CUgPR5v90J7fLrCdJfI=; b=JjS8rg4Ou6jqOFho8vth54fCr6bPbbd91X0g57gxOISNesv/7Pyt6kbSKtACm/tVbvsEal XeWjp/wZSxBXRR7eesPayyG/ahb78V8M1rSfqwaZw9fJLpB3SCtPU97fdAEnqkeA54+IFI 4mEFTsZoXjwxqh8zyF9Dyh6Quh0BHy4FHO1ebaLsgHTV0atUZ8jyGFPQ6rCdEMQFwoz50F /UTRpnk3uoXP+Y8VpBq6EWTql4wOwaBVmYoV9umH3k2MV6M1IQcu6GgKhKI79Xd+STBEnf oocB9A7p+JgjAAiW4zJ6r7Bi4eaxETzMkaGqoXtp+Pc6/hT5255gRKFMfEm0dA== 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 4Wd5qD2m90zbn7; Mon, 5 Aug 2024 19:19:52 +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 475JJqxR005703; Mon, 5 Aug 2024 19:19:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 475JJqGe005700; Mon, 5 Aug 2024 19:19:52 GMT (envelope-from git) Date: Mon, 5 Aug 2024 19:19:52 GMT Message-Id: <202408051919.475JJqGe005700@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 9bc300465e48 - main - Merge commit cb7a03b41fff from llvm git (by Nikolas Klauser): 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9bc300465e48e19d794d88d0c158a2adb92c7197 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=9bc300465e48e19d794d88d0c158a2adb92c7197 commit 9bc300465e48e19d794d88d0c158a2adb92c7197 Author: John Baldwin AuthorDate: 2024-08-05 19:19:30 +0000 Commit: John Baldwin CommitDate: 2024-08-05 19:19:30 +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 --- 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; }