Reverted to LLVM 20 as MSYS2 lagging behind

Author: IsaacShelton

.github/workflows/remoteBuild.yml

@@ -61,26 +61,26 @@ jobs:
       - name: Install LLVM and dependencies (Windows)
         if: ${{ matrix.os == 'windows-latest' }}
         run: |
-          curl --output mingw-w64-x86_64-llvm-18.1.8-2-any.pkg.tar.zst "https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-llvm-18.1.8-2-any.pkg.tar.zst"
-          curl --output mingw-w64-x86_64-llvm-libs-18.1.8-2-any.pkg.tar.zst "https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-llvm-libs-18.1.8-2-any.pkg.tar.zst"
+          curl --output mingw-w64-x86_64-llvm-20.1.8-2-any.pkg.tar.zst "https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-llvm-20.1.8-2-any.pkg.tar.zst"
+          curl --output mingw-w64-x86_64-llvm-libs-20.1.8-2-any.pkg.tar.zst "https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-llvm-libs-20.1.8-2-any.pkg.tar.zst"
           C:\msys64\usr\bin\pacman -S mingw-w64-x86_64-gcc --noconfirm
-          C:\msys64\usr\bin\pacman -U mingw-w64-x86_64-llvm-libs-18.1.8-2-any.pkg.tar.zst --noconfirm
-          C:\msys64\usr\bin\pacman -U mingw-w64-x86_64-llvm-18.1.8-2-any.pkg.tar.zst --noconfirm
+          C:\msys64\usr\bin\pacman -U mingw-w64-x86_64-llvm-libs-20.1.8-2-any.pkg.tar.zst --noconfirm
+          C:\msys64\usr\bin\pacman -U mingw-w64-x86_64-llvm-20.1.8-2-any.pkg.tar.zst --noconfirm
           C:\msys64\usr\bin\pacman -S mingw-w64-x86_64-zlib --noconfirm
           C:\msys64\usr\bin\pacman -S mingw-w64-x86_64-zstd --noconfirm
       - name: Install LLVM and dependencies (macOS)
         if: ${{ matrix.os == 'macos-latest' }}
         run: |
           brew install llvm # For clang
-          brew install llvm@18
+          brew install llvm@20
           brew install zstd
       - name: Install LLVM and dependencies (Ubuntu)
         if: ${{ matrix.os == 'ubuntu-latest' }}
         run: |
           sudo apt-get update
           sudo apt-get remove -y llvm
           eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
-          brew install llvm@18
+          brew install llvm@20
           brew install zstd
       - name: Build (Windows)
         if: ${{ matrix.os == 'windows-latest' }}
@@ -89,7 +89,7 @@ jobs:
         env:
           CFLAGS: -static-libgcc -static-libstdc++ -Wl,-Bstatic -lstdc++ -lpthread
           CXXFLAGS: -static-libgcc -static-libstdc++ -Wl,-Bstatic -lstdc++ -lpthread
-          LLVM_SYS_181_PREFIX: C:\msys64\mingw64
+          LLVM_SYS_201_PREFIX: C:\msys64\mingw64
           zstd_DIR: C:\msys64\mingw64
           zstd_LIBRARY: C:\msys64\mingw64\lib\libzstd.a
           ZLIB_INCLUDE_DIR: C:\msys64\mingw64\include
@@ -100,7 +100,7 @@ jobs:
           cargo build --release
         env:
           CC: /opt/homebrew/opt/llvm/bin/clang
-          LLVM_SYS_181_PREFIX: /opt/homebrew/opt/llvm@18
+          LLVM_SYS_201_PREFIX: /opt/homebrew/opt/llvm@20
           zstd_DIR: /usr/local/opt/zstd
           CFLAGS: -static-libstdc++
           CXXFLAGS: -static-libstdc++
@@ -110,7 +110,7 @@ jobs:
         run: |
           cargo build --release
         env:
-          LLVM_SYS_181_PREFIX: /home/linuxbrew/.linuxbrew/opt/llvm@18
+          LLVM_SYS_201_PREFIX: /home/linuxbrew/.linuxbrew/opt/llvm@20
           zstd_DIR: /home/linuxbrew/.linuxbrew/opt/zstd
       - name: Archive Build Result (Windows)
         if: ${{ matrix.os == 'windows-latest' }}

Cargo.lock

@@ -16,7 +16,7 @@ derive_more.workspace = true
 diagnostics = { version = "0.1.0", path = "../../support/diagnostics" }
 ir = { version = "0.1.0", path = "../../representations/ir" }
 itertools.workspace = true
-llvm-sys = { package = "llvm-sys", version = "211" }
+llvm-sys = { package = "llvm-sys", version = "201" }
 memo-map.workspace = true
 once_map.workspace = true
 primitives = { version = "0.1.0", path = "../../representations/primitives" }

src/components/build_llvm_ir/Cargo.toml

@@ -41,5 +41,5 @@ std_ext = { version = "0.1.0", path = "../../support/std_ext" }
 target = { version = "0.1.0", path = "../../support/target" }
 text = { version = "0.1.0", path = "../../support/text" }
 threadpool = { version = "0.1.0", path = "../../support/threadpool" }
-llvm-sys = { package = "llvm-sys", version = "211" }
+llvm-sys = { package = "llvm-sys", version = "201" }
 target_layout = { version = "0.1.0", path = "../../support/target_layout" }

src/components/job/Cargo.toml

@@ -85,6 +85,8 @@ impl<'env> Executable<'env> for LowerFunctionBody<'env> {
 
         let ir_func_ref = self.func;
 
+        let basicblocks = todo!();
+
         let ir_func = &ir.funcs[ir_func_ref];
         ir_func.basicblocks.set(basicblocks).unwrap();