[libcxx-commits] [libcxx] 8e3aa7e - [libc++] Fix CMake cache for the hardening with ABI breaks CI (#105864)

[via libcxx-commits]

Author: Louis Dionne
Date: 2024-08-26T17:16:37-04:00
New Revision: 8e3aa7e922c2375dfab095548d3359394ac2f9b5

URL: https://github.com/llvm/llvm-project/commit/8e3aa7e922c2375dfab095548d3359394ac2f9b5
DIFF: https://github.com/llvm/llvm-project/commit/8e3aa7e922c2375dfab095548d3359394ac2f9b5.diff

LOG: [libc++] Fix CMake cache for the hardening with ABI breaks CI (#105864)

We were incorrectly only enabling _LIBCPP_ABI_BOUNDED_ITERATORS, without
enabling bounded iterators in string and vector.

Added: 
    

Modified: 
    libcxx/cmake/caches/Generic-hardening-mode-fast-with-abi-breaks.cmake
    libcxx/utils/ci/run-buildbot

Removed: 
    


################################################################################
diff  --git a/libcxx/cmake/caches/Generic-hardening-mode-fast-with-abi-breaks.cmake b/libcxx/cmake/caches/Generic-hardening-mode-fast-with-abi-breaks.cmake
index 4a9389fdcb41cb..c0f2bad1c95af0 100644
--- a/libcxx/cmake/caches/Generic-hardening-mode-fast-with-abi-breaks.cmake
+++ b/libcxx/cmake/caches/Generic-hardening-mode-fast-with-abi-breaks.cmake
@@ -1,4 +1,2 @@
 set(LIBCXX_HARDENING_MODE "fast" CACHE STRING "")
-set(LIBCXX_ABI_DEFINES "_LIBCPP_ABI_BOUNDED_ITERATORS" CACHE STRING "")
-set(LIBCXX_ABI_DEFINES "_LIBCPP_ABI_BOUNDED_ITERATORS_IN_STRING" CACHE STRING "")
-set(LIBCXX_ABI_DEFINES "_LIBCPP_ABI_BOUNDED_ITERATORS_IN_VECTOR" CACHE STRING "")
+set(LIBCXX_ABI_DEFINES "_LIBCPP_ABI_BOUNDED_ITERATORS;_LIBCPP_ABI_BOUNDED_ITERATORS_IN_STRING;_LIBCPP_ABI_BOUNDED_ITERATORS_IN_VECTOR" CACHE STRING "")

diff  --git a/libcxx/utils/ci/run-buildbot b/libcxx/utils/ci/run-buildbot
index 6353c87c3d865d..1c7085d90f0afc 100755
--- a/libcxx/utils/ci/run-buildbot
+++ b/libcxx/utils/ci/run-buildbot
@@ -417,7 +417,7 @@ generic-hardening-mode-fast-with-abi-breaks)
     clean
     generate-cmake -C "${MONOREPO_ROOT}/libcxx/cmake/caches/Generic-hardening-mode-fast-with-abi-breaks.cmake"
     check-runtimes
-    check-abi-list
+    # Not checking ABI list since we purposefully enable ABI breaking changes
 ;;
 generic-hardening-mode-extensive)
     clean