Merge pull request swiftlang#9413 from adrian-prantl/user-poison

User poison

Author: adrian-prantl

lldb/test/API/lit.cfg.py

@@ -135,6 +135,11 @@ def delete_module_cache(path):
         config.environment[
             "ASAN_OPTIONS"
         ] = "detect_container_overflow=0:detect_stack_use_after_return=1"
+        # FIXME: This is the wrong place to disable this. This is working
+        # around the fact that the ci.swift.org scripts build only LLDB with
+        # asan and this creates an ODR violation in Allocator.h that breaks
+        # poisoning.
+        config.environment['ASAN_OPTIONS'] += ':' + 'allow_user_poisoning=0'
         # End Swift mod.
         if "Darwin" in config.host_os:
             config.environment["DYLD_INSERT_LIBRARIES"] = find_sanitizer_runtime(

lldb/test/Shell/lit.cfg.py

@@ -58,6 +58,11 @@
     config.environment[
         "ASAN_OPTIONS"
     ] = "detect_container_overflow=0:detect_stack_use_after_return=1"
+    # FIXME: This is the wrong place to disable this. This is working
+    # around the fact that the ci.swift.org scripts build only LLDB with
+    # asan and this creates an ODR violation in Allocator.h that breaks
+    # poisoning.
+    config.environment['ASAN_OPTIONS'] += ':' + 'allow_user_poisoning=0'
     # End Swift mod.
     if platform.system() == "Darwin":
         config.environment["MallocNanoZone"] = "0"