[wip] Add support for llvm 22

.github/actions/Build_LLVM/action.yml

@@ -43,14 +43,10 @@ runs:
           ninja LLVMOrcDebugging -j ${{ env.ncpus }}
           ninja clingInterpreter -j ${{ env.ncpus }}
         else
-          if [[ "${{ matrix.oop-jit }}" == "On" ]]; then
-            git apply -v ../patches/llvm/clang20-1-out-of-process.patch
-            echo "Apply clang20-1-out-of-process.patch:"
-          fi
           cd build
           cmake -DLLVM_ENABLE_PROJECTS="${{ matrix.llvm_enable_projects}}" \
                 -DLLVM_TARGETS_TO_BUILD="${{ matrix.llvm_targets_to_build }}"  \
-                -DCMAKE_BUILD_TYPE=Release                          \
+                -DCMAKE_BUILD_TYPE=Release                       \
                 -DLLVM_ENABLE_ASSERTIONS=ON                         \
                 -DCLANG_ENABLE_STATIC_ANALYZER=OFF                  \
                 -DCLANG_ENABLE_ARCMT=OFF                            \

.github/actions/Build_and_Test_CppInterOp/action.yml

@@ -60,7 +60,7 @@ runs:
           os="${{ matrix.os }}"
           if [[ "${os}" != "macos"* && "${{ matrix.Valgrind }}" == "On" ]]; then
             CLANG_VERSION="${{ matrix.clang-runtime }}"
-            if [[ "$CLANG_VERSION" == "20" && "${{ matrix.cling }}" == "Off" ]]; then
+            if [[ "${{ matrix.oop }}" == "On" ]]; then
               SUPPRESSION_FILE="../etc/clang${CLANG_VERSION}-valgrind.supp"
               valgrind --show-error-list=yes --track-origins=yes --error-exitcode=1 \
                 --show-leak-kinds=definite,possible \

.github/workflows/main.yml

@@ -23,35 +23,35 @@ jobs:
       matrix:
         include:
           # Ubuntu Arm Jobs
-          - name: ubu24-arm-gcc12-clang-repl-21
+          - name: ubu24-arm-gcc12-clang-repl-22
             os: ubuntu-24.04-arm
             compiler: gcc-12
-            clang-runtime: '21'
+            clang-runtime: '22'
             cling: Off
             cppyy: On
             llvm_enable_projects: "clang"
             llvm_targets_to_build: "host;NVPTX"
             Valgrind: On
-          - name: ubu24-arm-gcc12-clang-repl-20
+          - name: ubu24-arm-gcc12-clang-repl-21
             os: ubuntu-24.04-arm
             compiler: gcc-12
-            clang-runtime: '20'
+            clang-runtime: '21'
             cling: Off
             cppyy: On
             llvm_enable_projects: "clang"
             llvm_targets_to_build: "host;NVPTX"
-          - name: ubu24-arm-gcc12-clang-repl-19-cppyy
+          - name: ubu24-arm-gcc12-clang-repl-20
             os: ubuntu-24.04-arm
             compiler: gcc-12
-            clang-runtime: '19'
+            clang-runtime: '20'
             cling: Off
-            cppyy: On
+            cppyy: Off
             llvm_enable_projects: "clang"
             llvm_targets_to_build: "host;NVPTX"
-          - name: ubu24-arm-gcc12-clang-repl-18
+          - name: ubu24-arm-gcc12-clang-repl-19-cppyy
             os: ubuntu-24.04-arm
             compiler: gcc-12
-            clang-runtime: '18'
+            clang-runtime: '19'
             cling: Off
             cppyy: Off
             llvm_enable_projects: "clang"
@@ -66,56 +66,56 @@ jobs:
             llvm_enable_projects: "clang"
             llvm_targets_to_build: "host;NVPTX"
           # Ubuntu X86 Jobs
-          - name: ubu24-x86-gcc12-clang-repl-21
+          - name: ubu24-x86-gcc12-clang-repl-22-out-of-process
             os: ubuntu-24.04
             compiler: gcc-12
-            clang-runtime: '21'
+            clang-runtime: '22'
             cling: Off
-            cppyy: On
-            llvm_enable_projects: "clang"
+            cppyy: Off
+            llvm_enable_projects: "clang;compiler-rt"
             llvm_targets_to_build: "host;NVPTX"
+            oop-jit: On
+            coverage: true
             Valgrind: On
-          - name: ubu24-x86-gcc12-clang-repl-20
+          - name: ubu24-x86-gcc12-clang-repl-22-out-of-process-coverage
             os: ubuntu-24.04
             compiler: gcc-12
-            clang-runtime: '20'
+            clang-runtime: '22'
             cling: Off
