[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

20–73

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

20–73

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

 # Build for the undefined behavior sanitizer runtime support library.
 
 set(UBSAN_MINIMAL_SOURCES
   ubsan_minimal_handlers.cc
   )
 
 include_directories(..)
 
 set(UBSAN_CFLAGS ${SANITIZER_COMMON_CFLAGS})
 append_rtti_flag(OFF UBSAN_CFLAGS)
 
 set(UBSAN_STANDALONE_CFLAGS ${SANITIZER_COMMON_CFLAGS})
 append_rtti_flag(OFF UBSAN_STANDALONE_CFLAGS)
 
 add_compiler_rt_component(ubsan-minimal)
 
+if(COMPILER_RT_HAS_UBSAN_MINIMAL)
+  # Initializer of standalone UBSan runtime.
+
+  if(APPLE)
     # 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})
+      SOURCES ${UBSAN_MINIMAL_SOURCES}
+      CFLAGS ${UBSAN_CFLAGS})
 
+    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)
 
-if(COMPILER_RT_HAS_UBSAN_MINIMAL)
-  # Initializer of standalone UBSan runtime.
+    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)
+  else()
+    # Common parts of UBSan runtime.
+    add_compiler_rt_object_libraries(RTUbsan_minimal
+      ARCHS ${UBSAN_COMMON_SUPPORTED_ARCH}
+      SOURCES ${UBSAN_MINIMAL_SOURCES} CFLAGS ${UBSAN_CFLAGS})
 
     # Standalone UBSan runtimes.
     add_compiler_rt_runtime(clang_rt.ubsan_minimal
       STATIC
       ARCHS ${UBSAN_SUPPORTED_ARCH}
       OBJECT_LIBS RTUbsan_minimal
       CFLAGS ${UBSAN_CFLAGS}
       PARENT_TARGET ubsan-minimal)
 
     add_compiler_rt_runtime(clang_rt.ubsan_minimal
       SHARED
       ARCHS ${UBSAN_SUPPORTED_ARCH}
       OBJECT_LIBS RTUbsan_minimal
       CFLAGS ${UBSAN_CFLAGS}
       LINK_LIBS ${UBSAN_DYNAMIC_LIBS}
       PARENT_TARGET ubsan-minimal)
 
     if (UNIX)
       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()
+endif()