Upgrade CppInterOp to support llvm 20

.github/workflows/MacOS-arm.yml

@@ -22,6 +22,13 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          - name: osx15-arm-clang-clang-repl-20
+            os: macos-15
+            compiler: clang
+            clang-runtime: '20'
+            cling: Off
+            llvm_enable_projects: "clang"
+            llvm_targets_to_build: "host"
           - name: osx15-arm-clang-clang-repl-19
             os: macos-15
             compiler: clang
@@ -252,6 +259,12 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          - name: osx15-arm-clang-clang-repl-20
+            os: macos-15
+            compiler: clang
+            clang-runtime: '20'
+            cling: Off
+            cppyy: Off
           - name: osx15-arm-clang-clang-repl-19-cppyy
             os: macos-15
             compiler: clang

.github/workflows/MacOS.yml

@@ -22,6 +22,13 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          - name: osx13-x86-clang-clang-repl-20
+            os: macos-13
+            compiler: clang
+            clang-runtime: '20'
+            cling: Off
+            llvm_enable_projects: "clang"
+            llvm_targets_to_build: "host"
           - name: osx13-x86-clang-clang-repl-19
             os: macos-13
             compiler: clang
@@ -236,6 +243,12 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          - name: osx13-x86-clang-clang-repl-20
+            os: macos-13
+            compiler: clang
+            clang-runtime: '20'
+            cling: Off
+            cppyy: Off
           - name: osx13-x86-clang-clang-repl-19-cppyy
             os: macos-13
             compiler: clang

.github/workflows/Ubuntu-arm.yml

@@ -22,6 +22,13 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          - name: ubu24-arm-gcc12-clang-repl-20
+            os: ubuntu-24.04-arm
+            compiler: gcc-12
+            clang-runtime: '20'
+            cling: Off
+            llvm_enable_projects: "clang"
+            llvm_targets_to_build: "host;NVPTX"
           - name: ubu24-arm-gcc12-clang-repl-19
             os: ubuntu-24.04-arm
             compiler: gcc-12
@@ -240,6 +247,12 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          - name: ubu24-arm-gcc12-clang-repl-20
+            os: ubuntu-24.04-arm
+            compiler: gcc-12
+            clang-runtime: '20'
+            cling: Off
+            cppyy: Off
           - name: ubu24-arm-gcc12-clang-repl-19-cppyy
             os: ubuntu-24.04-arm
             compiler: gcc-12

.github/workflows/Ubuntu.yml

@@ -22,6 +22,13 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          - name: ubu24-x86-gcc12-clang-repl-20
+            os: ubuntu-24.04
+            compiler: gcc-12
+            clang-runtime: '20'
+            cling: Off
+            llvm_enable_projects: "clang"
+            llvm_targets_to_build: "host;NVPTX"
           - name: ubu24-x86-gcc12-clang-repl-19
             os: ubuntu-24.04
             compiler: gcc-12
@@ -240,6 +247,12 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          - name: ubu24-x86-gcc12-clang-repl-20
+            os: ubuntu-24.04
+            compiler: gcc-12
+            clang-runtime: '20'
+            cling: Off
+            cppyy: Off
           - name: ubu24-x86-gcc12-clang-repl-19-cppyy
             os: ubuntu-24.04
             compiler: gcc-12

.github/workflows/Windows-arm.yml

@@ -21,10 +21,10 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - name: win11-msvc-clang-repl-19
+          - name: win11-msvc-clang-repl-20
             os: windows-11-arm
             compiler: msvc
-            clang-runtime: '19'
+            clang-runtime: '20'
             cling: Off
             llvm_enable_projects: "clang"
             llvm_targets_to_build: "host;NVPTX"
@@ -225,10 +225,10 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - name: win11-msvc-clang-repl-19
+          - name: win11-msvc-clang-repl-20
             os: windows-11-arm
             compiler: msvc
-            clang-runtime: '19'
+            clang-runtime: '20'
             cling: Off
             cppyy: Off
 

.github/workflows/Windows.yml

