From nobody Sat Jun 04 12:01:20 2022 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 ECD031B568C1; Sat, 4 Jun 2022 12:01:20 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LFddD3kJDz4cC2; Sat, 4 Jun 2022 12:01:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654344080; 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=yB6/AHfN2HnEONOW2TvtVQSgHhldyBP42S0s9Daqxs0=; b=fWovfn42+J49sRD4wWPaSzuAh5StFeGsZd9d++QQ9xe00bRVz5oDuQE58G0fbauBkF8sPf MyGGEck81Q/fdzBUwXPjxwRjd/EmHvXY3uAxWojrBJUNDWYOGoy0lRmczrMXLDzmEAuwFr g/6AXN1I2FvwnKE6YaHwSKgSHHtbVJv0foGSn0DVKo0IGUCOjr+3Esg3LFuBZXj4D6wxzY uuco0SqYbhm/Tia3L4IzIzvQg7VEycd5yzx/nZu42i+ZkIXK8GOYVrJd0aCrrrSxSsGo0O OWbmI7E6c3NUL+MV+tF70irpWQg6N7TcHeZHMQhYMOAnL9ew3nt3HpxQfYF1ag== 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 486E81D53D; Sat, 4 Jun 2022 12:01:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 254C1KIo093834; Sat, 4 Jun 2022 12:01:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 254C1Kwp093833; Sat, 4 Jun 2022 12:01:20 GMT (envelope-from git) Date: Sat, 4 Jun 2022 12:01:20 GMT Message-Id: <202206041201.254C1Kwp093833@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 3b668af44d60 - stable/13 - Merge llvm-project release/14.x llvmorg-14.0.0-2-g3f43d803382d 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 3b668af44d601c00453753a23f5ef30ec61025a8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654344080; 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=yB6/AHfN2HnEONOW2TvtVQSgHhldyBP42S0s9Daqxs0=; b=YtfcMKh7zYdBdW4kpE4iSeZ42vc5MLWmsqvlPo4R8pvh8elEjR9TKejymAihMqPsfMMcEc 642oUnsNdfkbJzlmXPRgXL5F2LyESivAyuOOLI7bJQwuwJWJOxu0T+besfcf6DmlbzY709 9hUubiJ7441WPKTtSkTGTYvs695rH6AYV7OKGalWgjHMuKZHBb7YlLh5MzZuTnQdmtVV6P cN8bDuqUSu7ZaBH+a5dGx3ILynMhSpuKTSFulSRN/DYQhZZfGU3cvoXR9Ny7+3XwcTReXc 6Ipmq13HKMMb+JoD4PdZk+Kx2TG02O5mo7vHhagb+0BAu5mcwjezTpVlJ0FY7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654344080; a=rsa-sha256; cv=none; b=wZf2Attv8OuorqBMIpUAjV9Jd8rioewrYptPPLRZ5vYBEym5s0FKKwKiqchn7ngge5DAGs wVTKtd+NMzwPb0SOlgtZAvNgMU/4iHnsdrpVrEKp470tXPKE7DgIcGENIiUSS4vsELhwUN px5MVmsPdXWeJC4mLN8v3nNbea0sHtWTcXeEyGthAhSsQ2zbteouwkpuBKtIwDHidRWHf6 rUKRr3iHJysF8FE4di80VL4NPLu6PeZLhyQ3hMe6A4UntxJRXQmKJbL4tjP9uN0INZ1eqe BSV4+djyX0kZ1jBq/enSTj6sBdtZxR/Xx5ix92mRbtGKGqbaGlu1xVcpaXeQsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=3b668af44d601c00453753a23f5ef30ec61025a8 commit 3b668af44d601c00453753a23f5ef30ec61025a8 Author: Dimitry Andric AuthorDate: 2022-03-29 20:16:50 +0000 Commit: Dimitry Andric 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 template span(const array<_Tp, _Sz>&) -> span; -#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 + span(_Container&) -> span; + +template + span(const _Container&) -> span; +#else template span(_Range&&) -> span>>; #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"