From ce91c2438c01342f2062bef9629cd73c58637916 Mon Sep 17 00:00:00 2001
From: jdymitarai <o10040115@gmail.com>
Date: Sun, 11 Oct 2026 00:19:16 +0900
Subject: [PATCH] bazel: support _LIBCPP_HARDENING_MODE in setup_configs for
 LLVM 18+ (#2018)

---
 bazel/setup_configs.sh       | 22 +++++++++++++++++++---
 e2e_tests/functional_test.cc |  2 +-
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/bazel/setup_configs.sh b/bazel/setup_configs.sh
index 8a6524b15..bb5ba2ec0 100755
--- a/bazel/setup_configs.sh
+++ b/bazel/setup_configs.sh
@@ -17,6 +17,22 @@ cat <<EOF
 
 EOF
 
+# In LLVM 18+, _LIBCPP_ENABLE_ASSERTIONS is deprecated in favor of _LIBCPP_HARDENING_MODE.
+# See https://libcxx.llvm.org/Hardening.html
+LIBCPP_ASSERTION_FLAG="-D_LIBCPP_ENABLE_ASSERTIONS=1"
+CXX_COMPILER="${CXX:-clang++}"
+if [[ -n "${LIBCPP_HARDENING_MODE:-}" ]]; then
+  LIBCPP_ASSERTION_FLAG="-D_LIBCPP_HARDENING_MODE=${LIBCPP_HARDENING_MODE}"
+elif command -v "${CXX_COMPILER}" >/dev/null 2>&1; then
+  if echo '#include <ciso646>' 2>/dev/null | "${CXX_COMPILER}" -E -dM -x c++ -stdlib=libc++ - 2>/dev/null | grep -q "_LIBCPP_HARDENING_MODE"; then
+    LIBCPP_ASSERTION_FLAG="-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE"
+  elif echo '#include <ciso646>' 2>/dev/null | "${CXX_COMPILER}" -E -dM -x c++ - 2>/dev/null | grep -q "_LIBCPP_HARDENING_MODE"; then
+    LIBCPP_ASSERTION_FLAG="-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE"
+  elif "${CXX_COMPILER}" --version 2>/dev/null | grep -qE "clang version (1[8-9]|[2-9][0-9])"; then
+    LIBCPP_ASSERTION_FLAG="-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE"
+  fi
+fi
+
 cat <<EOF
 ### Common options.
 #
@@ -28,9 +44,9 @@ build:fuzztest-common --copt=-DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
 # In fuzz tests, we want to catch assertion violations even in optimized builds.
 build:fuzztest-common --copt=-UNDEBUG
 
-# Enable libc++ assertions.
-# See https://libcxx.llvm.org/UsingLibcxx.html#enabling-the-safe-libc-mode
-build:fuzztest-common --copt=-D_LIBCPP_ENABLE_ASSERTIONS=1
+# Enable libc++ assertions or hardening mode (LLVM 18+).
+# See https://libcxx.llvm.org/Hardening.html
+build:fuzztest-common --copt=${LIBCPP_ASSERTION_FLAG}
 
 EOF
 
diff --git a/e2e_tests/functional_test.cc b/e2e_tests/functional_test.cc
index 943eb7256..3ce2ae717 100644
--- a/e2e_tests/functional_test.cc
+++ b/e2e_tests/functional_test.cc
@@ -1654,7 +1654,7 @@ TEST_P(FuzzingModeCrashFindingTest,
 
 TEST_P(FuzzingModeCrashFindingTest,
        DereferencingEmptyOptionalTriggersLibcppAssertionsWhenEnabled) {
-#if defined(_LIBCPP_VERSION) && defined(_LIBCPP_ENABLE_ASSERTIONS)
+#if defined(_LIBCPP_VERSION) && (defined(_LIBCPP_ENABLE_ASSERTIONS) || (defined(_LIBCPP_HARDENING_MODE) && _LIBCPP_HARDENING_MODE != _LIBCPP_HARDENING_MODE_NONE))
   auto [status, std_out, std_err] = Run("MySuite.DereferenceEmptyOptional");
   EXPECT_THAT_LOG(std_err, HasSubstr("argument 0: std::nullopt"));
   ExpectTargetAbort(status, std_err);