[compiler-rt] 93b1256 - [compiler-rt][test] Heed COMPILER_RT_DEBUG when compiling unittests
Rainer Orth via llvm-commits
llvm-commits at lists.llvm.org
Wed Oct 5 00:54:00 PDT 2022
Author: Rainer Orth
Date: 2022-10-05T09:53:26+02:00
New Revision: 93b1256e38f63a81561288b9a90c5d52af63cb6e
URL: https://github.com/llvm/llvm-project/commit/93b1256e38f63a81561288b9a90c5d52af63cb6e
DIFF: https://github.com/llvm/llvm-project/commit/93b1256e38f63a81561288b9a90c5d52af63cb6e.diff
LOG: [compiler-rt][test] Heed COMPILER_RT_DEBUG when compiling unittests
When trying to debug some `compiler-rt` unittests, I initially had a hard
time because
- even in a `Debug` build one needs to set `COMPILER_RT_DEBUG` to get
debugging info for some of the code and
- even so the unittests used a hardcoded `-O2` which often makes debugging
impossible.
This patch addresses this by instead using `-O0` if `COMPILER_RT_DEBUG`.
Two tests in `sanitizer_type_traits_test.cpp` need to be disabled since
they have undefined references to `__sanitizer::integral_constant<bool,
true>::value`.
Tested on `sparcv9-sun-solaris2.11`, `amd64-pc-solaris2.11`, and
`x86_64-pc-linux-gnu`.
Differential Revision: https://reviews.llvm.org/D91620
Added:
Modified:
compiler-rt/CMakeLists.txt
compiler-rt/lib/asan/tests/CMakeLists.txt
compiler-rt/lib/fuzzer/tests/CMakeLists.txt
compiler-rt/lib/gwp_asan/tests/CMakeLists.txt
compiler-rt/lib/interception/tests/CMakeLists.txt
compiler-rt/lib/msan/tests/CMakeLists.txt
compiler-rt/lib/sanitizer_common/tests/CMakeLists.txt
compiler-rt/lib/sanitizer_common/tests/sanitizer_type_traits_test.cpp
Removed:
################################################################################
diff --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt
index 689ce1a8ee6ea..ed496313016fb 100644
--- a/compiler-rt/CMakeLists.txt
+++ b/compiler-rt/CMakeLists.txt
@@ -406,9 +406,11 @@ if (NOT MSVC)
# Build with optimization, unless we're in debug mode.
if(COMPILER_RT_DEBUG)
- list(APPEND SANITIZER_COMMON_CFLAGS -O1)
+ list(APPEND SANITIZER_COMMON_CFLAGS -O0)
+ list(APPEND COMPILER_RT_TEST_COMPILER_CFLAGS -O0)
else()
list(APPEND SANITIZER_COMMON_CFLAGS -O3)
+ list(APPEND COMPILER_RT_TEST_COMPILER_CFLAGS -O3)
endif()
endif()
@@ -443,6 +445,7 @@ if(MSVC)
string(REGEX REPLACE "(^| )/Z[i7I]($| )" " /Z7 "
"${var_to_update}" "${${var_to_update}}")
endforeach()
+ list(APPEND COMPILER_RT_UNITTEST_CFLAGS -gcodeview)
elseif(APPLE)
# On Apple platforms use full debug info (i.e. not `-gline-tables-only`)
# for all build types so that the runtime can be debugged.
@@ -452,8 +455,13 @@ elseif(APPLE)
list(APPEND SANITIZER_COMMON_CFLAGS -g)
elseif(COMPILER_RT_HAS_GLINE_TABLES_ONLY_FLAG AND NOT COMPILER_RT_DEBUG)
list(APPEND SANITIZER_COMMON_CFLAGS -gline-tables-only)
+ # -gline-tables-only must be enough for these tests, so use it if possible.
+ list(APPEND COMPILER_RT_TEST_COMPILER_CFLAGS -gline-tables-only)
+ list(APPEND COMPILER_RT_UNITTEST_CFLAGS -gline-tables-only)
elseif(COMPILER_RT_HAS_G_FLAG)
list(APPEND SANITIZER_COMMON_CFLAGS -g)
+ list(APPEND COMPILER_RT_TEST_COMPILER_CFLAGS -g)
+ list(APPEND COMPILER_RT_UNITTEST_CFLAGS -g)
endif()
if(LLVM_ENABLE_MODULES)
diff --git a/compiler-rt/lib/asan/tests/CMakeLists.txt b/compiler-rt/lib/asan/tests/CMakeLists.txt
index a0c6d2910d6f8..22e99dfad6220 100644
--- a/compiler-rt/lib/asan/tests/CMakeLists.txt
+++ b/compiler-rt/lib/asan/tests/CMakeLists.txt
@@ -29,7 +29,6 @@ set(ASAN_UNITTEST_COMMON_CFLAGS
-I${COMPILER_RT_SOURCE_DIR}/lib/asan
-I${COMPILER_RT_SOURCE_DIR}/lib/sanitizer_common/tests
-fno-rtti
- -O2
-Wno-format
-Werror=sign-compare)
append_list_if(COMPILER_RT_HAS_WVARIADIC_MACROS_FLAG -Wno-variadic-macros ASAN_UNITTEST_COMMON_CFLAGS)
@@ -40,16 +39,6 @@ set(ASAN_UNITTEST_COMMON_LINK_FLAGS
${COMPILER_RT_UNITTEST_LINK_FLAGS}
${COMPILER_RT_UNWINDER_LINK_LIBS}
${SANITIZER_TEST_CXX_LIBRARIES})
-
-# -gline-tables-only must be enough for ASan, so use it if possible.
-if(COMPILER_RT_TEST_COMPILER_ID MATCHES "Clang")
- list(APPEND ASAN_UNITTEST_COMMON_CFLAGS -gline-tables-only)
-else()
- list(APPEND ASAN_UNITTEST_COMMON_CFLAGS -g)
-endif()
-if(MSVC)
- list(APPEND ASAN_UNITTEST_COMMON_CFLAGS -gcodeview)
-endif()
list(APPEND ASAN_UNITTEST_COMMON_LINK_FLAGS -g)
# Use -D instead of definitions to please custom compile command.
diff --git a/compiler-rt/lib/fuzzer/tests/CMakeLists.txt b/compiler-rt/lib/fuzzer/tests/CMakeLists.txt
index 10fcfbaa083e5..3c70730654c32 100644
--- a/compiler-rt/lib/fuzzer/tests/CMakeLists.txt
+++ b/compiler-rt/lib/fuzzer/tests/CMakeLists.txt
@@ -4,8 +4,7 @@ set(LIBFUZZER_UNITTEST_CFLAGS
${COMPILER_RT_UNITTEST_CFLAGS}
${COMPILER_RT_GTEST_CFLAGS}
-I${COMPILER_RT_SOURCE_DIR}/lib/fuzzer
- -fno-rtti
- -O2)
+ -fno-rtti)
if (APPLE)
set(FUZZER_SUPPORTED_OS osx)
diff --git a/compiler-rt/lib/gwp_asan/tests/CMakeLists.txt b/compiler-rt/lib/gwp_asan/tests/CMakeLists.txt
index ef7ea28b39837..7a5dcc40f834e 100644
--- a/compiler-rt/lib/gwp_asan/tests/CMakeLists.txt
+++ b/compiler-rt/lib/gwp_asan/tests/CMakeLists.txt
@@ -6,7 +6,6 @@ set(GWP_ASAN_UNITTEST_CFLAGS
${SANITIZER_TEST_CXX_CFLAGS}
-std=c++17
-I${COMPILER_RT_SOURCE_DIR}/lib/
- -O2
-g
-fno-omit-frame-pointer)
diff --git a/compiler-rt/lib/interception/tests/CMakeLists.txt b/compiler-rt/lib/interception/tests/CMakeLists.txt
index 37bf99edaf068..5b41e4c6b567a 100644
--- a/compiler-rt/lib/interception/tests/CMakeLists.txt
+++ b/compiler-rt/lib/interception/tests/CMakeLists.txt
@@ -18,7 +18,6 @@ set(INTERCEPTION_TEST_CFLAGS_COMMON
-I${COMPILER_RT_SOURCE_DIR}/lib
-I${COMPILER_RT_SOURCE_DIR}/lib/interception
-fno-rtti
- -O2
-Werror=sign-compare)
set(INTERCEPTION_TEST_LINK_FLAGS_COMMON
@@ -26,14 +25,7 @@ set(INTERCEPTION_TEST_LINK_FLAGS_COMMON
${COMPILER_RT_UNWINDER_LINK_LIBS}
${SANITIZER_TEST_CXX_LIBRARIES})
-# -gline-tables-only must be enough for these tests, so use it if possible.
-if(COMPILER_RT_TEST_COMPILER_ID MATCHES "Clang")
- list(APPEND INTERCEPTION_TEST_CFLAGS_COMMON -gline-tables-only)
-else()
- list(APPEND INTERCEPTION_TEST_CFLAGS_COMMON -g)
-endif()
if(MSVC)
- list(APPEND INTERCEPTION_TEST_CFLAGS_COMMON -gcodeview)
list(APPEND INTERCEPTION_TEST_LINK_FLAGS_COMMON
-Wl,-largeaddressaware
-Wl,-nodefaultlib:libcmt,-defaultlib:msvcrt,-defaultlib:oldnames
diff --git a/compiler-rt/lib/msan/tests/CMakeLists.txt b/compiler-rt/lib/msan/tests/CMakeLists.txt
index 6c0520d984263..ba78ec50cd26e 100644
--- a/compiler-rt/lib/msan/tests/CMakeLists.txt
+++ b/compiler-rt/lib/msan/tests/CMakeLists.txt
@@ -33,7 +33,6 @@ set(MSAN_UNITTEST_COMMON_CFLAGS
-I${COMPILER_RT_SOURCE_DIR}/lib
-I${COMPILER_RT_SOURCE_DIR}/lib/msan
-g
- -O2
-fno-omit-frame-pointer
-mno-omit-leaf-frame-pointer
-Wno-deprecated-declarations
diff --git a/compiler-rt/lib/sanitizer_common/tests/CMakeLists.txt b/compiler-rt/lib/sanitizer_common/tests/CMakeLists.txt
index 41b89aa43134f..f6b49e8fc760f 100644
--- a/compiler-rt/lib/sanitizer_common/tests/CMakeLists.txt
+++ b/compiler-rt/lib/sanitizer_common/tests/CMakeLists.txt
@@ -67,7 +67,6 @@ set(SANITIZER_TEST_CFLAGS_COMMON
-I${COMPILER_RT_SOURCE_DIR}/lib
-I${COMPILER_RT_SOURCE_DIR}/lib/sanitizer_common
-fno-rtti
- -O2
-Werror=sign-compare
-Wno-gnu-zero-variadic-macro-arguments
)
@@ -76,16 +75,6 @@ set(SANITIZER_TEST_LINK_FLAGS_COMMON
${COMPILER_RT_UNITTEST_LINK_FLAGS}
${COMPILER_RT_UNWINDER_LINK_LIBS}
${SANITIZER_TEST_CXX_LIBRARIES})
-
-# -gline-tables-only must be enough for these tests, so use it if possible.
-if(COMPILER_RT_TEST_COMPILER_ID MATCHES "Clang")
- list(APPEND SANITIZER_TEST_CFLAGS_COMMON -gline-tables-only)
-else()
- list(APPEND SANITIZER_TEST_CFLAGS_COMMON -g)
-endif()
-if(MSVC)
- list(APPEND SANITIZER_TEST_CFLAGS_COMMON -gcodeview)
-endif()
list(APPEND SANITIZER_TEST_LINK_FLAGS_COMMON -g)
if(NOT MSVC)
diff --git a/compiler-rt/lib/sanitizer_common/tests/sanitizer_type_traits_test.cpp b/compiler-rt/lib/sanitizer_common/tests/sanitizer_type_traits_test.cpp
index d6c3ad4b8661d..c28ce7a0b402d 100644
--- a/compiler-rt/lib/sanitizer_common/tests/sanitizer_type_traits_test.cpp
+++ b/compiler-rt/lib/sanitizer_common/tests/sanitizer_type_traits_test.cpp
@@ -69,15 +69,21 @@ struct TestStruct {
};
TEST(SanitizerCommon, IsTriviallyDestructible) {
+ // Causes undefined references to __sanitizer::integral_constant<bool,
+ // true>::value.
+#if !SANITIZER_DEBUG
ASSERT_TRUE((is_trivially_destructible<int>::value));
ASSERT_TRUE((is_trivially_destructible<TestStruct>::value));
+#endif
ASSERT_FALSE((is_trivially_destructible<std::vector<int>>::value));
}
TEST(SanitizerCommon, IsTriviallyCopyable) {
+#if !SANITIZER_DEBUG
ASSERT_TRUE((is_trivially_copyable<int>::value));
ASSERT_TRUE((is_trivially_copyable<TestStruct>::value));
+#endif
ASSERT_FALSE((is_trivially_copyable<std::vector<int>>::value));
}
-} // namespace __sanitizer
\ No newline at end of file
+} // namespace __sanitizer
More information about the llvm-commits
mailing list