Skip to content

Commit

Permalink
Upgrade to LLVM 18.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
bstaletic committed Mar 20, 2024
1 parent b63d2e8 commit 1693a93
Show file tree
Hide file tree
Showing 238 changed files with 11,820 additions and 1,994 deletions.
16 changes: 8 additions & 8 deletions build.py
Expand Up @@ -107,7 +107,7 @@ def Exit( self ):
'issue tracker, including the entire output of this script (with --verbose) '
'and the invocation line used to run it.' )

CLANGD_VERSION = '17.0.1'
CLANGD_VERSION = '18.1.1'
CLANGD_BINARIES_ERROR_MESSAGE = (
'No prebuilt Clang {version} binaries for {platform}. '
'You\'ll have to compile Clangd {version} from source '
Expand Down Expand Up @@ -1151,30 +1151,30 @@ def GetClangdTarget():
if OnWindows():
return [
( 'clangd-{version}-win64',
'66a1e4d527b451d1e9f21183416fd53ef7f395266bbf7fd74b470ec326d19c98' ),
'e5e1daf4553bd526e92a7f56805547673c1b6384f9a2a7b106008a81cd552c37' ),
( 'clangd-{version}-win32',
'c4c351da9f528a2cfacbc669cfb656ef34791ed637aeed051274adf611f3ba5a' ) ]
'424708a5405a23fb90f8e48473fa9e6340d988ee3733ce8c73e03f9052cb0a71' ) ]
if OnMac():
if OnArm():
return [
( 'clangd-{version}-arm64-apple-darwin',
'38b0335306193cfe7978af9b2bb9dffc48406739b23f19158e7f000f910df5b0' ) ]
'1b6d1b228f70a9903a5299c74347e7767f7fdd019e97abd879b22d56d6d7de83' ) ]
return [
( 'clangd-{version}-x86_64-apple-darwin',
'e3dcbefda4a10d7e1e2f8ce8db820219d78ac48ade247048fc0c6a821105ca26' ) ]
'10bed9246718a3d8993f8ccf4fec0168d4bfe7b2bf1d04cf9a8aed5cb7d8f03c' ) ]
if OnAArch64():
return [
( 'clangd-{version}-aarch64-linux-gnu',
'a3074a5d3c955b3326881617d36438e2cf36140d8de4b5f7d98e73eda92797a8' ) ]
'5ca6d63c9822debfd2f3aa4ec2c7b61eb8f6c8391a3ee7b52051fdb089da16af' ) ]
if OnArm():
return [
None, # First list index is for 64bit archives. ARMv7 is 32bit only.
( 'clangd-{version}-armv7a-linux-gnueabihf',
'f167c13d3741ad7869a6ee57621af2cb9c2477bb300ab2fac91ea64c19f8df43' ) ]
'ee6ded7b445317cced97d0002fe944b359990f6e7d7ca09dadd3f835fce7ebbb' ) ]
if OnX86_64():
return [
( 'clangd-{version}-x86_64-unknown-linux-gnu',
'70a9cf4c9e288941f0193dbfe0ab164e1805b622c2df522ea7319dabdeae3b4c' ) ]
'128451c2689d8157189b4bb60803ca33adb75c67ce07b91b1a91ecacdfbf851f' ) ]
raise InstallationFailed(
CLANGD_BINARIES_ERROR_MESSAGE.format( version = CLANGD_VERSION,
platform = 'this system' ) )
Expand Down
6 changes: 3 additions & 3 deletions cpp/llvm/include/clang-c/BuildSystem.h
Expand Up @@ -95,7 +95,7 @@ CINDEX_LINKAGE void clang_free(void *buffer);
CINDEX_LINKAGE void clang_VirtualFileOverlay_dispose(CXVirtualFileOverlay);

/**
* Object encapsulating information about a module.map file.
* Object encapsulating information about a module.modulemap file.
*/
typedef struct CXModuleMapDescriptorImpl *CXModuleMapDescriptor;

Expand All @@ -109,15 +109,15 @@ CINDEX_LINKAGE CXModuleMapDescriptor
clang_ModuleMapDescriptor_create(unsigned options);

/**
* Sets the framework module name that the module.map describes.
* Sets the framework module name that the module.modulemap describes.
* \returns 0 for success, non-zero to indicate an error.
*/
CINDEX_LINKAGE enum CXErrorCode
clang_ModuleMapDescriptor_setFrameworkModuleName(CXModuleMapDescriptor,
const char *name);

