[ASan tests] Add Windows-specific flags to lib/asan/tests/CMakeLists.txt

[timurrrr]

Summary

[CC Hans in case we can improve some things in the clang-cl driver]

[hans]

lib/asan/tests/CMakeLists.txt

75

I think adding -fsanitize-blacklist (and possible others) and -mllvm to clang-cl's supported flags would be reasonable.

[timurrrr]

I think adding -fsanitize-blacklist (and possible others) and -mllvm to
clang-cl's supported flags would be reasonable.

Sounds good!
I assume it shouldn't block my patch.

[kcc]

lib/asan/tests/CMakeLists.txt

74

Can you just remove these two lines (asan-stack and asan-globals)?

[timurrrr]

Removed two redundant lines per Kostya's comment.
These flags are now =1 by default.

lib/asan/tests/CMakeLists.txt

74

Done

[samsonov]

-Xclang is horrible. Please add a FIXME assigned to you to remove this as soon as the necessary flags are supported by clang-cl.

lib/asan/tests/CMakeLists.txt

77

Why do you need this? If there is no libstdc++ on Windows, you should instead detect this in the build system and introduce
COMPILER_RT_HAS_LIBSTDCXX like we do for libpthread and libdl.

106

ditto

[timurrrr]

OK, sounds reasonable.

Do I need to do another round of review when I address these three comments?

[samsonov]

Feel free to submit after addressing comments.

lib/asan/tests/CMakeLists.txt

34

You can use COMPILER_RT_HAS_G_FLAG / COMPILER_RT_HAS_Zi_FLAG here.

[timurrrr]

Landed everything except for one questionable if() in r208682.

lib/asan/tests/CMakeLists.txt

77

We had an offline discussion here and wonder why doesn't the driver itself pass this flag?

We also have to do if(NOT MSVC) for the recently-introduced --driver=g++ flag here anyways, so not clear if the extra variable is worth it.

(we can probably discuss that on the commit email)

[timurrrr]

OK, I've added COMPILER_RT_HAS_LIBSTDCXX in r208695.

lib/asan/tests/CMakeLists.txt

 set(ASAN_UNITTEST_COMMON_CFLAGS
   ${COMPILER_RT_GTEST_CFLAGS}
   -I${COMPILER_RT_SOURCE_DIR}/include
   -I${COMPILER_RT_SOURCE_DIR}/lib
   -I${COMPILER_RT_SOURCE_DIR}/lib/asan
   -I${COMPILER_RT_SOURCE_DIR}/lib/sanitizer_common/tests
   -Wno-format
   -Werror=sign-compare
-  -g
   -O2)
 append_if(COMPILER_RT_HAS_WNO_VARIADIC_MACROS_FLAG -Wno-variadic-macros ASAN_UNITTEST_COMMON_CFLAGS)
 
+if(NOT MSVC)
+  list(APPEND ASAN_UNITTEST_COMMON_CFLAGS -g)
+else()
+  list(APPEND ASAN_UNITTEST_COMMON_CFLAGS -Zi)
+
+  # System headers and gtest use a lot of deprecated stuff.
+  list(APPEND ASAN_UNITTEST_COMMON_CFLAGS
+       -Wno-deprecated-declarations)
+
+  # clang-cl doesn't support exceptions yet.
+  list(APPEND ASAN_UNITTEST_COMMON_CFLAGS
+       /fallback
+       -D_HAS_EXCEPTIONS=0)
+
+  # We should teach clang-cl to understand more pragmas.
+  list(APPEND ASAN_UNITTEST_COMMON_CFLAGS
+       -Wno-unknown-pragmas
+       -Wno-undefined-inline)
+endif()
+
 # Use -D instead of definitions to please custom compile command.
 list(APPEND ASAN_UNITTEST_COMMON_CFLAGS
   -DASAN_HAS_BLACKLIST=1
   -DASAN_HAS_EXCEPTIONS=1
   -DASAN_UAR=0)
 
 set(ASAN_BLACKLIST_FILE "${CMAKE_CURRENT_SOURCE_DIR}/asan_test.ignore")
+
+# On Windows, we use clang-cl rather than clang,
+# so have to prefix some flags with an extra -Xclang at times.
+if(MSVC)
+  set(XCLANG "-Xclang")
+else()
+  set(XCLANG "")
+endif()
+
 set(ASAN_UNITTEST_INSTRUMENTED_CFLAGS
   ${ASAN_UNITTEST_COMMON_CFLAGS}
   -fsanitize=address
-  "-fsanitize-blacklist=${ASAN_BLACKLIST_FILE}"
-  -mllvm -asan-stack=1
-  -mllvm -asan-globals=1
+  ${XCLANG} "-fsanitize-blacklist=${ASAN_BLACKLIST_FILE}"
 )
 
 # Unit tests require libstdc++.
+if(NOT MSVC)
   set(ASAN_UNITTEST_COMMON_LINKFLAGS -lstdc++)