-            cppyy: On
-            llvm_enable_projects: "clang"
+            cppyy: Off
+            llvm_enable_projects: "clang;compiler-rt"
             llvm_targets_to_build: "host;NVPTX"
-          - name: ubu24-x86-gcc12-clang-repl-20-out-of-process
+            oop-jit: On
+            coverage: true
+          - name: ubu24-x86-gcc12-clang-repl-22
             os: ubuntu-24.04
             compiler: gcc-12
-            clang-runtime: '20'
+            clang-runtime: '22'
             cling: Off
             cppyy: Off
-            llvm_enable_projects: "clang;compiler-rt"
+            llvm_enable_projects: "clang"
             llvm_targets_to_build: "host;NVPTX"
-            oop-jit: On
-            coverage: true
             Valgrind: On
-          - name: ubu24-x86-gcc12-clang-repl-20-out-of-process-coverage
+          - name: ubu24-x86-gcc12-clang-repl-21
             os: ubuntu-24.04
             compiler: gcc-12
-            clang-runtime: '20'
+            clang-runtime: '21'
             cling: Off
             cppyy: Off
-            llvm_enable_projects: "clang;compiler-rt"
+            llvm_enable_projects: "clang"
             llvm_targets_to_build: "host;NVPTX"
-            oop-jit: On
-            coverage: true
-          - name: ubu24-x86-gcc12-clang-repl-19-cppyy
+          - name: ubu24-x86-gcc12-clang-repl-20
             os: ubuntu-24.04
             compiler: gcc-12
-            clang-runtime: '19'
+            clang-runtime: '20'
             cling: Off
-            cppyy: On
+            cppyy: Off
             llvm_enable_projects: "clang"
             llvm_targets_to_build: "host;NVPTX"
-          - name: ubu24-x86-gcc12-clang-repl-18
+          - name: ubu24-x86-gcc12-clang-repl-19-cppyy
             os: ubuntu-24.04
             compiler: gcc-12
-            clang-runtime: '18'
+            clang-runtime: '19'
             cling: Off
             cppyy: Off
             llvm_enable_projects: "clang"
@@ -130,43 +130,43 @@ jobs:
             llvm_enable_projects: "clang"
             llvm_targets_to_build: "host;NVPTX"
           # MacOS Arm Jobs
-          - name: osx26-arm-clang-clang-repl-21
+          - name: osx26-arm-clang-clang-repl-22-out-of-process
             os: macos-26
             compiler: clang
-            clang-runtime: '21'
+            clang-runtime: '22'
             cling: Off
-            cppyy: On
-            llvm_enable_projects: "clang"
+            cppyy: Off
+            llvm_enable_projects: "clang;compiler-rt"
             llvm_targets_to_build: "host"
-          - name: osx26-arm-clang-clang-repl-20-out-of-process
+            oop-jit: On
+          - name: osx26-arm-clang-clang-repl-22
             os: macos-26
             compiler: clang
-            clang-runtime: '20'
+            clang-runtime: '22'
             cling: Off
             cppyy: Off
-            llvm_enable_projects: "clang;compiler-rt"
+            llvm_enable_projects: "clang"
             llvm_targets_to_build: "host"
-            oop-jit: On
-          - name: osx26-arm-clang-clang-repl-20
+          - name: osx26-arm-clang-clang-repl-21
             os: macos-26
             compiler: clang
-            clang-runtime: '20'
+            clang-runtime: '21'
             cling: Off
             cppyy: On
             llvm_enable_projects: "clang"
             llvm_targets_to_build: "host"
-          - name: osx26-arm-clang-clang-repl-19-cppyy
+          - name: osx26-arm-clang-clang-repl-20
             os: macos-26
             compiler: clang
-            clang-runtime: '19'
+            clang-runtime: '20'
             cling: Off
-            cppyy: On
+            cppyy: Off
             llvm_enable_projects: "clang"
             llvm_targets_to_build: "host"
-          - name: osx26-arm-clang-clang-repl-18
+          - name: osx26-arm-clang-clang-repl-19-cppyy
             os: macos-26
             compiler: clang
-            clang-runtime: '18'
+            clang-runtime: '19'
             cling: Off
             cppyy: Off
             llvm_enable_projects: "clang"
@@ -181,6 +181,14 @@ jobs:
             llvm_enable_projects: "clang"
             llvm_targets_to_build: "host;NVPTX"
           # MacOS X86 Jobs
+          - name: osx15-x86-clang-clang-repl-22
+            os: macos-15-intel
+            compiler: clang
+            clang-runtime: '22'
+            cling: Off
+            cppyy: Off
+            llvm_enable_projects: "clang"
+            llvm_targets_to_build: "host"
           - name: osx15-x86-clang-clang-repl-21
             os: macos-15-intel
             compiler: clang
