Revert "Upgrade to LLVM 19"

This reverts commit 19f1fb5.

.github/workflows/build.yml

@@ -1,7 +1,7 @@
 name: CI
 
 env:
-  LLVM_VERSION: 19
+  LLVM_VERSION: 18
 
 # Controls when the workflow will run
 on:
@@ -13,7 +13,7 @@ on:
     inputs:
       llvm_version:
         description: "LLVM version"
-        default: "19"
+        default: "18"
 
 jobs:
   macos:
@@ -232,7 +232,7 @@ jobs:
       - name: Install LLVM and Ninja
         run: |
           scoop install ninja
-          scoop install llvm@19.1.7
+          scoop install llvm@18.1.8
           Join-Path (Resolve-Path ~).Path "scoop\apps\llvm\current\bin" >> $Env:GITHUB_PATH
       - uses: cygwin/cygwin-install-action@006ad0b0946ca6d0a3ea2d4437677fa767392401
       - uses: actions/checkout@v4

Dockerfile

@@ -3,7 +3,7 @@ ARG WEBKIT_RELEASE_TYPE=Release
 ARG CPU=native
 ARG LTO_FLAG="-flto=full -fwhole-program-vtables -fforce-emit-vtables "
 ARG RELEASE_FLAGS="-O2 -DNDEBUG=1"
-ARG LLVM_VERSION="19"
+ARG LLVM_VERSION="18"
 ARG DEFAULT_CFLAGS="-mno-omit-leaf-frame-pointer -g -fno-omit-frame-pointer -ffunction-sections -fdata-sections -faddrsig -fno-unwind-tables -fno-asynchronous-unwind-tables -DU_STATIC_IMPLEMENTATION=1 "
 
 # Use different base images for ARM64 vs x86_64
@@ -69,10 +69,10 @@ RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 130 \
     --slave /usr/bin/gcc-nm gcc-nm /usr/bin/gcc-nm-13 \
     --slave /usr/bin/gcc-ranlib gcc-ranlib /usr/bin/gcc-ranlib-13
 
-# Install LLVM
+# Install LLVM 18
 RUN wget https://apt.llvm.org/llvm.sh \
     && chmod +x llvm.sh \
-    && ./llvm.sh ${LLVM_VERSION} all \
+    && ./llvm.sh 18 all \
     && rm llvm.sh \
     && rm -rf /var/lib/apt/lists/*
 
@@ -230,4 +230,4 @@ RUN --mount=type=tmpfs,target=/webkitbuild \
 FROM scratch as artifact
 ARG TARGETARCH
 
-COPY --from=base /output /
+COPY --from=base /output /

Dockerfile.musl

@@ -2,7 +2,7 @@ ARG MARCH_FLAG=""
 ARG WEBKIT_RELEASE_TYPE=Release
 ARG CPU=native
 ARG LTO_FLAG="-flto=full -fwhole-program-vtables -fforce-emit-vtables "
-ARG LLVM_VERSION="19"
+ARG LLVM_VERSION="18"
 ARG DEFAULT_CFLAGS="-mno-omit-leaf-frame-pointer -g -fno-omit-frame-pointer -ffunction-sections -fdata-sections -faddrsig -fno-unwind-tables -fno-asynchronous-unwind-tables -DU_STATIC_IMPLEMENTATION=1 "
 
 FROM alpine:edge as base
@@ -15,17 +15,13 @@ ARG LLVM_VERSION
 ARG DEFAULT_CFLAGS
 
 RUN apk update
-RUN apk add --no-cache \
-    cmake make clang${LLVM_VERSION} clang${LLVM_VERSION}-static clang${LLVM_VERSION}-dev \
-    llvm${LLVM_VERSION}-dev llvm${LLVM_VERSION}-static musl-dev git lld${LLVM_VERSION} libgcc gcc \
-    g++ libstdc++ build-base lld${LLVM_VERSION}-dev llvm${LLVM_VERSION}-libs libc-dev xz zlib \
-    zlib-dev libxml2 libxml2-dev
-
-ENV CXX=clang++-${LLVM_VERSION}
-ENV CC=clang-${LLVM_VERSION}
-ENV LDFLAGS='-L/usr/include -L/usr/include/llvm${LLVM_VERSION}'
-ENV CXXFLAGS="-I/usr/include -I/usr/include/llvm${LLVM_VERSION}"
-ENV PATH="/usr/bin:/usr/local/bin:/zig/bin:/usr/lib/llvm${LLVM_VERSION}/bin:$PATH"
+RUN apk add --no-cache cmake make clang18 clang18-static clang18-dev llvm18-dev llvm18-static musl-dev git lld18 libgcc gcc g++ libstdc++ build-base lld18-dev llvm18-libs libc-dev xz zlib zlib-dev libxml2 libxml2-dev
+
+ENV CXX=clang++-18
+ENV CC=clang-18
+ENV LDFLAGS='-L/usr/include -L/usr/include/llvm18'
+ENV CXXFLAGS="-I/usr/include -I/usr/include/llvm18"
+ENV PATH="/usr/bin:/usr/local/bin:/zig/bin:/usr/lib/llvm18/bin:$PATH"
 ENV CPU=${CPU}
 ENV MARCH_FLAG=${MARCH_FLAG}
 ENV WEBKIT_OUT_DIR=/webkitbuild

mac-release.bash

@@ -9,7 +9,7 @@ set -euxo pipefail
 THIS_DIR=$(pwd)
 
 # Set default values for environment variables that are not set.
-CMAKE_C_COMPILER=${CMAKE_C_COMPILER:-clang-19}
+CMAKE_C_COMPILER=${CMAKE_C_COMPILER:-clang-18}
 CMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER:-clang++}
 CMAKE_C_FLAGS=${CMAKE_C_FLAGS:-}
 CMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS:-}