Merge branch 'sym-1.42.x' into symgc-1.42.x

Conflicts:
	.github/workflows/main.yml

Author: kinke

.circleci/config.yml

@@ -91,7 +91,13 @@ commonSteps: &commonSteps
     - run:
         name: Run defaultlib unittests & druntime integration tests
         when: always
-        command: cd ../build && ctest -j$PARALLELISM --output-on-failure -E "dmd-testsuite|ldc2-unittest|lit-tests" --timeout 120
+        command: |
+          set -ux
+          excludes='dmd-testsuite|lit-tests|ldc2-unittest'
+          # FIXME: https://github.com/dlang/phobos/issues/10730
+          excludes+='|^std.experimental.allocator.building_blocks.allocator_list'
+          cd ../build
+          ctest -j$PARALLELISM --output-on-failure -E "$excludes" --timeout 120
 
 version: 2
 jobs:

.cirrus.yml

@@ -49,11 +49,9 @@ common_steps_template: &COMMON_STEPS_TEMPLATE
     run_defaultlib_tests_script: |
       # Run defaultlib unittests & druntime integration tests
       cd $CIRRUS_WORKING_DIR/../build
-      excludes="dmd-testsuite|lit-tests|ldc2-unittest"
-      if [[ "$CI_OS" == "freebsd" ]]; then
-        # FIXME: https://github.com/dlang/phobos/issues/10730
-        excludes+='|^std.experimental.allocator.building_blocks.allocator_list'
-      fi
+      excludes='dmd-testsuite|lit-tests|ldc2-unittest'
+      # FIXME: https://github.com/dlang/phobos/issues/10730
+      excludes+='|^std.experimental.allocator.building_blocks.allocator_list'
       ctest -j$PARALLELISM --output-on-failure -E "$excludes" --timeout 120
 
 # Performs the extra packaging steps for jobs producing a prebuilt package.

.github/actions/1-setup/action.yml

@@ -2,6 +2,8 @@ name: Install prerequisites
 inputs:
   llvm_version:
     required: true
+  clang_major:
+    required: true
   arch:
     required: true
 runs:
@@ -37,39 +39,41 @@ runs:
         # Make sure to link libzstd statically
         sudo rm /usr/lib/$arch-linux-gnu/libzstd.so
 
-    - name: 'Linux: Install clang 21 from apt.llvm.org'
+    - name: 'Linux: Install clang ${{ inputs.clang_major }} from apt.llvm.org'
       if: runner.os == 'Linux'
       shell: bash
       run: |
         set -eux
         cd ..
         curl -fL --retry 3 --max-time 30 -O https://apt.llvm.org/llvm.sh
-        sudo bash llvm.sh 21
+        sudo bash llvm.sh ${{ inputs.clang_major }}
         for tool in clang clang++ ld.lld; do
-          sudo ln -sf $tool-21 /usr/bin/$tool
+          sudo ln -sf $tool-${{ inputs.clang_major }} /usr/bin/$tool
           $tool --version
         done
-    - name: 'macOS: Install Homebrew clang and lld 21' # see mimalloc comment in ../3-build-native/action.yml
+    - name: 'macOS: Install Homebrew clang and lld ${{ inputs.clang_major }}' # see mimalloc comment in ../3-build-native/action.yml
       if: runner.os == 'macOS'
       shell: bash
       run: |
         set -eux
-        brew install llvm@21 lld@21
+        major='${{ inputs.clang_major }}'
+        brew install llvm@$major lld@$major
         # https://github.com/llvm/llvm-project/issues/155531#issuecomment-3229499205
         if [[ '${{ inputs.arch }}' == arm64 ]]; then
-          prefix="/opt/homebrew/opt/llvm"
+          prefix="/opt/homebrew/opt/llvm@$major"
         else
-          prefix="/usr/local/opt/llvm"
+          prefix="/usr/local/opt/llvm@$major"
         fi
         rm -rf "$prefix/include/c++/v1"
