[compiler-rt] [asan][windows][tests] support MSVC compiler-id in asan tests (PR #109706)

Charlie Barto via llvm-commits llvm-commits at lists.llvm.org
Mon Sep 23 12:03:55 PDT 2024


https://github.com/barcharcraz created https://github.com/llvm/llvm-project/pull/109706

This follows up on https://github.com/llvm/llvm-project/pull/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.

>From 7d5433c17251662d99e8074e0ae1b578e89f868d Mon Sep 17 00:00:00 2001
From: Charlie Barto <chbarto at microsoft.com>
Date: Tue, 12 Mar 2024 10:19:14 -0700
Subject: [PATCH] support MSVC compiler-id in asan tests

First, don't pass arguments that "real" msvc doesn't understand
Second, add the compiler-rt lib directory to the LIB environment variable
---
 compiler-rt/test/asan/lit.cfg.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

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"]
 



More information about the llvm-commits mailing list