Update llvmlite to be compatible with llvm-17

azure-pipelines.yml

@@ -8,20 +8,19 @@ jobs:
       py39:
         PYTHON: '3.9'
         CONDA_ENV: cienv
+        LLVM: '17'
       py310:
         PYTHON: '3.10'
         CONDA_ENV: cienv
+        LLVM: '17'
       py311:
         PYTHON: '3.11'
         CONDA_ENV: cienv
+        LLVM: '17'
       py312:
         PYTHON: '3.12'
         CONDA_ENV: cienv
-
-      llvm15:
-        PYTHON: '3.12'
-        CONDA_ENV: cienv
-        LLVM: '15'
+        LLVM: '17'
 
 - template: buildscripts/azure/azure-linux-macos.yml
   parameters:
@@ -32,20 +31,24 @@ jobs:
         PYTHON: '3.9'
         CONDA_ENV: cienv
         RUN_FLAKE8: yes
+        LLVM: '17'
       py310:
         PYTHON: '3.10'
         CONDA_ENV: cienv
         RUN_FLAKE8: yes
+        LLVM: '17'
       py311:
         PYTHON: '3.11'
         CONDA_ENV: cienv
         RUN_FLAKE8: yes
         RUN_CLANG_FORMAT: yes
+        LLVM: '17'
       py312:
         PYTHON: '3.12'
         CONDA_ENV: cienv
         RUN_FLAKE8: yes
         RUN_CLANG_FORMAT: yes
+        LLVM: '17'
 # temporarily disabled
 #       pypy:
 #         PYTHON: pypy
@@ -54,29 +57,28 @@ jobs:
         PYTHON: '3.9'
         CONDA_ENV: cienv
         WHEEL: 'yes'
+        LLVM: '17'
       py310_wheel:
         PYTHON: '3.10'
         CONDA_ENV: cienv
         WHEEL: 'yes'
+        LLVM: '17'
       py311_wheel:
         PYTHON: '3.11'
         CONDA_ENV: cienv
         WHEEL: 'yes'
+        LLVM: '17'
       py312_wheel:
         PYTHON: '3.12'
         CONDA_ENV: cienv
         WHEEL: 'yes'
+        LLVM: '17'
 
       py39_docs:
         PYTHON: '3.9'
         CONDA_ENV: cienv
         BUILD_DOCS: 'yes'
 
-      llvm15:
-        PYTHON: '3.12'
-        CONDA_ENV: cienv
-        LLVM: '15'
-
 - template: buildscripts/azure/azure-windows.yml
   parameters:
     name: Windows

buildscripts/azure/azure-windows.yml

@@ -12,20 +12,19 @@ jobs:
       py39:
         PYTHON: '3.9'
         CONDA_ENV: cienv
+        LLVM: '17'
       py310:
         PYTHON: '3.10'
         CONDA_ENV: cienv
+        LLVM: '17'
       py311:
         PYTHON: '3.11'
         CONDA_ENV: cienv
+        LLVM: '17'
       py312:
         PYTHON: '3.12'
         CONDA_ENV: cienv
-
-      llvm15:
-        PYTHON: '3.12'
-        CONDA_ENV: cienv
-        LLVM: '15'
+        LLVM: '17'
 
   steps:
 

buildscripts/incremental/build.cmd

@@ -15,9 +15,7 @@ call activate %CONDA_ENV%
 @rem - https://github.com/conda-forge/llvmdev-feedstock/issues/175
 @rem - https://github.com/conda-forge/llvmdev-feedstock/pull/223
 @rem - https://github.com/MicrosoftDocs/visualstudio-docs/issues/7774
-if "%LLVM%"=="15" (
-  call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsDevCmd.bat"
-  if %errorlevel% neq 0 exit /b %errorlevel%
-)
+call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsDevCmd.bat"
+if %errorlevel% neq 0 exit /b %errorlevel%
 
 python setup.py build

buildscripts/incremental/setup_conda_environment.cmd

@@ -14,11 +14,7 @@ call activate %CONDA_ENV%
 if %errorlevel% neq 0 exit /b %errorlevel%
 
 @rem Install llvmdev
-if "%LLVM%"=="15" (
-  set LLVMDEV_CHANNEL="conda-forge"
-) else (
-  set LLVMDEV_CHANNEL="numba/label/dev"
-)
+set LLVMDEV_CHANNEL="conda-forge"
 
 call conda install -y -q -c %LLVMDEV_CHANNEL% llvmdev="%LLVM%" libxml2
 if %errorlevel% neq 0 exit /b %errorlevel%

buildscripts/incremental/setup_conda_environment.sh

@@ -27,11 +27,7 @@ source activate $CONDA_ENV
 set -v
 
 # Install llvmdev (separate channel, for now)
-if [ "$LLVM" == "15" ]; then
-    $CONDA_INSTALL -c conda-forge llvmdev="15"
-else
-    $CONDA_INSTALL -c numba/label/dev llvmdev="14.*"
-fi
+$CONDA_INSTALL -c conda-forge llvmdev=17
 
 # Install the compiler toolchain, for osx, bootstrapping needed
 # which happens in build.sh

docs/source/conf.py

@@ -302,5 +302,5 @@
 # Example configuration for intersphinx: refer to the Python standard library.
 intersphinx_mapping = {
     'python': ('https://docs.python.org/3', None),
-    'llvm': ('http://llvm.org/releases/14.0.0/docs', None),
+    'llvm': ('http://llvm.org/releases/17.0.1/docs', None),
     }

ffi/CMakeLists.txt

@@ -6,6 +6,10 @@ project(llvmlite_ffi)
 
 include(CheckIncludeFiles)
 
+# LLVM-17 needs C++17 to compile successfully
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
 if(NOT MSVC)
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-rtti -g")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti -g")

ffi/build.py

@@ -167,13 +167,9 @@ def main_posix(kind, library_ext):
     else:
         (version, _) = out.split('.', 1)
         version = int(version)
-        if version == 15:
-            msg = ("Building with LLVM 15; note that LLVM 15 support is "
-                   "presently experimental")
-            show_warning(msg)
-        elif version != 14:
+        if version != 17:
 
-            msg = ("Building llvmlite requires LLVM 14, got "
+            msg = ("Building llvmlite requires LLVM 17, got "
                    "{!r}. Be sure to set LLVM_CONFIG to the right executable "
                    "path.\nRead the documentation at "
                    "http://llvmlite.pydata.org/ for more information about "

ffi/core.cpp

@@ -23,18 +23,12 @@ LLVMPY_DisposeString(const char *msg) { free(const_cast<char *>(msg)); }
 API_EXPORT(LLVMContextRef)
 LLVMPY_GetGlobalContext() {
     auto context = LLVMGetGlobalContext();
-#if LLVM_VERSION_MAJOR > 14
-    LLVMContextSetOpaquePointers(context, false);
-#endif
     return context;
 }
 
 API_EXPORT(LLVMContextRef)
 LLVMPY_ContextCreate() {
     LLVMContextRef context = LLVMContextCreate();
-#if LLVM_VERSION_MAJOR > 14
-    LLVMContextSetOpaquePointers(context, false);
-#endif
     return context;
 }