Meta: Bump CI LLVM version to 20

alimpfard · alimpfard · commit 5743cbf70a4a · 2026-05-04T17:20:46.000+02:00
diff --git a/.github/actions/clang-windows/action.yml b/.github/actions/clang-windows/action.yml
@@ -6,11 +6,11 @@ inputs:
   llvm_version:
     description: 'Version of LLVM to build and cache'
     required: false
-    default: 16.0.6
+    default: 20.1.8
   llvm_branch:
     description: 'Specific LLVM branch to build'
     required: false
-    default: "llvmorg-16.0.6"
+    default: "llvmorg-20.1.8"
 
 runs:
   using: composite
@@ -36,7 +36,7 @@ runs:
       shell: cmd
       run: |
         "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64 &^
-        cmake -GNinja -S llvm-project-${{ inputs.llvm_version }}\llvm -B llvm-build -DCMAKE_CXX_COMPILER=clang-cl -DCMAKE_C_COMPILER=clang-cl -DLLVM_ENABLE_PROJECTS=clang -DCMAKE_BUILD_TYPE=Release -DCMAKE_EXE_LINKER_FLAGS="/machine:x64" -DCMAKE_INSTALL_PREFIX="%GITHUB_WORKSPACE%/llvm-install-${{ inputs.llvm_version }}/"
+        cmake -GNinja -S llvm-project-${{ inputs.llvm_version }}\llvm -B llvm-build -DCMAKE_CXX_COMPILER=clang-cl -DCMAKE_C_COMPILER=clang-cl -DLLVM_ENABLE_PROJECTS=clang -DLLVM_ENABLE_RUNTIMES=compiler-rt -DCMAKE_BUILD_TYPE=Release -DCMAKE_EXE_LINKER_FLAGS="/machine:x64" -DCMAKE_INSTALL_PREFIX="%GITHUB_WORKSPACE%/llvm-install-${{ inputs.llvm_version }}/"
 
     - name: Build
       shell: cmd
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -27,10 +27,10 @@ jobs:
       fail-fast: true
       matrix:
         platform: [ubuntu-22.04]
-        cxx_compiler: [clang++-18]
+        cxx_compiler: [clang++-20]
         include:
           - platform: macos-latest
-            cxx_compiler: "$(brew --prefix llvm@18)/bin/clang++"
+            cxx_compiler: "$(brew --prefix llvm@20)/bin/clang++"
 
     runs-on: ${{ matrix.platform }}
 
@@ -49,17 +49,17 @@ jobs:
           . /etc/lsb-release
           wget -O /usr/share/keyrings/llvm-snapshot.gpg.key https://apt.llvm.org/llvm-snapshot.gpg.key
           sudo echo "deb [signed-by=/usr/share/keyrings/llvm-snapshot.gpg.key] http://apt.llvm.org/${DISTRIB_CODENAME}/ llvm-toolchain-${DISTRIB_CODENAME} main" | sudo tee -a /etc/apt/sources.list.d/llvm.list
-          sudo echo "deb [signed-by=/usr/share/keyrings/llvm-snapshot.gpg.key] http://apt.llvm.org/${DISTRIB_CODENAME}/ llvm-toolchain-${DISTRIB_CODENAME}-18 main" | sudo tee -a /etc/apt/sources.list.d/llvm.list
+          sudo echo "deb [signed-by=/usr/share/keyrings/llvm-snapshot.gpg.key] http://apt.llvm.org/${DISTRIB_CODENAME}/ llvm-toolchain-${DISTRIB_CODENAME}-20 main" | sudo tee -a /etc/apt/sources.list.d/llvm.list
           sudo apt-get update
-          sudo apt-get install -y clang-18 libclang-18-dev
+          sudo apt-get install -y clang-20 libclang-20-dev
 
       - name: Install macOS dependencies
         if: ${{ matrix.platform == 'macos-latest' }}
-        run: brew install coreutils llvm@18
+        run: brew install coreutils llvm@20
 
       - name: Build Jakt Stage 1
         run: |
-          export "CMAKE_PREFIX_PATH=$(brew --prefix llvm@18)"
+          export "CMAKE_PREFIX_PATH=$(brew --prefix llvm@20)"
           cmake -GNinja -B build -DCMAKE_CXX_COMPILER=${{ matrix.cxx_compiler }} -DCMAKE_BUILD_TYPE=Release -DFINAL_STAGE=1 -DCMAKE_INSTALL_PREFIX=jakt-install
           cmake --build build
 
@@ -107,7 +107,7 @@ jobs:
 
   selfhost-windows:
     env:
-      LLVM_VER: 18.1.6
+      LLVM_VER: 20.1.8
 
     strategy:
       fail-fast: true
@@ -125,6 +125,20 @@ jobs:
          version: 1.10.0
          dest: ${{ github.workspace }}/ninja_bin
 
