Author: Chelsea Cassanova Date: 2024-04-11T20:21:16-07:00 New Revision: c1a44568911b75c98675a3c19a55b4741d861437
URL: https://github.com/llvm/llvm-project/commit/c1a44568911b75c98675a3c19a55b4741d861437 DIFF: https://github.com/llvm/llvm-project/commit/c1a44568911b75c98675a3c19a55b4741d861437.diff LOG: Reland "[lldb][lit] Add MallocNanoZone envvar to Darwin ASan builds" … (#88442) …(#88436)" This reverts commit 1f5d130df85c2d0550dc8687ad0fa1d96856c318. The original commit checks that the host system is "Darwin" before setting the `MallocNanoZone` envvar, but on the Shell lit config this attribute does not exist at the point where it is being checked which leads to a build failure. This commit checks the host OS correctly. Added: Modified: lldb/test/API/lit.cfg.py lldb/test/Shell/lit.cfg.py Removed: ################################################################################ diff --git a/lldb/test/API/lit.cfg.py b/lldb/test/API/lit.cfg.py index f9497b632fc504..9ea389c639a013 100644 --- a/lldb/test/API/lit.cfg.py +++ b/lldb/test/API/lit.cfg.py @@ -121,6 +121,7 @@ def delete_module_cache(path): config.environment["DYLD_INSERT_LIBRARIES"] = find_sanitizer_runtime( "libclang_rt.asan_osx_dynamic.dylib" ) + config.environment["MallocNanoZone"] = "0" if "Thread" in config.llvm_use_sanitizer: config.environment["TSAN_OPTIONS"] = "halt_on_error=1" diff --git a/lldb/test/Shell/lit.cfg.py b/lldb/test/Shell/lit.cfg.py index 31afe5151c0661..290569576ac80d 100644 --- a/lldb/test/Shell/lit.cfg.py +++ b/lldb/test/Shell/lit.cfg.py @@ -52,6 +52,8 @@ # Enable sanitizer runtime flags. config.environment["ASAN_OPTIONS"] = "detect_stack_use_after_return=1" config.environment["TSAN_OPTIONS"] = "halt_on_error=1" +if platform.system() == "Darwin": + config.environment["MallocNanoZone"] = "0" # Support running the test suite under the lldb-repro wrapper. This makes it # possible to capture a test suite run and then rerun all the test from the _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
