Skip to content

bazel: support _LIBCPP_HARDENING_MODE in setup_configs for LLVM 18+ (#2018) #2263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jdymitarai wants to merge 1 commit into
base: main
Choose a base branch
from
+20 −4
Open

bazel: support _LIBCPP_HARDENING_MODE in setup_configs for LLVM 18+ (#2018) #2263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions bazel/setup_configs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
#
Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion e2e_tests/functional_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Loading