-    - name: 'Windows: Install clang 21 from GitHub'
+    - name: 'Windows: Install clang ${{ inputs.clang_major }} from GitHub'
       if: runner.os == 'Windows'
       shell: bash
       run: |
         set -eux
         cd ..
+        version='${{ inputs.clang_major }}.1.8'
         curl -fL --retry 3 --max-time 300 -o clang.exe \
-          https://github.com/llvm/llvm-project/releases/download/llvmorg-21.1.8/LLVM-21.1.8-win64.exe
+          https://github.com/llvm/llvm-project/releases/download/llvmorg-$version/LLVM-$version-win64.exe
         ./clang.exe //S # double-slash for bash
         rm clang.exe
         # C:\Program Files\LLVM\bin should already be in PATH

.github/actions/4d-test-libs/action.yml

@@ -18,25 +18,18 @@ runs:
           N=$(nproc)
         fi
 
-        excludes="dmd-testsuite|lit-tests|ldc2-unittest"
-        if [[ '${{ runner.os }}-${{ inputs.arch }}' == Linux-x86_64 ]]; then
-          # sporadically hanging since Ubuntu 22
-          excludes+='|^core.thread-shared_32$'
-        elif [[ '${{ runner.os }}-${{ inputs.arch }}' == Linux-aarch64 ]]; then
-          # FIXME: sporadically hanging
-          excludes+='|^core.thread-shared$'
+        excludes='dmd-testsuite|lit-tests|ldc2-unittest'
+        # FIXME: https://github.com/dlang/phobos/issues/10730
+        excludes+='|^std.experimental.allocator.building_blocks.allocator_list'
+        if [[ '${{ runner.os }}-${{ inputs.arch }}' == Linux-aarch64 ]]; then
           if type -P apk &>/dev/null; then
             # FIXME: empty exception backtraces on musl AArch64 with enabled optimizations
             excludes+='|^druntime-test-exceptions-release$'
           fi
         fi
-        if [[ '${{ runner.os }}' == macOS ]]; then
-          # FIXME: https://github.com/dlang/phobos/issues/10730
-          excludes+='|^std.experimental.allocator.building_blocks.allocator_list'
-          if [[ '${{ inputs.arch }}' == x86_64 ]]; then
-            # FIXME: regressed with image bump from macos-13 to macos-15-intel, apparently wrt. getpwnam_r() setting unexpected errno
-            excludes+='|^std.path'
-          fi
+        if [[ '${{ runner.os }}-${{ inputs.arch }}' == macOS-x86_64 ]]; then
+          # FIXME: regressed with image bump from macos-13 to macos-15-intel, apparently wrt. getpwnam_r() setting unexpected errno
+          excludes+='|^std.path'
         fi
 
         ctest -j$N --output-on-failure -E "$excludes" --timeout 120
@@ -55,4 +48,5 @@ runs:
         call "%LDC_VSDIR%\Common7\Tools\VsDevCmd.bat" -arch=${{ matrix.arch }} || exit /b
         echo on
         cd build || exit /b
-        ctest -j4 --output-on-failure -E "dmd-testsuite|lit-tests|ldc2-unittest" --timeout 120 || exit /b
+        # FIXME: https://github.com/dlang/phobos/issues/10730
+        ctest -j4 --output-on-failure -E "dmd-testsuite|lit-tests|ldc2-unittest|^std.experimental.allocator.building_blocks.allocator_list" --timeout 120 || exit /b

.github/workflows/main.yml

@@ -16,6 +16,7 @@ concurrency:
 
 env:
   LLVM_VERSION: 21.1.8
+  CLANG_MAJOR: 21
   DRT_GCOPT: gc:conservative
 
 jobs:
@@ -103,8 +104,8 @@ jobs:
             #   Additionally `-w` to suppress resulting linker warnings.
             extra_cmake_flags: >-
               -DCMAKE_OSX_SYSROOT=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk
-              -DCMAKE_C_COMPILER=/usr/local/opt/llvm/bin/clang
-              -DCMAKE_CXX_COMPILER=/usr/local/opt/llvm/bin/clang++
+              -DCMAKE_C_COMPILER=/usr/local/opt/llvm@${CLANG_MAJOR}/bin/clang
+              -DCMAKE_CXX_COMPILER=/usr/local/opt/llvm@${CLANG_MAJOR}/bin/clang++
               -DD_COMPILER_FLAGS="-O -flto=full -defaultlib=phobos2-ldc-lto,druntime-ldc-lto -L-exported_symbol '-L__*' -L-w"
               -DEXTRA_CXXFLAGS=-flto=full
             with_pgo: true
@@ -114,8 +115,8 @@ jobs:
             arch: arm64
             extra_cmake_flags: >-
               -DCMAKE_OSX_SYSROOT=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk
-              -DCMAKE_C_COMPILER=/opt/homebrew/opt/llvm/bin/clang
-              -DCMAKE_CXX_COMPILER=/opt/homebrew/opt/llvm/bin/clang++
+              -DCMAKE_C_COMPILER=/opt/homebrew/opt/llvm@${CLANG_MAJOR}/bin/clang
+              -DCMAKE_CXX_COMPILER=/opt/homebrew/opt/llvm@${CLANG_MAJOR}/bin/clang++
               -DD_COMPILER_FLAGS="-O -flto=full -defaultlib=phobos2-ldc-lto,druntime-ldc-lto -L-exported_symbol '-L__*' -L-w"
               -DEXTRA_CXXFLAGS=-flto=full
             with_pgo: true
@@ -194,6 +195,7 @@ jobs:
         uses: ./.github/actions/1-setup
         with:
           llvm_version: ${{ matrix.llvm_version || env.LLVM_VERSION }}
+          clang_major: ${{ env.CLANG_MAJOR }}
           arch: ${{ matrix.arch }}
       - name: 'Ubuntu 22: Build recent gdb from source' # see https://github.com/ldc-developers/ldc/issues/4389
         if: startsWith(matrix.os, 'ubuntu-22.04')
@@ -311,6 +313,7 @@ jobs:
         uses: ./.github/actions/1-setup
         with:
           llvm_version: ${{ env.LLVM_VERSION }}
+          clang_major: ${{ env.CLANG_MAJOR }}
           arch: x86_64
       - name: Build bootstrap LDC
         uses: ./.github/actions/2-build-bootstrap

.github/workflows/supported_llvm_versions.yml

@@ -165,14 +165,10 @@ jobs:
         run: |
           set -eux
           excludes='dmd-testsuite|lit-tests|ldc2-unittest'
+          # FIXME: https://github.com/dlang/phobos/issues/10730
+          excludes+='|^std.experimental.allocator.building_blocks.allocator_list'
           if [[ '${{ runner.os }}' == macOS ]]; then
             N=$(sysctl -n hw.logicalcpu)
-            if [[ '${{ matrix.os }}' == macos-14 ]]; then
-              # FIXME: crashes frequently with enabled optimizations on M1 runners
-              excludes+='|^std.internal.math.gammafunction(-shared)?$'
-            fi
-            # FIXME: https://github.com/dlang/phobos/issues/10730
-            excludes+='|^std.experimental.allocator.building_blocks.allocator_list'
           else
             N=$(nproc)
           fi

runtime/druntime/src/core/thread/package.d

@@ -34,8 +34,15 @@ unittest
 
     auto thr = new Thread(()
     {
-        while (!*f)
+        version (LDC) // don't optimize to a single load with -O
         {
+            while (!atomicLoad(*f)) {}
+        }
+        else
+        {
+            while (!*f)
+            {
+            }
         }
 
         atomicFence();