@@ -21,10 +21,10 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - name: win2025-msvc-clang-repl-19
+          - name: win2025-msvc-clang-repl-20
             os: windows-2025
             compiler: msvc
-            clang-runtime: '19'
+            clang-runtime: '20'
             cling: Off
             llvm_enable_projects: "clang"
             llvm_targets_to_build: "host;NVPTX"
@@ -225,10 +225,10 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - name: win2025-msvc-clang-repl-19
+          - name: win2025-msvc-clang-repl-20
             os: windows-2025
             compiler: msvc
-            clang-runtime: '19'
+            clang-runtime: '20'
             cling: Off
             cppyy: Off
 

.github/workflows/deploy-pages.yml

@@ -21,9 +21,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - name: osx15-arm-clang-repl-19-emscripten_wasm
+          - name: osx15-arm-clang-repl-20-emscripten_wasm
             os: macos-15
-            clang-runtime: '19'
+            clang-runtime: '20'
             cling: Off
             micromamba_shell_init: bash
             emsdk_ver: "3.1.73"

.github/workflows/emscripten.yml

@@ -49,6 +49,34 @@ jobs:
             llvm_enable_projects: "clang;lld"
             llvm_targets_to_build: "WebAssembly"
             emsdk_ver: "3.1.73"
+          - name: ubu24-arm-clang-repl-20-emscripten
+            os: ubuntu-24.04-arm
+            clang-runtime: '20'
+            cling: Off
+            llvm_enable_projects: "clang;lld"
+            llvm_targets_to_build: "WebAssembly"
+            emsdk_ver: "3.1.73"
+          - name: osx15-arm-clang-repl-20-emscripten
+            os: macos-15
+            clang-runtime: '20'
+            cling: Off
+            llvm_enable_projects: "clang;lld"
+            llvm_targets_to_build: "WebAssembly"
+            emsdk_ver: "3.1.73"
+          - name: ubu24-x86-clang-repl-20-emscripten
+            os: ubuntu-24.04
+            clang-runtime: '20'
+            cling: Off
+            llvm_enable_projects: "clang;lld"
+            llvm_targets_to_build: "WebAssembly"
+            emsdk_ver: "3.1.73"
+          - name: win2025-x86-clang-repl-20-emscripten
+            os: windows-2025
+            clang-runtime: '20'
+            cling: Off
+            llvm_enable_projects: "clang;lld"
+            llvm_targets_to_build: "WebAssembly"
+            emsdk_ver: "3.1.73"
 
     steps:
     - uses: actions/checkout@v4
@@ -220,7 +248,7 @@ jobs:
         else
           # Apply patches
           llvm_vers=$(echo "${{ matrix.clang-runtime }}" | tr '[:lower:]' '[:upper:]')
-          if [[ "${llvm_vers}" == "19" ]]; then
+          if [[ "${llvm_vers}" == "19" || "${llvm_vers}" == "20" ]]; then
             git apply -v ../patches/llvm/emscripten-clang${{ matrix.clang-runtime }}-*.patch
             echo "Apply emscripten-clang${{ matrix.clang-runtime }}-*.patch patches:"
           fi
@@ -329,6 +357,12 @@ jobs:
             git apply -v emscripten-clang19-2-shift-temporary-files-to-tmp-dir.patch
             git apply -v emscripten-clang19-3-remove-zdefs.patch
           }
