[compiler-rt] [compiler-rt] Don't exclude ubsan-asan tests on Windows/x86_64 (PR #137171)

[Martin Storsjö via llvm-commits]

https://github.com/mstorsjo created https://github.com/llvm/llvm-project/pull/137171

This removes a leftover workaround from
00f3f6e296d49eb261e1ad47868a50122bfc111e 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.)

>From 431fca401818f9cd2f5ff87c0212e135353061bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin at martin.st>
Date: Thu, 24 Apr 2025 14:37:06 +0300
Subject: [PATCH] [compiler-rt] Don't exclude ubsan-asan tests on
 Windows/x86_64

This removes a leftover workaround from
00f3f6e296d49eb261e1ad47868a50122bfc111e 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.)
---
 compiler-rt/test/ubsan/CMakeLists.txt | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/compiler-rt/test/ubsan/CMakeLists.txt b/compiler-rt/test/ubsan/CMakeLists.txt
index 9b7fbe3c8f926..410585e6a07ef 100644
--- a/compiler-rt/test/ubsan/CMakeLists.txt
+++ b/compiler-rt/test/ubsan/CMakeLists.txt
@@ -49,11 +49,9 @@ foreach(arch ${UBSAN_TEST_ARCH})
   add_ubsan_testsuites("Standalone" ubsan ${arch})
 
   if(COMPILER_RT_HAS_ASAN AND ";${ASAN_SUPPORTED_ARCH};" MATCHES ";${arch};")
-    # TODO(wwchrome): Re-enable ubsan for asan win 64-bit when ready.
-    # Disable ubsan with AddressSanitizer tests for Windows 64-bit,
-    # 64-bit Solaris/x86 and 64-bit SPARC.
-    if((NOT (OS_NAME MATCHES "Windows" AND CMAKE_SIZEOF_VOID_P EQUAL 8)) AND
-       (NOT (OS_NAME MATCHES "SunOS" AND ${arch} MATCHES x86_64)) AND
+    # Disable ubsan with AddressSanitizer tests for 64-bit Solaris/x86 and
+    # 64-bit SPARC.
+    if((NOT (OS_NAME MATCHES "SunOS" AND ${arch} MATCHES x86_64)) AND
        (NOT ${arch} MATCHES sparcv9))
       add_ubsan_testsuites("AddressSanitizer" asan ${arch})
     endif()