This is an archive of the discontinued LLVM Phabricator instance.

Differential D122597

[libc++][libc++abi] Serialize the enable_assertions Lit parameter in the generated config
ClosedPublic

Authored by ldionne on Mar 28 2022, 10:12 AM.

Details

Reviewers
None
Group Reviewers
Restricted Project
Restricted Project
Commits
rG65b1b3b961cf: [libc++][libc++abi] Serialize the enable_assertions Lit parameter in the…
Summary

This means that re-running with llvm-lit in that configuration will
work as expected. This also enables assertions in libc++abi in the
Generic-assertions CI job, which was disabled previously.

Diff Detail

Event Timeline

ldionne created this revision.Mar 28 2022, 10:12 AM
Herald added a project: Restricted Project. · View Herald TranscriptMar 28 2022, 10:12 AM
Herald added a subscriber: mgorny. · View Herald Transcript
ldionne requested review of this revision.Mar 28 2022, 10:12 AM
Herald added projects: Restricted Project, Restricted Project. · View Herald TranscriptMar 28 2022, 10:12 AM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added a subscriber: libcxx-commits. · View Herald Transcript
Harbormaster completed remote builds in B156596: Diff 418633.Mar 28 2022, 11:43 AM
ldionne accepted this revision as: Restricted Project, Restricted Project.Mar 29 2022, 5:17 AM
This revision was not accepted when it landed; it landed in state Needs Review.Mar 29 2022, 5:17 AM
Closed by commit rG65b1b3b961cf: [libc++][libc++abi] Serialize the enable_assertions Lit parameter in the… (authored by ldionne). · Explain Why
This revision was automatically updated to reflect the committed changes.
ldionne added a commit: rG65b1b3b961cf: [libc++][libc++abi] Serialize the enable_assertions Lit parameter in the….

Revision Contents

PathSize
libcxx/
cmake/
caches/
3 lines
test/
4 lines
libcxxabi/
test/
4 lines

Diff 418845

libcxx/cmake/caches/Generic-assertions.cmake

set(LIBCXX_ENABLE_ASSERTIONS ON CACHE BOOL "") set(LIBCXX_ENABLE_ASSERTIONS ON CACHE BOOL "")
set(LIBCXX_TEST_PARAMS "enable_assertions=True" CACHE STRING "") set(LIBCXXABI_ENABLE_ASSERTIONS ON CACHE BOOL "")
set(LIBCXXABI_TEST_PARAMS "enable_assertions=True" CACHE STRING "")

libcxx/test/CMakeLists.txt

Show First 20 Lines • Show All 98 Lines • ▼ Show 20 Lines
if (NOT LIBCXX_ENABLE_RTTI) if (NOT LIBCXX_ENABLE_RTTI)
serialize_lit_param(enable_rtti False) serialize_lit_param(enable_rtti False)
endif() endif()
if (NOT LIBCXX_ENABLE_DEBUG_MODE_SUPPORT) if (NOT LIBCXX_ENABLE_DEBUG_MODE_SUPPORT)
serialize_lit_param(enable_debug_tests False) serialize_lit_param(enable_debug_tests False)
endif() endif()
if (LIBCXX_ENABLE_ASSERTIONS)
serialize_lit_param(enable_assertions True)
endif()
if (CMAKE_CXX_COMPILER_TARGET) if (CMAKE_CXX_COMPILER_TARGET)
serialize_lit_param(target_triple "\"${CMAKE_CXX_COMPILER_TARGET}\"") serialize_lit_param(target_triple "\"${CMAKE_CXX_COMPILER_TARGET}\"")
else() else()
serialize_lit_param(target_triple "\"${LLVM_DEFAULT_TARGET_TRIPLE}\"") serialize_lit_param(target_triple "\"${LLVM_DEFAULT_TARGET_TRIPLE}\"")
endif() endif()
if (LLVM_USE_SANITIZER) if (LLVM_USE_SANITIZER)
serialize_lit_param(use_sanitizer "\"${LLVM_USE_SANITIZER}\"") serialize_lit_param(use_sanitizer "\"${LLVM_USE_SANITIZER}\"")
▲ Show 20 Lines • Show All 68 Lines • Show Last 20 Lines

libcxxabi/test/CMakeLists.txt

Show First 20 Lines • Show All 73 Lines • ▼ Show 20 Lines
macro(serialize_lit_param param value) macro(serialize_lit_param param value)
string(APPEND SERIALIZED_LIT_PARAMS "config.${param} = ${value}\n") string(APPEND SERIALIZED_LIT_PARAMS "config.${param} = ${value}\n")
endmacro() endmacro()
if (NOT LIBCXXABI_ENABLE_EXCEPTIONS) if (NOT LIBCXXABI_ENABLE_EXCEPTIONS)
serialize_lit_param(enable_exceptions False) serialize_lit_param(enable_exceptions False)
endif() endif()
if (LIBCXXABI_ENABLE_ASSERTIONS)
serialize_lit_param(enable_assertions True)
endif()
serialize_lit_param(enable_experimental False) serialize_lit_param(enable_experimental False)
if (LLVM_USE_SANITIZER) if (LLVM_USE_SANITIZER)
serialize_lit_param(use_sanitizer "\"${LLVM_USE_SANITIZER}\"") serialize_lit_param(use_sanitizer "\"${LLVM_USE_SANITIZER}\"")
endif() endif()
if (CMAKE_CXX_COMPILER_TARGET) if (CMAKE_CXX_COMPILER_TARGET)
serialize_lit_param(target_triple "\"${CMAKE_CXX_COMPILER_TARGET}\"") serialize_lit_param(target_triple "\"${CMAKE_CXX_COMPILER_TARGET}\"")
Show All 22 Lines