[asan][windows][tests] support MSVC compiler-id in asan tests

[barcharcraz]

This follows up on #108255 to allow actually running the test suite with MSVC. Note, however, that MSVC can't yet build compiler-rt, most tests don't yet pass with msvc, and building and testing with different compilers is ill-supported. Follow ups will fix the first two issues, the third is future work.

Note that /Zi is removed from the clang-cl command line, but lit as a whole adds -gcodeview, so there should still be debug info.

[llvmbot]

@llvm/pr-subscribers-compiler-rt-sanitizer

@llvm/pr-subscribers-platform-windows

Author: Charlie Barto (barcharcraz)

Changes

This follows up on #108255 to allow actually running the test suite with MSVC. Note, however, that MSVC can't yet build compiler-rt, most tests don't yet pass with msvc, and building and testing with different compilers is ill-supported. Follow ups will fix the first two issues, the third is future work.

Note that /Zi is removed from the clang-cl command line, but lit as a whole adds -gcodeview, so there should still be debug info.

---

Full diff: https://github.com/llvm/llvm-project/pull/109706.diff

1 Files Affected:

• (modified) compiler-rt/test/asan/lit.cfg.py (+9-3)

diff --git a/compiler-rt/test/asan/lit.cfg.py b/compiler-rt/test/asan/lit.cfg.py
index 05ed7e8dd294e3..91351d12fd5f3e 100644
--- a/compiler-rt/test/asan/lit.cfg.py
+++ b/compiler-rt/test/asan/lit.cfg.py
@@ -154,11 +154,11 @@ def build_invocation(compile_flags, with_lto=False):
     # MSVC-specific tests might also use the clang-cl.exe driver.
     if target_is_msvc:
         clang_cl_cxxflags = [
-            "-Wno-deprecated-declarations",
             "-WX",
             "-D_HAS_EXCEPTIONS=0",
-            "-Zi",
-        ] + target_cflags
+        ] + config.debug_info_flags + target_cflags
+        if config.compiler_id != "MSVC":
+            clang_cl_cxxflags = ["-Wno-deprecated-declarations"] + clang_cl_cxxflags
         clang_cl_asan_cxxflags = ["-fsanitize=address"] + clang_cl_cxxflags
         if config.asan_dynamic:
             clang_cl_asan_cxxflags.append("-MD")
@@ -286,6 +286,12 @@ def build_invocation(compile_flags, with_lto=False):
         [config.compiler_rt_libdir, os.environ.get("PATH", "")]
     )
 
+# msvc needs to be instructed where the compiler-rt libraries are
+if config.compiler_id == "MSVC":
+    config.environment["LIB"] = os.path.pathsep.join(
+        [config.compiler_rt_libdir, config.environment.get("LIB", "")]
+    )
+
 # Default test suffixes.
 config.suffixes = [".c", ".cpp"]
 

[github-actions]

✅ With the latest revision this PR passed the Python code formatter.