[libc++] Bump the docker image hash

[philnik777]

This updates GCC 15 to the release version to allow us to upgrade to GCC 15.

[philnik777]

The CI failures are pre-existing, so I don't think bumping now is a problem.

[llvmbot]

@llvm/pr-subscribers-github-workflow

@llvm/pr-subscribers-libcxx

Author: Nikolas Klauser (philnik777)

Changes

This updates GCC 15 to the release version to allow us to upgrade to GCC 15.

---

Full diff: https://github.com/llvm/llvm-project/pull/140517.diff

3 Files Affected:

• (modified) .github/workflows/libcxx-build-and-test.yaml (+1-1)
• (modified) libcxx/include/__cxx03/__type_traits/is_trivially_relocatable.h (+1-1)
• (modified) libcxx/utils/ci/run-buildbot-container (+2-2)

diff --git a/.github/workflows/libcxx-build-and-test.yaml b/.github/workflows/libcxx-build-and-test.yaml
index 3551fc150e59b..d05e6a559e28d 100644
--- a/.github/workflows/libcxx-build-and-test.yaml
+++ b/.github/workflows/libcxx-build-and-test.yaml
@@ -37,7 +37,7 @@ jobs:
   stage1:
     if: github.repository_owner == 'llvm'
     runs-on: libcxx-self-hosted-linux
-    container: ghcr.io/llvm/libcxx-linux-builder:2b57ebb50b6d418e70382e655feaa619b558e254
+    container: ghcr.io/llvm/libcxx-linux-builder:b060022103f551d8ca1dad84122ef73927c86512
     continue-on-error: false
     strategy:
       fail-fast: false
diff --git a/libcxx/include/__cxx03/__type_traits/is_trivially_relocatable.h b/libcxx/include/__cxx03/__type_traits/is_trivially_relocatable.h
index 062b289575bc1..f860d487dba0e 100644
--- a/libcxx/include/__cxx03/__type_traits/is_trivially_relocatable.h
+++ b/libcxx/include/__cxx03/__type_traits/is_trivially_relocatable.h
@@ -24,7 +24,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 // A type is trivially relocatable if a move construct + destroy of the original object is equivalent to
 // `memcpy(dst, src, sizeof(T))`.
 
-#if __has_builtin(__is_trivially_relocatable)
+#if __has_builtin(__is_trivially_relocatable) && 0
 template <class _Tp, class = void>
 struct __libcpp_is_trivially_relocatable : integral_constant<bool, __is_trivially_relocatable(_Tp)> {};
 #else
diff --git a/libcxx/utils/ci/run-buildbot-container b/libcxx/utils/ci/run-buildbot-container
index e507fa8eedb6e..33a00a9c90671 100755
--- a/libcxx/utils/ci/run-buildbot-container
+++ b/libcxx/utils/ci/run-buildbot-container
@@ -26,6 +26,6 @@ if [[ ! -d "${MONOREPO_ROOT}/libcxx/utils/ci" ]]; then
     echo "Was unable to find the root of the LLVM monorepo; are you running from within the monorepo?"
     exit 1
 fi
-docker pull ghcr.io/llvm/libcxx-linux-builder:2b57ebb50b6d418e70382e655feaa619b558e254
-docker run -it --volume "${MONOREPO_ROOT}:/llvm" --workdir "/llvm" --cap-add=SYS_PTRACE ghcr.io/llvm/libcxx-linux-builder:2b57ebb50b6d418e70382e655feaa619b558e254 \
+docker pull ghcr.io/llvm/libcxx-linux-builder:b060022103f551d8ca1dad84122ef73927c86512
+docker run -it --volume "${MONOREPO_ROOT}:/llvm" --workdir "/llvm" --cap-add=SYS_PTRACE ghcr.io/llvm/libcxx-linux-builder:b060022103f551d8ca1dad84122ef73927c86512 \
     bash -c 'git config --global --add safe.directory /llvm ; exec bash'

[ldionne]

Was this change intended?

[tstellar]

The container should also be checked to make sure this change isn't in there.

[ldionne]

Oh, I notice that this change is to the C++03 frozen headers. I suspect this might have been done because GCC 15 now provides __has_builtin(__is_trivially_relocatable). But I think this change should have been done in a separate (preceding) patch. Let's see what @philnik777 says.

[philnik777]

Yes, this was intentional. It was actually because clang now warns that the builtin is deprecated. Maybe this should have been done in a separate patch, but we've already disabled this in the non-C++03 headers, so I don't think this is a crazy change.