+          elseif ( "${{ matrix.clang-runtime }}" -imatch "20" )
+          {
+            git apply -v Windows-emscripten-clang20-1-CrossCompile.patch
+            git apply -v emscripten-clang20-2-shift-temporary-files-to-tmp-dir.patch
+            git apply -v emscripten-clang20-3-wasm-ld.patch
+          }
           cd build
           echo "Apply clang${{ matrix.clang-runtime }}-*.patch patches:"
           emcmake cmake -DCMAKE_BUILD_TYPE=Release `
@@ -414,6 +448,30 @@ jobs:
             cling: Off
             micromamba_shell_init: powershell
             emsdk_ver: "3.1.73"
+          - name: ubu24-x86-clang-repl-20-emscripten_wasm
+            os: ubuntu-24.04
+            clang-runtime: '20'
+            cling: Off
+            micromamba_shell_init: bash
+            emsdk_ver: "3.1.73"
+          - name: osx15-arm-clang-repl-20-emscripten_wasm
+            os: macos-15
+            clang-runtime: '20'
+            cling: Off
+            micromamba_shell_init: bash
+            emsdk_ver: "3.1.73"
+          - name: ubu24-arm-clang-repl-20-emscripten_wasm
+            os: ubuntu-24.04-arm
+            clang-runtime: '20'
+            cling: Off
+            micromamba_shell_init: bash
+            emsdk_ver: "3.1.73"
+          - name: win2025-x86-clang-repl-20-emscripten
+            os: windows-2025
+            clang-runtime: '20'
+            cling: Off
+            micromamba_shell_init: powershell
+            emsdk_ver: "3.1.73"
 
     steps:
     - uses: actions/checkout@v4

CMakeLists.txt

@@ -68,14 +68,14 @@ include(GNUInstallDirs)
   ## Define supported version of clang and llvm
 
   set(CLANG_MIN_SUPPORTED 13.0)
-  set(CLANG_MAX_SUPPORTED "19.1.x")
-  set(CLANG_VERSION_UPPER_BOUND 20.0.0)
+  set(CLANG_MAX_SUPPORTED "20.1.x")
+  set(CLANG_VERSION_UPPER_BOUND 21.0.0)
   set(LLD_MIN_SUPPORTED 13.0)
-  set(LLD_MAX_SUPPORTED "19.1.x")
-  set(LLD_VERSION_UPPER_BOUND 20.0.0)
+  set(LLD_MAX_SUPPORTED "20.1.x")
+  set(LLD_VERSION_UPPER_BOUND 21.0.0)
   set(LLVM_MIN_SUPPORTED 13.0)
-  set(LLVM_MAX_SUPPORTED "19.1.x")
-  set(LLVM_VERSION_UPPER_BOUND 20.0.0)
+  set(LLVM_MAX_SUPPORTED "20.1.x")
+  set(LLVM_VERSION_UPPER_BOUND 21.0.0)
 
   ## Set Cmake packages search order
 

Emscripten-build-instructions.md

@@ -42,12 +42,11 @@ $env:PWD_DIR= $PWD.Path
 $env:SYSROOT_PATH="$env:EMSDK/upstream/emscripten/cache/sysroot"
 ```
 
