diff options
| -rw-r--r-- | lib/asan/asan_blacklist.txt | 2 | ||||
| -rw-r--r-- | lib/msan/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | lib/msan/lit_tests/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | lib/msan/lit_tests/default_blacklist.cc | 3 | ||||
| -rw-r--r-- | lib/msan/msan_blacklist.txt | 7 |
5 files changed, 15 insertions, 2 deletions
diff --git a/lib/asan/asan_blacklist.txt b/lib/asan/asan_blacklist.txt index 0ee0b5dd8..03da08598 100644 --- a/lib/asan/asan_blacklist.txt +++ b/lib/asan/asan_blacklist.txt @@ -3,7 +3,7 @@ # at compile-time using -fsanitize-blacklist=<path> flag. # Example usage: -# fun:*_ZN4base6subtle* +# fun:*bad_function_name* # src:file_with_tricky_code.cc # global:*global_with_bad_access_or_initialization* # global-init:*global_with_initialization_issues* diff --git a/lib/msan/CMakeLists.txt b/lib/msan/CMakeLists.txt index 7577948b9..0671b59c0 100644 --- a/lib/msan/CMakeLists.txt +++ b/lib/msan/CMakeLists.txt @@ -30,6 +30,8 @@ if(CAN_TARGET_${arch}) list(APPEND MSAN_RUNTIME_LIBRARIES clang_rt.msan-${arch}) endif() +add_compiler_rt_resource_file(msan_blacklist msan_blacklist.txt) + if(LLVM_INCLUDE_TESTS) add_subdirectory(tests) endif() diff --git a/lib/msan/lit_tests/CMakeLists.txt b/lib/msan/lit_tests/CMakeLists.txt index 8d419de37..ed2da6b83 100644 --- a/lib/msan/lit_tests/CMakeLists.txt +++ b/lib/msan/lit_tests/CMakeLists.txt @@ -15,7 +15,8 @@ if(COMPILER_RT_CAN_EXECUTE_TESTS) # Run MSan tests only if we're sure we may produce working binaries. set(MSAN_TEST_DEPS ${SANITIZER_COMMON_LIT_TEST_DEPS} - ${MSAN_RUNTIME_LIBRARIES}) + ${MSAN_RUNTIME_LIBRARIES} + msan_blacklist) set(MSAN_TEST_PARAMS msan_site_config=${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg ) diff --git a/lib/msan/lit_tests/default_blacklist.cc b/lib/msan/lit_tests/default_blacklist.cc new file mode 100644 index 000000000..32cc02257 --- /dev/null +++ b/lib/msan/lit_tests/default_blacklist.cc @@ -0,0 +1,3 @@ +// Test that MSan uses the default blacklist from resource directory. +// RUN: %clangxx_msan -### %s 2>&1 | FileCheck %s +// CHECK: fsanitize-blacklist={{.*}}msan_blacklist.txt diff --git a/lib/msan/msan_blacklist.txt b/lib/msan/msan_blacklist.txt new file mode 100644 index 000000000..44a5680d4 --- /dev/null +++ b/lib/msan/msan_blacklist.txt @@ -0,0 +1,7 @@ +# Blacklist for MemorySanitizer. Turns off instrumentation of particular +# functions or sources. Use with care. You may set location of blacklist +# at compile-time using -fsanitize-blacklist=<path> flag. + +# Example usage: +# fun:*bad_function_name* +# src:file_with_tricky_code.cc |