Skip to content

Commit 34660eb

Browse files
authored
[compiler-rt] Don't exclude ubsan-asan tests on Windows/x86_64 (llvm#137171)
This removes a leftover workaround from 00f3f6e from 2016. Currently the tests seem to work fine on x86_64 in both MSVC and mingw configurations with this workaround removed. (On aarch64, asan isn't functional at all; this workaround used to hide that issue when running "check-ubsan", but the issue is apparent if running all tests with "check-compiler-rt" anyway.)
1 parent 8caba9a commit 34660eb

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

compiler-rt/test/ubsan/CMakeLists.txt

+3-5
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,9 @@ foreach(arch ${UBSAN_TEST_ARCH})
4949
add_ubsan_testsuites("Standalone" ubsan ${arch})
5050

5151
if(COMPILER_RT_HAS_ASAN AND ";${ASAN_SUPPORTED_ARCH};" MATCHES ";${arch};")
52-
# TODO(wwchrome): Re-enable ubsan for asan win 64-bit when ready.
53-
# Disable ubsan with AddressSanitizer tests for Windows 64-bit,
54-
# 64-bit Solaris/x86 and 64-bit SPARC.
55-
if((NOT (OS_NAME MATCHES "Windows" AND CMAKE_SIZEOF_VOID_P EQUAL 8)) AND
56-
(NOT (OS_NAME MATCHES "SunOS" AND ${arch} MATCHES x86_64)) AND
52+
# Disable ubsan with AddressSanitizer tests for 64-bit Solaris/x86 and
53+
# 64-bit SPARC.
54+
if((NOT (OS_NAME MATCHES "SunOS" AND ${arch} MATCHES x86_64)) AND
5755
(NOT ${arch} MATCHES sparcv9))
5856
add_ubsan_testsuites("AddressSanitizer" asan ${arch})
5957
endif()

0 commit comments

Comments
 (0)