-Now clone the 19.x release of the LLVM project repository and CppInterOp (the building of the emscripten version of llvm can be
+Now clone the 20.x release of the LLVM project repository and CppInterOp (the building of the emscripten version of llvm can be
 avoided by executing micromamba install llvm -c <https://repo.mamba.pm/emscripten-forge> and setting the LLVM_BUILD_DIR/$env:LLVM_BUILD_DIR appropriately)
 
-
 ```bash
-git clone --depth=1 --branch release/19.x https://github.com/llvm/llvm-project.git
+git clone --depth=1 --branch release/20.x https://github.com/llvm/llvm-project.git
 git clone --depth=1 https://github.com/compiler-research/CppInterOp.git
 ```
 
@@ -56,7 +55,7 @@ executing
 
 ```bash
 cd ./llvm-project/
-git apply -v ../CppInterOp/patches/llvm/emscripten-clang19-*.patch
+git apply -v ../CppInterOp/patches/llvm/emscripten-clang20-*.patch
 ```
 
 On Windows execute the following
@@ -65,9 +64,9 @@ On Windows execute the following
 cd .\llvm-project\
 cp -r ..\patches\llvm\emscripten-clang${{ matrix.clang-runtime }}*
 cp -r ..\patches\llvm\Windows-emscripten-clang${{ matrix.clang-runtime }}*
-git apply -v Windows-emscripten-clang19-1-CrossCompile.patch
-git apply -v emscripten-clang19-2-shift-temporary-files-to-tmp-dir.patch
-git apply -v emscripten-clang19-3-remove-zdefs.patch
+git apply -v Windows-emscripten-clang20-1-CrossCompile.patch
+git apply -v emscripten-clang20-2-shift-temporary-files-to-tmp-dir.patch
+git apply -v emscripten-clang20-3-wasm-ld.patch
 ```
 
 We are now in a position to build an emscripten build of llvm by executing the following on Linux

README.md

@@ -115,10 +115,10 @@ git clone --depth=1 https://github.com/compiler-research/cppyy-backend.git
 
 #### Setup Clang-REPL
 
-Clone the 19.x release of the LLVM project repository.
+Clone the 20.x release of the LLVM project repository.
 
 ```bash
-git clone --depth=1 --branch release/19.x https://github.com/llvm/llvm-project.git
+git clone --depth=1 --branch release/20.x https://github.com/llvm/llvm-project.git
 cd llvm-project
 ```
 

docs/DevelopersDocumentation.rst

@@ -34,11 +34,11 @@ library
  Setup Clang-REPL
 ******************
 
-Clone the 19.x release of the LLVM project repository.
+Clone the 20.x release of the LLVM project repository.
 
 .. code:: bash
 
-   git clone --depth=1 --branch release/19.x https://github.com/llvm/llvm-project.git
+   git clone --depth=1 --branch release/20.x https://github.com/llvm/llvm-project.git
    cd llvm-project
 
 For Clang 16 & 17, the following patches required for development work. To apply

docs/Emscripten-build-instructions.rst

@@ -53,15 +53,15 @@ and on Windows execute in Powershell
    $env:PWD_DIR= $PWD.Path
    $env:SYSROOT_PATH="$env:EMSDK/upstream/emscripten/cache/sysroot"
 
-Now clone the 19.x release of the LLVM project repository and CppInterOp
+Now clone the 20.x release of the LLVM project repository and CppInterOp
 (the building of the emscripten version of llvm can be avoided by
 executing micromamba install llvm -c
 <https://repo.mamba.pm/emscripten-forge> and setting the LLVM_BUILD_DIR/$env:LLVM_BUILD_DIR
 appropriately)
 
 .. code:: bash
 
-   git clone --depth=1 --branch release/19.x https://github.com/llvm/llvm-project.git
+   git clone --depth=1 --branch release/20.x https://github.com/llvm/llvm-project.git
    git clone --depth=1 https://github.com/compiler-research/CppInterOp.git
 
 Now move into the cloned llvm-project folder and apply the required patches. On Linux and osx this
@@ -70,7 +70,7 @@ executing
 .. code:: bash
 
    cd ./llvm-project/
-   git apply -v ../CppInterOp/patches/llvm/emscripten-clang19-*.patch
+   git apply -v ../CppInterOp/patches/llvm/emscripten-clang20-*.patch
 
 On Windows execute the following
 
@@ -79,9 +79,9 @@ On Windows execute the following
    cd .\llvm-project\
    cp -r ..\patches\llvm\emscripten-clang${{ matrix.clang-runtime }}*
    cp -r ..\patches\llvm\Windows-emscripten-clang${{ matrix.clang-runtime }}*
-   git apply -v Windows-emscripten-clang19-1-CrossCompile.patch
-   git apply -v emscripten-clang19-2-shift-temporary-files-to-tmp-dir.patch
-   git apply -v emscripten-clang19-3-remove-zdefs.patch
+   git apply -v Windows-emscripten-clang20-1-CrossCompile.patch
+   git apply -v emscripten-clang20-2-shift-temporary-files-to-tmp-dir.patch
+   git apply -v emscripten-clang20-3-wasm-ld.patch
 
 We are now in a position to build an emscripten build of llvm by executing the following on Linux
 and osx

docs/InstallationAndUsage.rst

@@ -34,11 +34,11 @@ library
  Setup Clang-REPL
 ******************
 
-Clone the 19.x release of the LLVM project repository.
+Clone the 20.x release of the LLVM project repository.
 
 .. code:: bash
 
-   git clone --depth=1 --branch release/19.x https://github.com/llvm/llvm-project.git
+   git clone --depth=1 --branch release/20.x https://github.com/llvm/llvm-project.git
    cd llvm-project
 
 For Clang 16 & 17, the following patches required for development work. To apply