[compiler-rt] [llvm] Add cmake option to enable/disable searching PATH for symbolizer (PR #129012)
via llvm-commits
llvm-commits at lists.llvm.org
Wed Mar 12 04:18:51 PDT 2025
https://github.com/midhuncodes7 updated https://github.com/llvm/llvm-project/pull/129012
>From 12cd6b8de54add6a82226457faaf9697873c1c32 Mon Sep 17 00:00:00 2001
From: Midhunesh <midhunesh.p at ibm.com>
Date: Mon, 17 Feb 2025 22:02:56 +0530
Subject: [PATCH 01/11] option to enable/disable PATH search for symbolizer
---
compiler-rt/CMakeLists.txt | 7 ++++
.../sanitizer_symbolizer_posix_libcdep.cpp | 35 +++++++++++--------
.../TestCases/disable_symbolizer_path_search | 29 +++++++++++++++
3 files changed, 56 insertions(+), 15 deletions(-)
create mode 100644 compiler-rt/test/sanitizer_common/TestCases/disable_symbolizer_path_search
diff --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt
index 2c52788de56af..45f651fb7338e 100644
--- a/compiler-rt/CMakeLists.txt
+++ b/compiler-rt/CMakeLists.txt
@@ -830,6 +830,13 @@ pythonize_bool(COMPILER_RT_TEST_USE_LLD)
option(COMPILER_RT_ENABLE_INTERNAL_SYMBOLIZER "Build Compiler RT linked with in LLVM symbolizer" OFF)
mark_as_advanced(COMPILER_RT_ENABLE_INTERNAL_SYMBOLIZER)
+option(SANITIZER_DISABLE_SYMBOLIZER_PATH_SEARCH "Disable searching for external symbolizer in $PATH" OFF)
+mark_as_advanced(SANITIZER_DISABLE_SYMBOLIZER_PATH_SEARCH)
+
+if (SANITIZER_DISABLE_SYMBOLIZER_PATH_SEARCH)
+ add_definitions(-DSANITIZER_DISABLE_SYMBOLIZER_PATH_SEARCH)
+endif()
+
add_subdirectory(lib)
if(COMPILER_RT_INCLUDE_TESTS)
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp
index 0ddc24802d216..c37d5a670c8d2 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp
@@ -443,23 +443,28 @@ static SymbolizerTool *ChooseExternalSymbolizer(LowLevelAllocator *allocator) {
}
// Otherwise symbolizer program is unknown, let's search $PATH
+#ifdef SANITIZER_DISABLE_SYMBOLIZER_PATH_SEARCH
+ VReport(2, "Symbolizer path search is disabled\n");
+ return nullptr;
+#else
CHECK(path == nullptr);
-#if SANITIZER_APPLE
- if (const char *found_path = FindPathToBinary("atos")) {
- VReport(2, "Using atos found at: %s\n", found_path);
- return new(*allocator) AtosSymbolizer(found_path, allocator);
- }
-#endif // SANITIZER_APPLE
- if (const char *found_path = FindPathToBinary("llvm-symbolizer")) {
- VReport(2, "Using llvm-symbolizer found at: %s\n", found_path);
- return new(*allocator) LLVMSymbolizer(found_path, allocator);
- }
- if (common_flags()->allow_addr2line) {
- if (const char *found_path = FindPathToBinary("addr2line")) {
- VReport(2, "Using addr2line found at: %s\n", found_path);
- return new(*allocator) Addr2LinePool(found_path, allocator);
+ #if SANITIZER_APPLE
+ if (const char *found_path = FindPathToBinary("atos")) {
+ VReport(2, "Using atos found at: %s\n", found_path);
+ return new(*allocator) AtosSymbolizer(found_path, allocator);
}
- }
+ #endif // SANITIZER_APPLE
+ if (const char *found_path = FindPathToBinary("llvm-symbolizer")) {
+ VReport(2, "Using llvm-symbolizer found at: %s\n", found_path);
+ return new(*allocator) LLVMSymbolizer(found_path, allocator);
+ }
+ if (common_flags()->allow_addr2line) {
+ if (const char *found_path = FindPathToBinary("addr2line")) {
+ VReport(2, "Using addr2line found at: %s\n", found_path);
+ return new(*allocator) Addr2LinePool(found_path, allocator);
+ }
+ }
+#endif // SANITIZER_DISABLE_SYMBOLIZER_PATH_SEARCH
return nullptr;
}
diff --git a/compiler-rt/test/sanitizer_common/TestCases/disable_symbolizer_path_search b/compiler-rt/test/sanitizer_common/TestCases/disable_symbolizer_path_search
new file mode 100644
index 0000000000000..0e190f00a2a84
--- /dev/null
+++ b/compiler-rt/test/sanitizer_common/TestCases/disable_symbolizer_path_search
@@ -0,0 +1,29 @@
+// REQUIRES: static-libs
+
+// RUN: %clangxx %s -o %t -DDISABLE_SYMBOLIZER_PATH_SEARCH=1
+// RUN: %run %t 2>&1 | FileCheck %s --check-prefix=CHECK
+
+// RUN: %clangxx %s -o %t -DDISABLE_SYMBOLIZER_PATH_SEARCH=0
+// RUN: %run %t 2>&1 | FileCheck %s --check-prefix=CHECK-ALLOCATOR
+
+// REQUIRES: shell
+
+// Mobile device will not have symbolizer in provided path.
+// UNSUPPORTED: ios, android
+
+#include <sanitizer/common_interface_defs.h>
+#include <stdio.h>
+
+static void Symbolize() {
+ char buffer[100];
+ __sanitizer_symbolize_pc(__builtin_return_address(0), "%p %F %L", buffer,
+ sizeof(buffer));
+ printf("%s\n", buffer);
+}
+
+int main() {
+ Symbolize();
+}
+
+// CHECK: Symbolizer path search is disabled
+// CHECK-ALLOCATOR: {{0x.* in main}}
>From 9e2978cd7ce72a70cdde82c3fb118c3221298b3b Mon Sep 17 00:00:00 2001
From: Midhunesh <midhunesh.p at ibm.com>
Date: Mon, 24 Feb 2025 11:49:56 +0530
Subject: [PATCH 02/11] comments fix
---
compiler-rt/CMakeLists.txt | 2 +-
.../lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt
index 45f651fb7338e..67133b62cd047 100644
--- a/compiler-rt/CMakeLists.txt
+++ b/compiler-rt/CMakeLists.txt
@@ -834,7 +834,7 @@ option(SANITIZER_DISABLE_SYMBOLIZER_PATH_SEARCH "Disable searching for external
mark_as_advanced(SANITIZER_DISABLE_SYMBOLIZER_PATH_SEARCH)
if (SANITIZER_DISABLE_SYMBOLIZER_PATH_SEARCH)
- add_definitions(-DSANITIZER_DISABLE_SYMBOLIZER_PATH_SEARCH)
+ add_compile_definitions(SANITIZER_DISABLE_SYMBOLIZER_PATH_SEARCH)
endif()
add_subdirectory(lib)
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp
index c37d5a670c8d2..7febcf6d4ff00 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp
@@ -444,7 +444,7 @@ static SymbolizerTool *ChooseExternalSymbolizer(LowLevelAllocator *allocator) {
// Otherwise symbolizer program is unknown, let's search $PATH
#ifdef SANITIZER_DISABLE_SYMBOLIZER_PATH_SEARCH
- VReport(2, "Symbolizer path search is disabled\n");
+ VReport(2, "Symbolizer path search is disabled in the runtime build configuration\n");
return nullptr;
#else
CHECK(path == nullptr);
>From e97f75dd31a6027e725fd4f0fed303f6978b8b33 Mon Sep 17 00:00:00 2001
From: Midhunesh <midhunesh.p at ibm.com>
Date: Tue, 25 Feb 2025 09:00:38 +0530
Subject: [PATCH 03/11] test file removed
---
.../TestCases/disable_symbolizer_path_search | 29 -------------------
1 file changed, 29 deletions(-)
delete mode 100644 compiler-rt/test/sanitizer_common/TestCases/disable_symbolizer_path_search
diff --git a/compiler-rt/test/sanitizer_common/TestCases/disable_symbolizer_path_search b/compiler-rt/test/sanitizer_common/TestCases/disable_symbolizer_path_search
deleted file mode 100644
index 0e190f00a2a84..0000000000000
--- a/compiler-rt/test/sanitizer_common/TestCases/disable_symbolizer_path_search
+++ /dev/null
@@ -1,29 +0,0 @@
-// REQUIRES: static-libs
-
-// RUN: %clangxx %s -o %t -DDISABLE_SYMBOLIZER_PATH_SEARCH=1
-// RUN: %run %t 2>&1 | FileCheck %s --check-prefix=CHECK
-
-// RUN: %clangxx %s -o %t -DDISABLE_SYMBOLIZER_PATH_SEARCH=0
-// RUN: %run %t 2>&1 | FileCheck %s --check-prefix=CHECK-ALLOCATOR
-
-// REQUIRES: shell
-
-// Mobile device will not have symbolizer in provided path.
-// UNSUPPORTED: ios, android
-
-#include <sanitizer/common_interface_defs.h>
-#include <stdio.h>
-
-static void Symbolize() {
- char buffer[100];
- __sanitizer_symbolize_pc(__builtin_return_address(0), "%p %F %L", buffer,
- sizeof(buffer));
- printf("%s\n", buffer);
-}
-
-int main() {
- Symbolize();
-}
-
-// CHECK: Symbolizer path search is disabled
-// CHECK-ALLOCATOR: {{0x.* in main}}
>From 31d9cfc7770b1b516f8832eb5c6feb7d0b9a7df4 Mon Sep 17 00:00:00 2001
From: Midhunesh <midhunesh.p at ibm.com>
Date: Wed, 5 Mar 2025 21:17:05 +0530
Subject: [PATCH 04/11] format fix
---
compiler-rt/CMakeLists.txt | 2 +-
.../sanitizer_symbolizer_posix_libcdep.cpp | 37 ++++++++++---------
2 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt
index 67133b62cd047..f319113e5c16e 100644
--- a/compiler-rt/CMakeLists.txt
+++ b/compiler-rt/CMakeLists.txt
@@ -834,7 +834,7 @@ option(SANITIZER_DISABLE_SYMBOLIZER_PATH_SEARCH "Disable searching for external
mark_as_advanced(SANITIZER_DISABLE_SYMBOLIZER_PATH_SEARCH)
if (SANITIZER_DISABLE_SYMBOLIZER_PATH_SEARCH)
- add_compile_definitions(SANITIZER_DISABLE_SYMBOLIZER_PATH_SEARCH)
+ add_compile_definitions(SANITIZER_DISABLE_SYMBOLIZER_PATH_SEARCH)
endif()
add_subdirectory(lib)
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp
index 7febcf6d4ff00..aeb9640517465 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp
@@ -444,28 +444,29 @@ static SymbolizerTool *ChooseExternalSymbolizer(LowLevelAllocator *allocator) {
// Otherwise symbolizer program is unknown, let's search $PATH
#ifdef SANITIZER_DISABLE_SYMBOLIZER_PATH_SEARCH
- VReport(2, "Symbolizer path search is disabled in the runtime build configuration\n");
+ VReport(2, "Symbolizer path search is disabled in the runtime "
+ "build configuration.\n");
return nullptr;
#else
CHECK(path == nullptr);
- #if SANITIZER_APPLE
- if (const char *found_path = FindPathToBinary("atos")) {
- VReport(2, "Using atos found at: %s\n", found_path);
- return new(*allocator) AtosSymbolizer(found_path, allocator);
- }
- #endif // SANITIZER_APPLE
- if (const char *found_path = FindPathToBinary("llvm-symbolizer")) {
- VReport(2, "Using llvm-symbolizer found at: %s\n", found_path);
- return new(*allocator) LLVMSymbolizer(found_path, allocator);
- }
- if (common_flags()->allow_addr2line) {
- if (const char *found_path = FindPathToBinary("addr2line")) {
- VReport(2, "Using addr2line found at: %s\n", found_path);
- return new(*allocator) Addr2LinePool(found_path, allocator);
- }
- }
-#endif // SANITIZER_DISABLE_SYMBOLIZER_PATH_SEARCH
+ #if SANITIZER_APPLE
+ if (const char *found_path = FindPathToBinary("atos")) {
+ VReport(2, "Using atos found at: %s\n", found_path);
+ return new(*allocator) AtosSymbolizer(found_path, allocator);
+ }
+ #endif // SANITIZER_APPLE
+ if (const char *found_path = FindPathToBinary("llvm-symbolizer")) {
+ VReport(2, "Using llvm-symbolizer found at: %s\n", found_path);
+ return new(*allocator) LLVMSymbolizer(found_path, allocator);
+ }
+ if (common_flags()->allow_addr2line) {
+ if (const char *found_path = FindPathToBinary("addr2line")) {
+ VReport(2, "Using addr2line found at: %s\n", found_path);
+ return new(*allocator) Addr2LinePool(found_path, allocator);
+ }
+ }
return nullptr;
+#endif // SANITIZER_DISABLE_SYMBOLIZER_PATH_SEARCH
}
static void ChooseSymbolizerTools(IntrusiveList<SymbolizerTool> *list,
>From cc82c3ab4828d3e7ca72a7511799cf36ab7bb676 Mon Sep 17 00:00:00 2001
From: Midhunesh <midhunesh.p at ibm.com>
Date: Wed, 5 Mar 2025 21:20:15 +0530
Subject: [PATCH 05/11] format fix
---
.../lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp
index aeb9640517465..be0f7936c8409 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp
@@ -449,7 +449,7 @@ static SymbolizerTool *ChooseExternalSymbolizer(LowLevelAllocator *allocator) {
return nullptr;
#else
CHECK(path == nullptr);
- #if SANITIZER_APPLE
+#if SANITIZER_APPLE
if (const char *found_path = FindPathToBinary("atos")) {
VReport(2, "Using atos found at: %s\n", found_path);
return new(*allocator) AtosSymbolizer(found_path, allocator);
>From b51307d9c39cc2465ef5f93599cd11aaafbd2223 Mon Sep 17 00:00:00 2001
From: Midhunesh <midhunesh.p at ibm.com>
Date: Wed, 5 Mar 2025 21:22:54 +0530
Subject: [PATCH 06/11] format fix
---
.../sanitizer_symbolizer_posix_libcdep.cpp | 30 +++++++++----------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp
index be0f7936c8409..1b6845d0a1b4d 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp
@@ -450,21 +450,21 @@ static SymbolizerTool *ChooseExternalSymbolizer(LowLevelAllocator *allocator) {
#else
CHECK(path == nullptr);
#if SANITIZER_APPLE
- if (const char *found_path = FindPathToBinary("atos")) {
- VReport(2, "Using atos found at: %s\n", found_path);
- return new(*allocator) AtosSymbolizer(found_path, allocator);
- }
- #endif // SANITIZER_APPLE
- if (const char *found_path = FindPathToBinary("llvm-symbolizer")) {
- VReport(2, "Using llvm-symbolizer found at: %s\n", found_path);
- return new(*allocator) LLVMSymbolizer(found_path, allocator);
- }
- if (common_flags()->allow_addr2line) {
- if (const char *found_path = FindPathToBinary("addr2line")) {
- VReport(2, "Using addr2line found at: %s\n", found_path);
- return new(*allocator) Addr2LinePool(found_path, allocator);
- }
- }
+ if (const char *found_path = FindPathToBinary("atos")) {
+ VReport(2, "Using atos found at: %s\n", found_path);
+ return new(*allocator) AtosSymbolizer(found_path, allocator);
+ }
+#endif // SANITIZER_APPLE
+ if (const char *found_path = FindPathToBinary("llvm-symbolizer")) {
+ VReport(2, "Using llvm-symbolizer found at: %s\n", found_path);
+ return new(*allocator) LLVMSymbolizer(found_path, allocator);
+ }
+ if (common_flags()->allow_addr2line) {
+ if (const char *found_path = FindPathToBinary("addr2line")) {
+ VReport(2, "Using addr2line found at: %s\n", found_path);
+ return new(*allocator) Addr2LinePool(found_path, allocator);
+ }
+ }
return nullptr;
#endif // SANITIZER_DISABLE_SYMBOLIZER_PATH_SEARCH
}
>From 4f48babe7ee1ee48ccbf094d5b31eb1d432b5419 Mon Sep 17 00:00:00 2001
From: Midhunesh <midhunesh.p at ibm.com>
Date: Tue, 11 Mar 2025 09:00:09 +0530
Subject: [PATCH 07/11] upstream changes
---
compiler-rt/test/lit.common.configured.in | 1 +
.../test/sanitizer_common/lit.common.cfg.py | 18 ++++++++++++++++++
.../gn/secondary/compiler-rt/test/BUILD.gn | 1 +
3 files changed, 20 insertions(+)
diff --git a/compiler-rt/test/lit.common.configured.in b/compiler-rt/test/lit.common.configured.in
index 050792b6b2621..eff9e6708219d 100644
--- a/compiler-rt/test/lit.common.configured.in
+++ b/compiler-rt/test/lit.common.configured.in
@@ -72,6 +72,7 @@ else:
set_default("target_suffix", "-%s" % config.target_arch)
set_default("have_internal_symbolizer", @COMPILER_RT_ENABLE_INTERNAL_SYMBOLIZER_PYBOOL@)
+set_default("have_disable_symbolizer_path_search", @COMPILER_RT_DISABLE_SYMBOLIZER_PATH_SEARCH_PYBOOL@)
set_default("have_zlib", @ZLIB_FOUND_PYBOOL@)
set_default("zlib_include_dir", "@ZLIB_INCLUDE_DIR@")
set_default("zlib_library", "@ZLIB_LIBRARY@")
diff --git a/compiler-rt/test/sanitizer_common/lit.common.cfg.py b/compiler-rt/test/sanitizer_common/lit.common.cfg.py
index 5406e8838f2fc..74c25b87ba3b7 100644
--- a/compiler-rt/test/sanitizer_common/lit.common.cfg.py
+++ b/compiler-rt/test/sanitizer_common/lit.common.cfg.py
@@ -100,3 +100,21 @@ def build_invocation(compile_flags):
if config.host_os == "NetBSD":
config.substitutions.insert(0, ("%run", config.netbsd_noaslr_prefix))
+
+tool_symbolizer_path_map = {
+ "asan": "ASAN_SYMBOLIZER_PATH",
+ "hwasan": "HWASAN_SYMBOLIZER_PATH",
+ "rtsan": "RTSAN_SYMBOLIZER_PATH",
+ "tsan": "TSAN_SYMBOLIZER_PATH",
+ "msan": "MSAN_SYMBOLIZER_PATH",
+ "lsan": "LSAN_SYMBOLIZER_PATH",
+ "ubsan": "UBSAN_SYMBOLIZER_PATH"
+}
+
+if config.have_disable_symbolizer_path_search:
+ config.available_features.add("disable_symbolizer_path_search")
+
+if config.have_disable_symbolizer_path_search:
+ symbolizer_path = os.path.join(config.llvm_tools_dir, "llvm-symbolizer")
+ for sanitizer in tool_symbolizer_path_map.values():
+ config.environment[sanitizer] = symbolizer_path
\ No newline at end of file
diff --git a/llvm/utils/gn/secondary/compiler-rt/test/BUILD.gn b/llvm/utils/gn/secondary/compiler-rt/test/BUILD.gn
index 020f3e7d9acd7..803e3dbdb8933 100644
--- a/llvm/utils/gn/secondary/compiler-rt/test/BUILD.gn
+++ b/llvm/utils/gn/secondary/compiler-rt/test/BUILD.gn
@@ -53,6 +53,7 @@ write_cmake_config("lit_common_configured") {
"COMPILER_RT_BUILD_STANDALONE_LIBATOMIC_PYBOOL=False",
"COMPILER_RT_DEBUG_PYBOOL=False",
"COMPILER_RT_ENABLE_INTERNAL_SYMBOLIZER_PYBOOL=False",
+ "COMPILER_RT_DISABLE_SYMBOLIZER_PATH_SEARCH_PYBOOL=False",
"COMPILER_RT_HAS_NO_DEFAULT_CONFIG_FLAG_PYBOOL=True",
"COMPILER_RT_INTERCEPT_LIBDISPATCH_PYBOOL=False",
"COMPILER_RT_RESOLVED_EXEC_OUTPUT_DIR=" +
>From 3dcab674306b4d741bcfb7ce175c464fcb9ca4cb Mon Sep 17 00:00:00 2001
From: Midhunesh <midhunesh.p at ibm.com>
Date: Tue, 11 Mar 2025 12:32:01 +0530
Subject: [PATCH 08/11] changes for test failure
---
compiler-rt/test/lit.common.configured.in | 2 +-
compiler-rt/test/sanitizer_common/lit.common.cfg.py | 3 ++-
llvm/utils/gn/secondary/compiler-rt/test/BUILD.gn | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/compiler-rt/test/lit.common.configured.in b/compiler-rt/test/lit.common.configured.in
index eff9e6708219d..019c594e4fece 100644
--- a/compiler-rt/test/lit.common.configured.in
+++ b/compiler-rt/test/lit.common.configured.in
@@ -72,7 +72,7 @@ else:
set_default("target_suffix", "-%s" % config.target_arch)
set_default("have_internal_symbolizer", @COMPILER_RT_ENABLE_INTERNAL_SYMBOLIZER_PYBOOL@)
-set_default("have_disable_symbolizer_path_search", @COMPILER_RT_DISABLE_SYMBOLIZER_PATH_SEARCH_PYBOOL@)
+set_default("have_disable_symbolizer_path_search", @SANITIZER_DISABLE_SYMBOLIZER_PATH_SEARCH_PYBOOL@)
set_default("have_zlib", @ZLIB_FOUND_PYBOOL@)
set_default("zlib_include_dir", "@ZLIB_INCLUDE_DIR@")
set_default("zlib_library", "@ZLIB_LIBRARY@")
diff --git a/compiler-rt/test/sanitizer_common/lit.common.cfg.py b/compiler-rt/test/sanitizer_common/lit.common.cfg.py
index 74c25b87ba3b7..1f0ec1f5d016d 100644
--- a/compiler-rt/test/sanitizer_common/lit.common.cfg.py
+++ b/compiler-rt/test/sanitizer_common/lit.common.cfg.py
@@ -117,4 +117,5 @@ def build_invocation(compile_flags):
if config.have_disable_symbolizer_path_search:
symbolizer_path = os.path.join(config.llvm_tools_dir, "llvm-symbolizer")
for sanitizer in tool_symbolizer_path_map.values():
- config.environment[sanitizer] = symbolizer_path
\ No newline at end of file
+ config.environment[sanitizer] = symbolizer_path
+
\ No newline at end of file
diff --git a/llvm/utils/gn/secondary/compiler-rt/test/BUILD.gn b/llvm/utils/gn/secondary/compiler-rt/test/BUILD.gn
index 803e3dbdb8933..a7ea1cf309b97 100644
--- a/llvm/utils/gn/secondary/compiler-rt/test/BUILD.gn
+++ b/llvm/utils/gn/secondary/compiler-rt/test/BUILD.gn
@@ -53,7 +53,7 @@ write_cmake_config("lit_common_configured") {
"COMPILER_RT_BUILD_STANDALONE_LIBATOMIC_PYBOOL=False",
"COMPILER_RT_DEBUG_PYBOOL=False",
"COMPILER_RT_ENABLE_INTERNAL_SYMBOLIZER_PYBOOL=False",
- "COMPILER_RT_DISABLE_SYMBOLIZER_PATH_SEARCH_PYBOOL=False",
+ "SANITIZER_DISABLE_SYMBOLIZER_PATH_SEARCH_PYBOOL=False",
"COMPILER_RT_HAS_NO_DEFAULT_CONFIG_FLAG_PYBOOL=True",
"COMPILER_RT_INTERCEPT_LIBDISPATCH_PYBOOL=False",
"COMPILER_RT_RESOLVED_EXEC_OUTPUT_DIR=" +
>From 9bab344995b9ead59cc0106437ce5777440c1b89 Mon Sep 17 00:00:00 2001
From: Midhunesh <midhunesh.p at ibm.com>
Date: Tue, 11 Mar 2025 14:58:56 +0530
Subject: [PATCH 09/11] changes for test failure
---
compiler-rt/test/lit.common.configured.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/compiler-rt/test/lit.common.configured.in b/compiler-rt/test/lit.common.configured.in
index 019c594e4fece..e26cff10a3050 100644
--- a/compiler-rt/test/lit.common.configured.in
+++ b/compiler-rt/test/lit.common.configured.in
@@ -72,7 +72,7 @@ else:
set_default("target_suffix", "-%s" % config.target_arch)
set_default("have_internal_symbolizer", @COMPILER_RT_ENABLE_INTERNAL_SYMBOLIZER_PYBOOL@)
-set_default("have_disable_symbolizer_path_search", @SANITIZER_DISABLE_SYMBOLIZER_PATH_SEARCH_PYBOOL@)
+set_default("have_disable_symbolizer_path_search", ON)
set_default("have_zlib", @ZLIB_FOUND_PYBOOL@)
set_default("zlib_include_dir", "@ZLIB_INCLUDE_DIR@")
set_default("zlib_library", "@ZLIB_LIBRARY@")
>From 9a358ebc9cbac36bdb65d8e59c772871270efa5e Mon Sep 17 00:00:00 2001
From: Midhunesh <midhunesh.p at ibm.com>
Date: Tue, 11 Mar 2025 15:27:04 +0530
Subject: [PATCH 10/11] changes for test failure
---
compiler-rt/test/CMakeLists.txt | 2 ++
compiler-rt/test/lit.common.configured.in | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/compiler-rt/test/CMakeLists.txt b/compiler-rt/test/CMakeLists.txt
index f9e23710d3e4f..fad5b7e03925e 100644
--- a/compiler-rt/test/CMakeLists.txt
+++ b/compiler-rt/test/CMakeLists.txt
@@ -10,6 +10,8 @@ pythonize_bool(COMPILER_RT_BUILD_STANDALONE_LIBATOMIC)
pythonize_bool(COMPILER_RT_ENABLE_INTERNAL_SYMBOLIZER)
+pythonize_bool(SANITIZER_DISABLE_SYMBOLIZER_PATH_SEARCH)
+
pythonize_bool(COMPILER_RT_HAS_AARCH64_SME)
pythonize_bool(COMPILER_RT_HAS_NO_DEFAULT_CONFIG_FLAG)
diff --git a/compiler-rt/test/lit.common.configured.in b/compiler-rt/test/lit.common.configured.in
index e26cff10a3050..019c594e4fece 100644
--- a/compiler-rt/test/lit.common.configured.in
+++ b/compiler-rt/test/lit.common.configured.in
@@ -72,7 +72,7 @@ else:
set_default("target_suffix", "-%s" % config.target_arch)
set_default("have_internal_symbolizer", @COMPILER_RT_ENABLE_INTERNAL_SYMBOLIZER_PYBOOL@)
-set_default("have_disable_symbolizer_path_search", ON)
+set_default("have_disable_symbolizer_path_search", @SANITIZER_DISABLE_SYMBOLIZER_PATH_SEARCH_PYBOOL@)
set_default("have_zlib", @ZLIB_FOUND_PYBOOL@)
set_default("zlib_include_dir", "@ZLIB_INCLUDE_DIR@")
set_default("zlib_library", "@ZLIB_LIBRARY@")
>From 38a5f1412341c13d82aeb9d8e24aad1d2f1a7811 Mon Sep 17 00:00:00 2001
From: Midhunesh <midhunesh.p at ibm.com>
Date: Wed, 12 Mar 2025 09:50:43 +0530
Subject: [PATCH 11/11] changes for test failure
---
compiler-rt/test/lit.common.cfg.py | 19 +++++++++++++++++++
.../test/sanitizer_common/lit.common.cfg.py | 19 -------------------
2 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/compiler-rt/test/lit.common.cfg.py b/compiler-rt/test/lit.common.cfg.py
index c6f27748ccb76..b403062055183 100644
--- a/compiler-rt/test/lit.common.cfg.py
+++ b/compiler-rt/test/lit.common.cfg.py
@@ -371,6 +371,25 @@ def get_ios_commands_dir():
config.compiler_rt_src_root, "test", "sanitizer_common", "ios_commands"
)
+# When cmake flag to disable path search is set, symbolizer is not allowed to search in $PATH,
+# need to specify it via XXX_SYMBOLIZER_PATH
+tool_symbolizer_path_map = {
+ "asan": "ASAN_SYMBOLIZER_PATH",
+ "hwasan": "HWASAN_SYMBOLIZER_PATH",
+ "rtsan": "RTSAN_SYMBOLIZER_PATH",
+ "tsan": "TSAN_SYMBOLIZER_PATH",
+ "msan": "MSAN_SYMBOLIZER_PATH",
+ "lsan": "LSAN_SYMBOLIZER_PATH",
+ "ubsan": "UBSAN_SYMBOLIZER_PATH"
+}
+
+if config.have_disable_symbolizer_path_search:
+ config.available_features.add("disable_symbolizer_path_search")
+
+if config.have_disable_symbolizer_path_search:
+ symbolizer_path = os.path.join(config.llvm_tools_dir, "llvm-symbolizer")
+ for sanitizer in tool_symbolizer_path_map.values():
+ config.environment[sanitizer] = symbolizer_path
# Allow tests to be executed on a simulator or remotely.
if emulator:
diff --git a/compiler-rt/test/sanitizer_common/lit.common.cfg.py b/compiler-rt/test/sanitizer_common/lit.common.cfg.py
index 1f0ec1f5d016d..5406e8838f2fc 100644
--- a/compiler-rt/test/sanitizer_common/lit.common.cfg.py
+++ b/compiler-rt/test/sanitizer_common/lit.common.cfg.py
@@ -100,22 +100,3 @@ def build_invocation(compile_flags):
if config.host_os == "NetBSD":
config.substitutions.insert(0, ("%run", config.netbsd_noaslr_prefix))
-
-tool_symbolizer_path_map = {
- "asan": "ASAN_SYMBOLIZER_PATH",
- "hwasan": "HWASAN_SYMBOLIZER_PATH",
- "rtsan": "RTSAN_SYMBOLIZER_PATH",
- "tsan": "TSAN_SYMBOLIZER_PATH",
- "msan": "MSAN_SYMBOLIZER_PATH",
- "lsan": "LSAN_SYMBOLIZER_PATH",
- "ubsan": "UBSAN_SYMBOLIZER_PATH"
-}
-
-if config.have_disable_symbolizer_path_search:
- config.available_features.add("disable_symbolizer_path_search")
-
-if config.have_disable_symbolizer_path_search:
- symbolizer_path = os.path.join(config.llvm_tools_dir, "llvm-symbolizer")
- for sanitizer in tool_symbolizer_path_map.values():
- config.environment[sanitizer] = symbolizer_path
-
\ No newline at end of file
More information about the llvm-commits
mailing list