[compiler-rt] r259388 - [ubsan] Stop thinking we can rely on C++ ABI knowledge on Windows

[Reid Kleckner via llvm-commits]

Author: rnk
Date: Mon Feb  1 13:13:28 2016
New Revision: 259388

URL: http://llvm.org/viewvc/llvm-project?rev=259388&view=rev
Log:
[ubsan] Stop thinking we can rely on C++ ABI knowledge on Windows

We already disabled various tests relying on C++ ABI knowledge, but we
still tried to build in this configuration on Windows which was a
mistake.

Fixes PR26415.

Modified:
    compiler-rt/trunk/CMakeLists.txt
    compiler-rt/trunk/test/ubsan/lit.common.cfg

Modified: compiler-rt/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/CMakeLists.txt?rev=259388&r1=259387&r2=259388&view=diff
==============================================================================
--- compiler-rt/trunk/CMakeLists.txt (original)
+++ compiler-rt/trunk/CMakeLists.txt Mon Feb  1 13:13:28 2016
@@ -293,6 +293,8 @@ if(APPLE AND SANITIZER_MIN_OSX_VERSION V
   # Mac OS X prior to 10.9 had problems with exporting symbols from
   # libc++/libc++abi.
   set(SANITIZER_CAN_USE_CXXABI FALSE)
+elseif(MSVC)
+  set(SANITIZER_CAN_USE_CXXABI FALSE)
 else()
   set(SANITIZER_CAN_USE_CXXABI TRUE)
 endif()

Modified: compiler-rt/trunk/test/ubsan/lit.common.cfg
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/ubsan/lit.common.cfg?rev=259388&r1=259387&r2=259388&view=diff
==============================================================================
--- compiler-rt/trunk/test/ubsan/lit.common.cfg (original)
+++ compiler-rt/trunk/test/ubsan/lit.common.cfg Mon Feb  1 13:13:28 2016
@@ -69,11 +69,6 @@ config.suffixes = ['.c', '.cc', '.cpp']
 if config.host_os not in ['Linux', 'Darwin', 'FreeBSD', 'Windows']:
   config.unsupported = True
 
-if config.host_os == 'Windows':
-  # We do not currently support enough of the Microsoft ABI for UBSan to work on
-  # Windows.
-  config.available_features.remove('cxxabi')
-
 # Allow tests to use REQUIRES=stable-runtime.  For use when you cannot use XFAIL
 # because the test hangs or fails on one configuration and not the other.
 if config.target_arch.startswith('arm') == False and config.target_arch != 'aarch64':