Skip to content

Commit 0e13fec

Browse files
authored
Merge pull request #1658 from puremourning/update-clang-15
Update to clang 15
2 parents 5f1e712 + 671fee1 commit 0e13fec

File tree

188 files changed

+16422
-14091
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

188 files changed

+16422
-14091
lines changed

CORE_VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
46
1+
47

build.py

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ def Exit( self ):
107107
'issue tracker, including the entire output of this script (with --verbose) '
108108
'and the invocation line used to run it.' )
109109

110-
CLANGD_VERSION = '14.0.0'
110+
CLANGD_VERSION = '15.0.1'
111111
CLANGD_BINARIES_ERROR_MESSAGE = (
112112
'No prebuilt Clang {version} binaries for {platform}. '
113113
'You\'ll have to compile Clangd {version} from source '
@@ -1128,36 +1128,38 @@ def GetClangdTarget():
11281128
if OnWindows():
11291129
return [
11301130
( 'clangd-{version}-win64',
1131-
'529c5b782d926536aedcb2d7a3c8a813fa05ada9193ec4119b28deb3f83634b2' ),
1131+
'e5da88a729d1c9d00c8a965bdbfdf081a9c7a1602d5cdf7cd75aacea72180195' ),
11321132
( 'clangd-{version}-win32',
1133-
'6c7f0985370ebede0f61ff66a1b4886079f199bc346c2baa941de9ad76e907a7' ) ]
1133+
'e5be596af3b4ab5f648e6a3b67bb60a3e97f6567d2b3c43a38f30158792e2641' ) ]
11341134
if OnMac():
11351135
if OnArm():
11361136
return [
11371137
( 'clangd-{version}-arm64-apple-darwin',
1138-
'6b4bed9378a9ac3d84720dbcf76e4c60b0afc27567d42d7837f9da8b039d13c5' ) ]
1138+
'7a606e37b03a795bf673116ef6c58cb888e7bd01199602bcae549c90927f124f' ) ]
11391139
return [
11401140
( 'clangd-{version}-x86_64-apple-darwin',
1141-
'867342cffc04ab3c1936121ed643e07df666119afad6518835a26306db8767ce' ) ]
1142-
if OnFreeBSD():
1143-
return [
1144-
( 'clangd-{version}-amd64-unknown-freebsd13',
1145-
'5db1f95eea87d216d7a7490c207918962cddfdee6387594f6f6043ae21dde22f' ),
1146-
( 'clangd-{version}-i386-unknown-freebsd13',
1147-
'b9f6d0be1476dfb71ee16d12639b7fe425dc90097d81fbf2bdd0cb7248338ca2' ) ]
1141+
'0be7dc9042584a84524f57d62bde0ef168b3e00a02205053cfe5f73a13475c97' ) ]
1142+
# FreeBSD binaries are not yet available for clang 15.0.1
1143+
#
1144+
# if OnFreeBSD():
1145+
# return [
1146+
# ( 'clangd-{version}-amd64-unknown-freebsd13',
1147+
# '' ),
1148+
# ( 'clangd-{version}-i386-unknown-freebsd13',
1149+
# '' ) ]
11481150
if OnAArch64():
11491151
return [
11501152
( 'clangd-{version}-aarch64-linux-gnu',
1151-
'c5e2ac2f9381f6c1bf2305af0458360160a86c8dbd369c923a71c673f391142d' ) ]
1153+
'2497705a703c0ed5b5ef8717e247b87d084729d6cae20176e0f4dc8e33fff24b' ) ]
11521154
if OnArm():
11531155
return [
11541156
None, # First list index is for 64bit archives. ARMv7 is 32bit only.
11551157
( 'clangd-{version}-armv7a-linux-gnueabihf',
1156-
'86b4582d551b8d5558b4bdd1060fbb3ec9ae4e0c7c6f9489db1a4088f5e71ef3' ) ]
1158+
'615262e7827f0ab273445390d9a0f4d841ba7fc75326483466651a846f4f5586' ) ]
11571159
if OnX86_64():
11581160
return [
11591161
( 'clangd-{version}-x86_64-unknown-linux-gnu',
1160-
'9c17b5550ba927aa3f661300b4258109d3a23aecdd97fef81185d0d0b5529d36' ) ]
1162+
'8bf1177483daf10012f4e98ae4a6eec4f737bd1b6c8823b3b9b4a670479fcf58' ) ]
11611163
raise InstallationFailed(
11621164
CLANGD_BINARIES_ERROR_MESSAGE.format( version = CLANGD_VERSION,
11631165
platform = 'this system' ) )

