[ubsan-minimal] Enable on Darwin

[vsk]

Summary

Testing: check-ubsan-minimal

[vsk]

Hm, actually the tests are just unsupported. We'll need a small driver change to enable testing.

[vsk]

• Actually enable testing on Darwin. Depends on D37649

[eugenis]

lib/ubsan_minimal/CMakeLists.txt

51

Looks like the only difference between apple and non-apple is in the OS argument, and that is ignored by add_compiler_rt_* macros on non-apple.
Could these branches be merged?

[vsk]

lib/ubsan_minimal/CMakeLists.txt

51

Thanks, yes it can! It looks like the OS argument is just ignored when "APPLE" is not defined.

[vsk]

• Simplify, per review feedback

[eugenis]

Perfect.

cmake/config-ix.cmake

 if (COMPILER_RT_HAS_SANITIZER_COMMON AND UBSAN_SUPPORTED_ARCH AND
     OS_NAME MATCHES "Darwin|Linux|FreeBSD|NetBSD|Windows|Android|Fuchsia")
   set(COMPILER_RT_HAS_UBSAN TRUE)
 else()
   set(COMPILER_RT_HAS_UBSAN FALSE)
 endif()
 
 if (COMPILER_RT_HAS_SANITIZER_COMMON AND UBSAN_SUPPORTED_ARCH AND
-    OS_NAME MATCHES "Linux|FreeBSD|NetBSD|Android")
+    OS_NAME MATCHES "Linux|FreeBSD|NetBSD|Android|Darwin")
   set(COMPILER_RT_HAS_UBSAN_MINIMAL TRUE)
 else()
   set(COMPILER_RT_HAS_UBSAN_MINIMAL FALSE)
 endif()
 
 if (COMPILER_RT_HAS_SANITIZER_COMMON AND SAFESTACK_SUPPORTED_ARCH AND
     OS_NAME MATCHES "Darwin|Linux|FreeBSD|NetBSD")
   set(COMPILER_RT_HAS_SAFESTACK TRUE)

lib/ubsan_minimal/CMakeLists.txt

 
 set(UBSAN_STANDALONE_CFLAGS ${SANITIZER_COMMON_CFLAGS})
 append_rtti_flag(OFF UBSAN_STANDALONE_CFLAGS)
 
 add_compiler_rt_component(ubsan-minimal)
 
 # Common parts of UBSan runtime.
 add_compiler_rt_object_libraries(RTUbsan_minimal
+  OS ${SANITIZER_COMMON_SUPPORTED_OS}
   ARCHS ${UBSAN_COMMON_SUPPORTED_ARCH}
   SOURCES ${UBSAN_MINIMAL_SOURCES} CFLAGS ${UBSAN_CFLAGS})
 
 
 if(COMPILER_RT_HAS_UBSAN_MINIMAL)
   # Initializer of standalone UBSan runtime.
 
   # Standalone UBSan runtimes.
   add_compiler_rt_runtime(clang_rt.ubsan_minimal
     STATIC
+    OS ${SANITIZER_COMMON_SUPPORTED_OS}
     ARCHS ${UBSAN_SUPPORTED_ARCH}
     OBJECT_LIBS RTUbsan_minimal
     CFLAGS ${UBSAN_CFLAGS}
     PARENT_TARGET ubsan-minimal)
 
   add_compiler_rt_runtime(clang_rt.ubsan_minimal
     SHARED
+    OS ${SANITIZER_COMMON_SUPPORTED_OS}
     ARCHS ${UBSAN_SUPPORTED_ARCH}
     OBJECT_LIBS RTUbsan_minimal
     CFLAGS ${UBSAN_CFLAGS}
     LINK_LIBS ${UBSAN_DYNAMIC_LIBS}
     PARENT_TARGET ubsan-minimal)
 
-  if (UNIX)
+  if (UNIX AND NOT APPLE)
     set(ARCHS_FOR_SYMBOLS ${UBSAN_SUPPORTED_ARCH})
     list(REMOVE_ITEM ARCHS_FOR_SYMBOLS i386 i686)
     add_sanitizer_rt_symbols(clang_rt.ubsan_minimal
       ARCHS ${ARCHS_FOR_SYMBOLS}
       PARENT_TARGET ubsan-minimal
       EXTRA ubsan.syms.extra)
   endif()
 endif()

test/ubsan_minimal/lit.common.cfg

 # Define %clang and %clangxx substitutions to use in test RUN lines.
 config.substitutions.append( ("%clang ", build_invocation(clang_ubsan_cflags)) )
 config.substitutions.append( ("%clangxx ", build_invocation(clang_ubsan_cxxflags)) )
 
 # Default test suffixes.
 config.suffixes = ['.c', '.cc', '.cpp']
 
 # Check that the host supports UndefinedBehaviorSanitizerMinimal tests
-if config.host_os not in ['Linux', 'FreeBSD', 'NetBSD']: # TODO: Darwin, Windows
+if config.host_os not in ['Linux', 'FreeBSD', 'NetBSD', 'Darwin']: # TODO: Windows
   config.unsupported = True
 
 config.available_features.add('arch=' + config.target_arch)