+     - name: Cache Clang
+       uses: actions/cache@v3
+       id: cache-clang
+       with:
+         path: 'llvm-install-${{ env.LLVM_VER }}/'
+         key: 'libclang-${{ runner.os }}-${{ env.LLVM_VER }}'
+
+     - name: Build clang if cache miss
+       uses: ./.github/actions/clang-windows
+       if: steps.cache-clang.outputs.cache-hit != 'true'
+       with:
+         llvm_version: "${{ env.LLVM_VER }}"
+         llvm_branch: "llvmorg-${{ env.LLVM_VER }}"
+
      - name: Configure CMake
        env:
          CMAKE_PREFIX_PATH: ${{ github.workspace }}/llvm-install-${{ env.LLVM_VER }}
diff --git a/.github/workflows/populate-windows-clang.yml b/.github/workflows/populate-windows-clang.yml
@@ -3,7 +3,7 @@ on:
   workflow_dispatch:
 
 env:
-  LLVM_VER: 16.0.6
+  LLVM_VER: 20.1.8
   
 jobs:
   build:
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -321,6 +321,8 @@ if (JAKT_BUILD_TESTING AND NOT CMAKE_CROSSCOMPILING)
     INCLUDES
       "${CMAKE_CURRENT_SOURCE_DIR}/jakttest"
     RUNTIME_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/runtime"
+    STDLIB_SOURCES
+      jakt__platform.cpp
   )
   add_jakt_compiler_flags(jakttest)
   target_sources(jakttest PRIVATE
diff --git a/bootstrap/stage0/runtime/lib.h b/bootstrap/stage0/runtime/lib.h
@@ -449,9 +449,9 @@ inline ErrorOr<ByteString> target_triple_string()
     return ByteString("x86_64-unknown-bsd-unknown"sv);
 #    elif defined(__APPLE__)
 #        if defined(__arm64__)
-    return ByteString("arm64-unknown-darwin-unknown"sv);
+    return ByteString("arm64-apple-darwin-unknown"sv);
 #        else
-    return ByteString("x86_64-unknown-darwin-unknown"sv);
+    return ByteString("x86_64-apple-darwin-unknown"sv);
 #        endif
 #    elif defined(__serenity__)
 #        if defined(__i686__)
diff --git a/cmake/jakt-executable.cmake b/cmake/jakt-executable.cmake
@@ -4,7 +4,12 @@
 #
 
 # FIXME: Should this live in a toolchain file?
-set(JAKT_TARGET_TRIPLE_IN "${CMAKE_SYSTEM_PROCESSOR}-unknown-${CMAKE_SYSTEM_NAME}-unknown")
+if(APPLE)
+    set(triple_vendor "apple")
+else()
+    set(triple_vendor "unknown")
+endif()
+set(JAKT_TARGET_TRIPLE_IN "${CMAKE_SYSTEM_PROCESSOR}-${triple_vendor}-${CMAKE_SYSTEM_NAME}-unknown")
 string(TOLOWER ${JAKT_TARGET_TRIPLE_IN} JAKT_DEFAULT_TARGET_TRIPLE)
 set(JAKT_TARGET_TRIPLE "${JAKT_DEFAULT_TARGET_TRIPLE}" CACHE STRING "Target triple for jakt compiler")
 
diff --git a/jakttest/jakttest.jakt b/jakttest/jakttest.jakt
@@ -9,6 +9,7 @@ import error { JaktError, print_error }
 import parser { Parser }
 import utility { join, panic }
 import jakt::compiler { target_triple_string }
+import jakt::platform { Target }
 
 // needed for sigaction() stuff
 // FIXME: See #1015, needs to be OS-specific
@@ -648,7 +649,7 @@ struct TestScheduler {
             "--jakt-lib-dir"
             format("{}/lib", build_dir)
             "--target-triple"
-            target_triple_string()
+            Target::from_triple(target_triple_string()).name(abbreviate: true)
             "--cpp-compiler"
             cpp_compiler_path ?? default_compiler_path
             "--cpp-export"
diff --git a/runtime/lib.h b/runtime/lib.h
@@ -449,9 +449,9 @@ inline ErrorOr<ByteString> target_triple_string()
     return ByteString("x86_64-unknown-bsd-unknown"sv);
 #    elif defined(__APPLE__)
 #        if defined(__arm64__)
-    return ByteString("arm64-unknown-darwin-unknown"sv);
+    return ByteString("arm64-apple-darwin-unknown"sv);
 #        else
-    return ByteString("x86_64-unknown-darwin-unknown"sv);
+    return ByteString("x86_64-apple-darwin-unknown"sv);
 #        endif
 #    elif defined(__serenity__)
 #        if defined(__i686__)

Original file line number	Diff line number	Diff line change
`@@ -321,6 +321,8 @@ if (JAKT_BUILD_TESTING AND NOT CMAKE_CROSSCOMPILING)`
`321`	`321`	`INCLUDES`
`322`	`322`	`"${CMAKE_CURRENT_SOURCE_DIR}/jakttest"`
`323`	`323`	`RUNTIME_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/runtime"`
	`324`	`+ STDLIB_SOURCES`
	`325`	`+ jakt__platform.cpp`
`324`	`326`	`)`
`325`	`327`	`add_jakt_compiler_flags(jakttest)`
`326`	`328`	`target_sources(jakttest PRIVATE`