Date: Sat, 4 Jun 2022 12:01:20 GMT From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 3b668af44d60 - stable/13 - Merge llvm-project release/14.x llvmorg-14.0.0-2-g3f43d803382d Message-ID: <202206041201.254C1Kwp093833@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=3b668af44d601c00453753a23f5ef30ec61025a8 commit 3b668af44d601c00453753a23f5ef30ec61025a8 Author: Dimitry Andric <dim@FreeBSD.org> AuthorDate: 2022-03-29 20:16:50 +0000 Commit: Dimitry Andric <dim@FreeBSD.org> CommitDate: 2022-06-04 12:00:01 +0000 Merge llvm-project release/14.x llvmorg-14.0.0-2-g3f43d803382d This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvmorg-14.0.0-2-g3f43d803382d. PR: 261742 MFC after: 2 weeks (cherry picked from commit dbc822f3bc537e0d8350f63178397156bc163b1c) --- contrib/llvm-project/libcxx/include/span | 8 +++++++- lib/clang/include/VCSVersion.inc | 6 +++--- lib/clang/include/lld/Common/Version.inc | 2 +- lib/clang/include/llvm/Support/VCSRevision.h | 2 +- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/contrib/llvm-project/libcxx/include/span b/contrib/llvm-project/libcxx/include/span index b8dbc7e01fd6..f33569031730 100644 --- a/contrib/llvm-project/libcxx/include/span +++ b/contrib/llvm-project/libcxx/include/span @@ -622,7 +622,13 @@ template<class _Tp, size_t _Sz> template<class _Tp, size_t _Sz> span(const array<_Tp, _Sz>&) -> span<const _Tp, _Sz>; -#if !defined(_LIBCPP_HAS_NO_CONCEPTS) && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES) +#if defined(_LIBCPP_HAS_NO_CONCEPTS) || defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES) +template<class _Container> + span(_Container&) -> span<typename _Container::value_type>; + +template<class _Container> + span(const _Container&) -> span<const typename _Container::value_type>; +#else template<ranges::contiguous_range _Range> span(_Range&&) -> span<remove_reference_t<ranges::range_reference_t<_Range>>>; #endif diff --git a/lib/clang/include/VCSVersion.inc b/lib/clang/include/VCSVersion.inc index f5ca305f872e..bed489b0b0fb 100644 --- a/lib/clang/include/VCSVersion.inc +++ b/lib/clang/include/VCSVersion.inc @@ -1,10 +1,10 @@ // $FreeBSD$ -#define LLVM_REVISION "llvmorg-14.0.0-rc4-2-gadd3ab7f4c8a" +#define LLVM_REVISION "llvmorg-14.0.0-2-g3f43d803382d" #define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" -#define CLANG_REVISION "llvmorg-14.0.0-rc4-2-gadd3ab7f4c8a" +#define CLANG_REVISION "llvmorg-14.0.0-2-g3f43d803382d" #define CLANG_REPOSITORY "https://github.com/llvm/llvm-project.git" -#define LLDB_REVISION "llvmorg-14.0.0-rc4-2-gadd3ab7f4c8a" +#define LLDB_REVISION "llvmorg-14.0.0-2-g3f43d803382d" #define LLDB_REPOSITORY "https://github.com/llvm/llvm-project.git" diff --git a/lib/clang/include/lld/Common/Version.inc b/lib/clang/include/lld/Common/Version.inc index 29771a0900ff..a469435359e8 100644 --- a/lib/clang/include/lld/Common/Version.inc +++ b/lib/clang/include/lld/Common/Version.inc @@ -1,4 +1,4 @@ // Local identifier in __FreeBSD_version style #define LLD_FREEBSD_VERSION 1400003 -#define LLD_VERSION_STRING "14.0.0 (FreeBSD llvmorg-14.0.0-rc4-2-gadd3ab7f4c8a-" __XSTRING(LLD_FREEBSD_VERSION) ")" +#define LLD_VERSION_STRING "14.0.0 (FreeBSD llvmorg-14.0.0-2-g3f43d803382d-" __XSTRING(LLD_FREEBSD_VERSION) ")" diff --git a/lib/clang/include/llvm/Support/VCSRevision.h b/lib/clang/include/llvm/Support/VCSRevision.h index fd42c33018a7..5a7906b88e4d 100644 --- a/lib/clang/include/llvm/Support/VCSRevision.h +++ b/lib/clang/include/llvm/Support/VCSRevision.h @@ -1,3 +1,3 @@ /* $FreeBSD$ */ -#define LLVM_REVISION "llvmorg-14.0.0-rc4-2-gadd3ab7f4c8a" +#define LLVM_REVISION "llvmorg-14.0.0-2-g3f43d803382d" #define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202206041201.254C1Kwp093833>