@@ -205,14 +213,6 @@ jobs:
             cppyy: On
             llvm_enable_projects: "clang"
             llvm_targets_to_build: "host"
-          - name: osx15-x86-clang-clang-repl-18
-            os: macos-15-intel
-            compiler: clang
-            clang-runtime: '18'
-            cling: Off
-            cppyy: Off
-            llvm_enable_projects: "clang"
-            llvm_targets_to_build: "host"
           - name: osx15-x86-clang-clang18-cling-cppyy
             os: macos-15-intel
             compiler: clang
@@ -223,10 +223,10 @@ jobs:
             llvm_enable_projects: "clang"
             llvm_targets_to_build: "host;NVPTX"
           # Windows Arm Jobs
-          - name: win11-msvc-clang-repl-21
+          - name: win11-msvc-clang-repl-22
             os: windows-11-arm
             compiler: msvc
-            clang-runtime: '21'
+            clang-runtime: '22'
             cling: Off
             llvm_enable_projects: "clang"
             llvm_targets_to_build: "host;NVPTX"
@@ -239,10 +239,10 @@ jobs:
             llvm_enable_projects: "clang"
             llvm_targets_to_build: "host;NVPTX"
           # Windows X86 Jobs
-          - name: win2025-msvc-clang-repl-21
+          - name: win2025-msvc-clang-repl-22
             os: windows-2025
             compiler: msvc
-            clang-runtime: '21'
+            clang-runtime: '22'
             cling: Off
             llvm_enable_projects: "clang"
             llvm_targets_to_build: "host;NVPTX"
@@ -291,15 +291,6 @@ jobs:
       with:
         cache-hit: ${{ steps.cache.outputs.cache-hit }}
 
-    - name: Cache LLVM-${{ matrix.clang-runtime }} and ${{ matrix.cling == 'On' && 'Cling' || 'Clang-REPL' }} build
-      uses: actions/cache/save@v4
-      if: ${{ steps.cache.outputs.cache-hit != 'true' }}
-      with:
-        path: |
-          llvm-project
-          ${{ matrix.cling=='On' && 'cling' || '' }}
-        key: ${{ steps.cache.outputs.cache-primary-key }}
-
     - name: Setup code coverage
       if: ${{ success() && (matrix.coverage == true) }}
       run: |
@@ -347,6 +338,3 @@ jobs:
       uses: mxschmitt/action-tmate@v3
       # When debugging increase to a suitable value!
       timeout-minutes: 30
-
-
-

CMakeLists.txt

@@ -70,15 +70,15 @@ if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR )
 include(GNUInstallDirs)
   ## Define supported version of clang and llvm
 
-  set(CLANG_MIN_SUPPORTED 18.0)
-  set(CLANG_MAX_SUPPORTED "21.1.x")
-  set(CLANG_VERSION_UPPER_BOUND 22.0.0)
-  set(LLD_MIN_SUPPORTED 18.0)
-  set(LLD_MAX_SUPPORTED "21.1.x")
-  set(LLD_VERSION_UPPER_BOUND 22.0.0)
-  set(LLVM_MIN_SUPPORTED 18.0)
-  set(LLVM_MAX_SUPPORTED "21.1.x")
-  set(LLVM_VERSION_UPPER_BOUND 22.0.0)
+  set(CLANG_MIN_SUPPORTED 19.0)
+  set(CLANG_MAX_SUPPORTED "22.1.x")
+  set(CLANG_VERSION_UPPER_BOUND 23.0.0)
+  set(LLD_MIN_SUPPORTED 19.0)
+  set(LLD_MAX_SUPPORTED "22.1.x")
+  set(LLD_VERSION_UPPER_BOUND 23.0.0)
+  set(LLVM_MIN_SUPPORTED 19.0)
+  set(LLVM_MAX_SUPPORTED "22.1.x")
+  set(LLVM_VERSION_UPPER_BOUND 23.0.0)
 
   ## Set Cmake packages search order
 

lib/CppInterOp/CXCppInterOp.cpp

@@ -184,8 +184,10 @@ CXTypeKind cxtype_GetTypeKind(QualType T) {
     TKCASE(Vector);
     TKCASE(ExtVector);
     TKCASE(MemberPointer);
-    TKCASE(Auto);
+    TKCASE(Auto);    
+#if CLANG_VERSION_MAJOR < 22
     TKCASE(Elaborated);
+#endif
     TKCASE(Pipe);
     TKCASE(Attributed);
     TKCASE(BTFTagAttributed);