cpp/llvm/include/clang-c/Index.h

Lines changed: 61 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2189,7 +2189,17 @@ enum CXCursorKind {
21892189
*/
21902190
CXCursor_CXXAddrspaceCastExpr = 152,
21912191

2192-
CXCursor_LastExpr = CXCursor_CXXAddrspaceCastExpr,
2192+
/**
2193+
* Expression that references a C++20 concept.
2194+
*/
2195+
CXCursor_ConceptSpecializationExpr = 153,
2196+
2197+
/**
2198+
* Expression that references a C++20 concept.
2199+
*/
2200+
CXCursor_RequiresExpr = 154,
2201+
2202+
CXCursor_LastExpr = CXCursor_RequiresExpr,
21932203

21942204
/* Statements */
21952205
CXCursor_FirstStmt = 200,
@@ -2600,15 +2610,51 @@ enum CXCursorKind {
26002610
*/
26012611
CXCursor_OMPGenericLoopDirective = 295,
26022612

2603-
CXCursor_LastStmt = CXCursor_OMPGenericLoopDirective,
2613+
/** OpenMP teams loop directive.
2614+
*/
2615+
CXCursor_OMPTeamsGenericLoopDirective = 296,
2616+
2617+
/** OpenMP target teams loop directive.
2618+
*/
2619+
CXCursor_OMPTargetTeamsGenericLoopDirective = 297,
2620+
2621+
/** OpenMP parallel loop directive.
2622+
*/
2623+
CXCursor_OMPParallelGenericLoopDirective = 298,
2624+
2625+
/** OpenMP target parallel loop directive.
2626+
*/
2627+
CXCursor_OMPTargetParallelGenericLoopDirective = 299,
2628+
2629+
/** OpenMP parallel masked directive.
2630+
*/
2631+
CXCursor_OMPParallelMaskedDirective = 300,
2632+
2633+
/** OpenMP masked taskloop directive.
2634+
*/
2635+
CXCursor_OMPMaskedTaskLoopDirective = 301,
2636+
2637+
/** OpenMP masked taskloop simd directive.
2638+
*/
2639+
CXCursor_OMPMaskedTaskLoopSimdDirective = 302,
2640+
2641+
/** OpenMP parallel masked taskloop directive.
2642+
*/
2643+
CXCursor_OMPParallelMaskedTaskLoopDirective = 303,
2644+
2645+
/** OpenMP parallel masked taskloop simd directive.
2646+
*/
2647+
CXCursor_OMPParallelMaskedTaskLoopSimdDirective = 304,
2648+
2649+
CXCursor_LastStmt = CXCursor_OMPParallelMaskedTaskLoopSimdDirective,
26042650

26052651
/**
26062652
* Cursor that represents the translation unit itself.
26072653
*
26082654
* The translation unit cursor exists primarily to act as the root
26092655
* cursor for traversing the contents of a translation unit.
26102656
*/
2611-
CXCursor_TranslationUnit = 300,
2657+
CXCursor_TranslationUnit = 350,
26122658

26132659
/* Attributes */
26142660
CXCursor_FirstAttr = 400,
@@ -2684,8 +2730,13 @@ enum CXCursorKind {
26842730
* a friend declaration.
26852731
*/
26862732
CXCursor_FriendDecl = 603,
2733+
/**
2734+
* a concept declaration.
2735+
*/
2736+
CXCursor_ConceptDecl = 604,
2737+
26872738
CXCursor_FirstExtraDecl = CXCursor_ModuleImportDecl,
2688-
CXCursor_LastExtraDecl = CXCursor_FriendDecl,
2739+
CXCursor_LastExtraDecl = CXCursor_ConceptDecl,
26892740

26902741
/**
26912742
* A code completion overload candidate.
@@ -3401,7 +3452,8 @@ enum CXTypeKind {
34013452
CXType_OCLIntelSubgroupAVCImeDualRefStreamin = 175,
34023453

34033454
CXType_ExtVector = 176,
3404-
CXType_Atomic = 177
3455+
CXType_Atomic = 177,
3456+
CXType_BTFTagAttributed = 178
34053457
};
34063458

34073459
/**
@@ -3428,6 +3480,7 @@ enum CXCallingConv {
34283480
CXCallingConv_PreserveAll = 15,
34293481
CXCallingConv_AArch64VectorCall = 16,
34303482
CXCallingConv_SwiftAsync = 17,
3483+
CXCallingConv_AArch64SVEPCS = 18,
34313484

34323485
CXCallingConv_Invalid = 100,
34333486
CXCallingConv_Unexposed = 200
@@ -3900,7 +3953,7 @@ enum CXTypeNullabilityKind {
39003953
/**
39013954
* Generally behaves like Nullable, except when used in a block parameter that
39023955
* was imported into a swift async method. There, swift will assume that the
3903-
* parameter can get null even if no error occured. _Nullable parameters are
3956+
* parameter can get null even if no error occurred. _Nullable parameters are
39043957
* assumed to only get null on error.
39053958
*/
39063959
CXTypeNullability_NullableResult = 4
@@ -6301,7 +6354,8 @@ typedef enum {
63016354
CXIdxEntity_CXXDestructor = 23,
63026355
CXIdxEntity_CXXConversionFunction = 24,
63036356
CXIdxEntity_CXXTypeAlias = 25,
6304-
CXIdxEntity_CXXInterface = 26
6357+
CXIdxEntity_CXXInterface = 26,
6358+
CXIdxEntity_CXXConcept = 27
63056359

63066360
} CXIdxEntityKind;
63076361

cpp/ycm/CMakeLists.txt

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -30,53 +30,55 @@ if ( USE_CLANG_COMPLETER AND
3030
NOT PATH_TO_LLVM_ROOT AND
3131
NOT EXTERNAL_LIBCLANG_PATH )
3232

33-
set( CLANG_VERSION 14.0.0 )
33+
set( CLANG_VERSION 15.0.1 )
3434

3535
if ( APPLE )
3636
if ( "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "arm64" )
3737
set( LIBCLANG_DIRNAME "libclang-${CLANG_VERSION}-arm64-apple-darwin" )
3838
set( LIBCLANG_SHA256
39-
"04ed0ebe78f8128d41585dae96ba01f15e253483db6d98d361f3bb0fba5ee135" )
39+
"91d0c94cea43abe36d1fc954f78bc44dc77773fdf4680dd0958f05a8c859fcae" )
4040
else()
4141
set( LIBCLANG_DIRNAME "libclang-${CLANG_VERSION}-x86_64-apple-darwin" )
4242
set( LIBCLANG_SHA256
43-
"3f46d66cc2345f7bbf6394b16a9232bf291ab992bd7a5a4380800c92c1c409b3" )
43+
"f004735cb8bfd56a8ea3c0ed21d1c8c02127ea23ce62eda38143270650a902fe" )
4444
endif()
4545
elseif ( WIN32 )
4646
if( 64_BIT_PLATFORM )
4747
set( LIBCLANG_DIRNAME "libclang-${CLANG_VERSION}-win64" )
4848
set( LIBCLANG_SHA256
49-
"22b1497fb261b402761c3a0fd7cb59badda0e99156a8661d44953939e123c0c4" )
49+
"6e3196a4b92b5313898e51745c51d95410efd08fb2f1fabeba7205537ef7fed8" )
5050
else()
5151
set( LIBCLANG_DIRNAME "libclang-${CLANG_VERSION}-win32" )
5252
set( LIBCLANG_SHA256
53-
"74cd1a0de17877c6d291979ddfc696969a0aa1c3b47122396f61c0e9286a3a9d" )
53+
"3e0f81aeb47ad1f748abc51a5b37cdb5086a9aaac03955c1fdd0930b41887e11" )
5454
endif()
55-
elseif ( SYSTEM_IS_FREEBSD )
56-
if ( 64_BIT_PLATFORM )
57-
set( LIBCLANG_DIRNAME
58-
"libclang-${CLANG_VERSION}-amd64-unknown-freebsd13" )
59-
set( LIBCLANG_SHA256
60-
"6efd6cc111939766dde6873fbd371280c13ffbb3c7fae193d5f66bd988ccf440" )
61-
else()
62-
set( LIBCLANG_DIRNAME
63-
"libclang-${CLANG_VERSION}-i386-unknown-freebsd13" )
64-
set( LIBCLANG_SHA256
65-
"0d3e808e04d4ebb6023402310316799b6c9c4220763fd13d7691dc24969ce4c4" )
66-
endif()
55+
# FreeBSD binaries are not yet available for llvm 15.0,1
56+
#
57+
# elseif ( SYSTEM_IS_FREEBSD )
58+
# if ( 64_BIT_PLATFORM )
59+
# set( LIBCLANG_DIRNAME
60+
# "libclang-${CLANG_VERSION}-amd64-unknown-freebsd13" )
61+
# set( LIBCLANG_SHA256
62+
# "" )
63+
# else()
64+
# set( LIBCLANG_DIRNAME
65+
# "libclang-${CLANG_VERSION}-i386-unknown-freebsd13" )
66+
# set( LIBCLANG_SHA256
67+
# "" )
68+
# endif()
6769
elseif ( CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*)" )
6870
set( LIBCLANG_DIRNAME "libclang-${CLANG_VERSION}-aarch64-linux-gnu" )
6971
set( LIBCLANG_SHA256
70-
"e11048e3fceaba016a4521c2138166a006abaa5c4eba23e4b2f2b354e81a130b" )
72+
"294ffae61aab3198dc26b8cb891475ab4c08ab4e20f826c687260730350a3eaf" )
7173
elseif ( CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm.*|ARM.*)" )
7274
set( LIBCLANG_DIRNAME "libclang-${CLANG_VERSION}-armv7a-linux-gnueabihf" )
7375
set( LIBCLANG_SHA256
74-
"321fd6679a5776c6f5df6169343032ac4b300aac8228e232c23067fdbcbbb7cb" )
76+
"e8ebe03b6fc558699f8ce389dd3693a9ac8cf4170b436cc0123fd923eba057d6" )
7577
elseif ( CMAKE_SYSTEM_PROCESSOR MATCHES "^(x86_64)" )
7678
set( LIBCLANG_DIRNAME
7779
"libclang-${CLANG_VERSION}-x86_64-unknown-linux-gnu" )
7880
set( LIBCLANG_SHA256
79-
"a5b70d17102484cd4b5dbd1d63206bd0a41b130359428a0b2d7817eba768e3f4" )
81+
"89e8fdb6e7b694226405c6c2b8f5ef26f7683b4328bca7d7e611314189a75aa9" )
8082
else()
8183
message( FATAL_ERROR
8284
"No prebuilt Clang ${CLANG_VERSION} binaries for this system. "

0 commit comments

Comments
 (0)