From 1f2d945f29950e6c794d013df58f256d48c90139 Mon Sep 17 00:00:00 2001 From: Vitaly Buka Date: Tue, 25 Apr 2023 23:15:34 -0700 Subject: [PATCH] [HWASAN] Run sanitizer_common tests ninja check-sanitizer will run tests with hwasan as well Reviewed By: kstoimenov Differential Revision: https://reviews.llvm.org/D149234 --- compiler-rt/test/sanitizer_common/CMakeLists.txt | 2 +- compiler-rt/test/sanitizer_common/lit.common.cfg.py | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/compiler-rt/test/sanitizer_common/CMakeLists.txt b/compiler-rt/test/sanitizer_common/CMakeLists.txt index f28ab0f..f2df8ce 100644 --- a/compiler-rt/test/sanitizer_common/CMakeLists.txt +++ b/compiler-rt/test/sanitizer_common/CMakeLists.txt @@ -7,7 +7,7 @@ set(SANITIZER_COMMON_TESTSUITES) # FIXME(dliew): We should switch to COMPILER_RT_SANITIZERS_TO_BUILD instead of # the hard coded `SUPPORTED_TOOLS_INIT` list once we know that the other # sanitizers work. -set(SUPPORTED_TOOLS_INIT asan lsan msan tsan ubsan) +set(SUPPORTED_TOOLS_INIT asan lsan hwasan msan tsan ubsan) set(SUPPORTED_TOOLS) foreach(SANITIZER_TOOL ${SUPPORTED_TOOLS_INIT}) string(TOUPPER ${SANITIZER_TOOL} SANITIZER_TOOL_UPPER) diff --git a/compiler-rt/test/sanitizer_common/lit.common.cfg.py b/compiler-rt/test/sanitizer_common/lit.common.cfg.py index 13a21c6..7d7262b 100644 --- a/compiler-rt/test/sanitizer_common/lit.common.cfg.py +++ b/compiler-rt/test/sanitizer_common/lit.common.cfg.py @@ -10,6 +10,11 @@ collect_stack_traces = "" if config.tool_name == "asan": tool_cflags = ["-fsanitize=address"] tool_options = "ASAN_OPTIONS" +elif config.tool_name == "hwasan": + tool_cflags = ["-fsanitize=hwaddress", "-fuse-ld=lld"] + if config.target_arch == "x86_64": + tool_cflags += ["-fsanitize-hwaddress-experimental-aliasing"] + tool_options = "HWASAN_OPTIONS" elif config.tool_name == "tsan": tool_cflags = ["-fsanitize=thread"] tool_options = "TSAN_OPTIONS" -- 2.7.4