/**
* Sets the umbrella header name that the module.map describes.
* Sets the umbrella header name that the module.modulemap describes.
* \returns 0 for success, non-zero to indicate an error.
*/
CINDEX_LINKAGE enum CXErrorCode
Expand Down
7 changes: 6 additions & 1 deletion cpp/llvm/include/clang-c/Index.h
Expand Up @@ -2136,7 +2136,11 @@ enum CXCursorKind {
*/
CXCursor_OMPErrorDirective = 305,

CXCursor_LastStmt = CXCursor_OMPErrorDirective,
/** OpenMP scope directive.
*/
CXCursor_OMPScopeDirective = 306,

CXCursor_LastStmt = CXCursor_OMPScopeDirective,

/**
* Cursor that represents the translation unit itself.
Expand Down Expand Up @@ -2976,6 +2980,7 @@ enum CXCallingConv {
CXCallingConv_AArch64VectorCall = 16,
CXCallingConv_SwiftAsync = 17,
CXCallingConv_AArch64SVEPCS = 18,
CXCallingConv_M68kRTD = 19,

CXCallingConv_Invalid = 100,
CXCallingConv_Unexposed = 200
Expand Down
16 changes: 8 additions & 8 deletions cpp/ycm/CMakeLists.txt
Expand Up @@ -30,41 +30,41 @@ if ( USE_CLANG_COMPLETER AND
NOT PATH_TO_LLVM_ROOT AND
NOT EXTERNAL_LIBCLANG_PATH )

set( CLANG_VERSION 17.0.1 )
set( CLANG_VERSION 18.1.1 )

if ( APPLE )
if ( "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "arm64" )
set( LIBCLANG_DIRNAME "libclang-${CLANG_VERSION}-arm64-apple-darwin" )
set( LIBCLANG_SHA256
"e90a409dc408214fc553e3b3df2a71f6d67fdd34d9441b6c2be1a043e9542f06" )
"04dd2ac7714e4aef14a8bb381563c753f02b6fb191d48279f9c896820c1560e9" )
else()
set( LIBCLANG_DIRNAME "libclang-${CLANG_VERSION}-x86_64-apple-darwin" )
set( LIBCLANG_SHA256
"b70786d68e71b5988fda8c7c377e301a0817ea280f425639e976a573ef266473" )
"4a7077c7aeb72c7583463449383fb69632cafc3d6cad12eae805412d572a3745" )
endif()
elseif ( WIN32 )
if( 64_BIT_PLATFORM )
set( LIBCLANG_DIRNAME "libclang-${CLANG_VERSION}-win64" )
set( LIBCLANG_SHA256
"7bbb980c2bc5a69ca1b93b8a6a671abb1ad8cab5a5b9f7fff6f7fa300fc1bf07" )
"b594a8d7cb92c14afa545668e72898bbfa29f8b280b78c57eb7d9c2a4f4e8906" )
else()
set( LIBCLANG_DIRNAME "libclang-${CLANG_VERSION}-win32" )
set( LIBCLANG_SHA256
"ef50790e2b01bfb701cd14ec315431a60da7921fc78ac893c0af0b956d6e2223" )
"243cee577e40c9844699898ba3c024c13c8f092ed6b8a5cfc3b8e386bb621134" )
endif()
elseif ( CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*)" )
set( LIBCLANG_DIRNAME "libclang-${CLANG_VERSION}-aarch64-linux-gnu" )
set( LIBCLANG_SHA256
"829e4b81d9fddd70ed8bcbeffd1feea909369434b225612148e833fb9b16265b" )
"24fbd9a37bc3de67084aa29f0d268354b07336d38673acc147e639c19944ffb2" )
elseif ( CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm.*|ARM.*)" )
set( LIBCLANG_DIRNAME "libclang-${CLANG_VERSION}-armv7a-linux-gnueabihf" )
set( LIBCLANG_SHA256
"fdc3df9ef3fe15868340bc0dcd4d0c74814edd06be1d79796b8a402db8aee723" )
"4efc43e99c455f015519effa33af8b0b4cbe622a92a6d750ce64f9233cb3b447" )
elseif ( CMAKE_SYSTEM_PROCESSOR MATCHES "^(x86_64)" )
set( LIBCLANG_DIRNAME
"libclang-${CLANG_VERSION}-x86_64-unknown-linux-gnu" )
set( LIBCLANG_SHA256
"bd1ab9ab8e8ccdb46064178bc54a45e7e980b5451cff4fa468596a414e1f7b46" )
"04f84497cef3600569a8a52f9535547babe5298ab1709a9b83c1bf5c3d3d29b1" )
else()
message( FATAL_ERROR
"No prebuilt Clang ${CLANG_VERSION} binaries for this system. "
Expand Down

0 comments on commit 1693a93

Please sign in to comment.