+endif()
+
 # x86_64 FreeBSD 9.2 additionally requires libc++ to build the tests.
 if(CMAKE_SYSTEM MATCHES "FreeBSD-9.2-RELEASE")
   list(APPEND ASAN_UNITTEST_COMMON_LINKFLAGS "-lc++")
 endif()
 
 # Unit tests on Mac depend on Foundation.
 if(APPLE)
   list(APPEND ASAN_UNITTEST_COMMON_LINKFLAGS -framework Foundation)

 if(NOT ANDROID)
   list(APPEND ASAN_UNITTEST_INSTRUMENTED_LINKFLAGS -fsanitize=address)
 endif()
 
 set(ASAN_DYNAMIC_UNITTEST_INSTRUMENTED_LINKFLAGS
   ${ASAN_UNITTEST_INSTRUMENTED_LINKFLAGS}
   -shared-libasan)
 
+if(NOT MSVC)
   set(ASAN_UNITTEST_NOINST_LINKFLAGS
       ${ASAN_UNITTEST_COMMON_LINKFLAGS} -lm)
+endif()
 append_if(COMPILER_RT_HAS_LIBDL -ldl ASAN_UNITTEST_NOINST_LINKFLAGS)
 append_if(COMPILER_RT_HAS_LIBPTHREAD -lpthread ASAN_UNITTEST_NOINST_LINKFLAGS)
 append_if(COMPILER_RT_HAS_LIBPTHREAD -lpthread
           ASAN_DYNAMIC_UNITTEST_INSTRUMENTED_LINKFLAGS)
 
 # Compile source for the given architecture, using compiler
 # options in ${ARGN}, and add it to the object list.
 macro(asan_compile obj_list source arch kind)
macro(add_asan_test test_suite test_name arch kind)
   parse_arguments(TEST "OBJECTS;LINKFLAGS" "WITH_TEST_RUNTIME" ${ARGN})
   get_target_flags_for_arch(${arch} TARGET_LINK_FLAGS)
   set(TEST_DEPS ${TEST_OBJECTS})
   if(NOT COMPILER_RT_STANDALONE_BUILD)
     list(APPEND TEST_DEPS asan)
   endif()
   if(TEST_WITH_TEST_RUNTIME)
     list(APPEND TEST_DEPS ${ASAN_TEST_RUNTIME})
+    if(NOT MSVC)
       list(APPEND TEST_OBJECTS lib${ASAN_TEST_RUNTIME}.a)
+    else()
+      list(APPEND TEST_OBJECTS ${ASAN_TEST_RUNTIME}.lib)
+    endif()
   endif()
   add_compiler_rt_test(${test_suite} ${test_name}
                        OBJECTS ${TEST_OBJECTS}
                        DEPS ${TEST_DEPS}
                        LINK_FLAGS ${TEST_LINKFLAGS}
                                   ${TARGET_LINK_FLAGS})
 endmacro()
 
set(ASAN_TEST_RUNTIME_OBJECTS
       $<TARGET_OBJECTS:RTAsan.osx>
       $<TARGET_OBJECTS:RTInterception.osx>
       $<TARGET_OBJECTS:RTSanitizerCommon.osx>
       $<TARGET_OBJECTS:RTLSanCommon.osx>)
   else()
     set(ASAN_TEST_RUNTIME_OBJECTS
       $<TARGET_OBJECTS:RTAsan.${arch}>
       $<TARGET_OBJECTS:RTInterception.${arch}>
-      $<TARGET_OBJECTS:RTLSanCommon.${arch}>
       $<TARGET_OBJECTS:RTSanitizerCommon.${arch}>
       $<TARGET_OBJECTS:RTSanitizerCommonLibc.${arch}>)
+    if(NOT MSVC)
+      list(APPEND ASAN_TEST_RUNTIME_OBJECTS
+           $<TARGET_OBJECTS:RTLSanCommon.${arch}>)
+    endif()
   endif()
   add_library(${ASAN_TEST_RUNTIME} STATIC ${ASAN_TEST_RUNTIME_OBJECTS})
   set_target_properties(${ASAN_TEST_RUNTIME} PROPERTIES
     ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
   # Uninstrumented tests.
   set(ASAN_NOINST_TEST_OBJECTS)
   foreach(src ${ASAN_NOINST_TEST_SOURCES})
     asan_compile(ASAN_NOINST_TEST_OBJECTS ${src} ${arch} ${kind}
add_asan_test(AsanBenchmarks "Asan-${arch}${kind}-Dynamic-Benchmark" ${arch} ${kind}
                   LINKFLAGS ${ASAN_DYNAMIC_UNITTEST_INSTRUMENTED_LINKFLAGS})
   endif()
 endmacro()
 
 if(COMPILER_RT_CAN_EXECUTE_TESTS)
   foreach(arch ${ASAN_SUPPORTED_ARCH})
     add_asan_tests_for_arch_and_kind(${arch} "-inline")
     add_asan_tests_for_arch_and_kind(${arch} "-with-calls"
-      -mllvm -asan-instrumentation-with-call-threshold=0)
+      ${XCLANG} -mllvm ${XCLANG} -asan-instrumentation-with-call-threshold=0)
   endforeach()
 endif()
 
 if(ANDROID)
   # We assume that unit tests on Android are built in a build
   # tree with fresh Clang as a host compiler.
   
   # Test w/o ASan instrumentation. Link it with ASan statically.